diff --git a/.github/workflows/release-ghcr-version-tag.yaml b/.github/workflows/release-ghcr-version-tag.yaml
index d68ad83d..c2abb292 100644
--- a/.github/workflows/release-ghcr-version-tag.yaml
+++ b/.github/workflows/release-ghcr-version-tag.yaml
@@ -16,13 +16,18 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Tag release version
+        env:
+          REF_NAME: ${{ github.ref_name }}
+          GITHUB_SHA: ${{ github.sha }}
         run: |
           docker buildx imagetools create --tag \
-           ghcr.io/getsentry/vroom:${{ github.ref_name }} \
-           ghcr.io/getsentry/vroom:${{ github.sha }}
+           ghcr.io/getsentry/vroom:"$REF_NAME" \
+           ghcr.io/getsentry/vroom:"$GITHUB_SHA"
 
       - name: Tag latest version
+        env:
+          GITHUB_SHA: ${{ github.sha }}
         run: |
           docker buildx imagetools create --tag \
            ghcr.io/getsentry/vroom:latest \
-           ghcr.io/getsentry/vroom:${{ github.sha }}
+           ghcr.io/getsentry/vroom:"$GITHUB_SHA"