diff --git a/.github/workflows/docker-pull.yml b/.github/workflows/docker-pull.yml
index e26cb21..fb140f6 100644
--- a/.github/workflows/docker-pull.yml
+++ b/.github/workflows/docker-pull.yml
@@ -26,6 +26,18 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
+      - name: Get Docker tag from branch name
+        id: extract_docker_tag
+        shell: bash
+        run: |
+          if [ "${GITHUB_REF#refs/heads/}" == "master" ]; then
+            echo "##[set-output name=tag;]$(echo 'latest')"
+          elif [[ "${GITHUB_REF#refs/heads/}" == release_* ]]; then
+            echo "##[set-output name=tag;]$(echo '${GITHUB_REF#refs/heads/}' | cut -d '_' -f2-)"
+          else
+            echo "##[set-output name=tag;]$(echo 'ghtest')"
+          fi
+
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
@@ -35,23 +47,7 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
-
-      - name: Extract branch name
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-        id: extract_branch
-
-      - name: Get Docker tag from branch name
-        id: extract_docker_tag
-        shell: bash
-        run: |
-          if [ "${{ steps.extract_branch.outputs.branch }}" == "master" ]; then
-            echo "##[set-output name=tag;]$(echo 'latest')"
-          elif [[ "${{ steps.extract_branch.outputs.branch }}" == release_* ]]; then
-            echo "##[set-output name=tag;]$(echo '${{ steps.extract_branch.outputs.branch }}' | cut -d '_' -f2-)"
-          else
-            echo "##[set-output name=tag;]$(echo 'ghtest')"
-          fi
+          
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2