diff --git a/.github/workflows/docker-tag.yml b/.github/workflows/docker-tag.yml
index a0ec079..4ae26e6 100644
--- a/.github/workflows/docker-tag.yml
+++ b/.github/workflows/docker-tag.yml
@@ -10,13 +10,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Get short SHA from commit hash
-        id: shacalc
-        run: echo "::set-output name=tagname::$(git describe --tags --abbrev=0 HEAD)"
-
       - name: Check Out Repo
         uses: actions/checkout@v2
 
+      - name: Get short SHA from commit hash
+        id: tagcalc
+        run: echo "::set-output name=tagname::$(git describe --tags --abbrev=0 HEAD)"
+
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
@@ -34,7 +34,7 @@ jobs:
           context: ./
           file: ./Dockerfile
           push: true
-          tags: rpki/stayrtr:latest,rpki/stayrtr:${{ steps.shacalc.outputs.tagname }}
+          tags: rpki/stayrtr:latest,rpki/stayrtr:${{ steps.tagcalc.outputs.tagname }}
           target: stayrtr
 
       - name: Image digest (stayrtr)
@@ -47,7 +47,7 @@ jobs:
           context: ./
           file: ./Dockerfile
           push: true
-          tags: rpki/rtrmon:latest,rpki/rtrmon:${{ steps.shacalc.outputs.tagname }}
+          tags: rpki/rtrmon:latest,rpki/rtrmon:${{ steps.tagcalc.outputs.tagname }}
           target: rtrmon
 
       - name: Image digest (rtrmon)
@@ -60,7 +60,7 @@ jobs:
           context: ./
           file: ./Dockerfile
           push: true
-          tags: rpki/rtrdump:latest,rpki/rtrdump:${{ steps.shacalc.outputs.tagname }}
+          tags: rpki/rtrdump:latest,rpki/rtrdump:${{ steps.tagcalc.outputs.tagname }}
           target: rtrdump
 
       - name: Image digest (rtrdump)