diff --git a/.github/workflows/per-commit_publish-image.yaml b/.github/workflows/per-commit_publish-image.yaml
index 8388d82..39c4810 100644
--- a/.github/workflows/per-commit_publish-image.yaml
+++ b/.github/workflows/per-commit_publish-image.yaml
@@ -21,8 +21,8 @@ jobs:
       - name: "Pull from Docker Hub and republish on Quay.io"
         run: |
           docker pull caddy:2-alpine
-          docker tag caddy:2-alpine ${{ vars.CI_REGISTRY_IMAGE }}:${{ env.GITHUB_SHA }}_v2-alpine
-          docker push ${{ vars.CI_REGISTRY_IMAGE }}:${{ env.GITHUB_SHA }}_v2-alpine
+          docker tag caddy:2-alpine ${{ vars.CI_REGISTRY_IMAGE }}:${{ github.sha }}_v2-alpine
+          docker push ${{ vars.CI_REGISTRY_IMAGE }}:${{ github.sha }}_v2-alpine
   # Build a customer Caddy docker image with Cloudflare DNS support and push it to Quay.io
   v2-alpine_cloudflare:
     runs-on: ubuntu-latest
@@ -38,4 +38,4 @@ jobs:
         with:
           file: images/v2-alpine_cloudflare/Dockerfile
           push: true
-          tags: ${{ vars.CI_REGISTRY_IMAGE }}:${{ env.GITHUB_SHA }}_v2-alpine_cloudflare-debug
+          tags: ${{ vars.CI_REGISTRY_IMAGE }}:${{ github.sha }}_v2-alpine_cloudflare-debug