diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index bd369e82e..c1d74e2c4 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -5,12 +5,14 @@ env:
   IMAGE_NAME: image
 
 on:
-  push:
-    branches: [ master ] 
+  pull_request:
+    branches:
+      - '*'
     tags:
       - v*
-  pull_request:
-    branches: [ master ]
+  push:
+    branches:
+      - 'master'
 
 jobs:
 
@@ -23,7 +25,7 @@ jobs:
 
     - name: Log into registry
       #echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
-      run:     echo "$DOCKER_SERVER_KEY" | docker login -u "$DOCKER_SERVER_LOGIN" --password-stdin
+      run:     echo "${{ secrets.$DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.$DOCKER_SERVER_LOGIN }}" --password-stdin
 
     - name: Build Zabbix Agent
       run:  docker build --compress -t epicmorg/zabbix-agent:latest zabbix/agent