diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml
index e8e4b7c82e5cd07bc8acb4c26a49e94b3d74555f..e2f1446a52be4988b73d037c4526960049009f6f 100644
--- a/.github/workflows/artifacts.yaml
+++ b/.github/workflows/artifacts.yaml
@@ -78,16 +78,20 @@ jobs:
           flavor: |
             latest = false
           tags: |
-            type=ref,event=branch,enable=${{ matrix.variant == 'alpine' }}
+            type=ref,event=branch,enable=${{ github.ref_name == github.event.repository.default_branch && matrix.variant == 'alpine' }}
             type=ref,event=pr,prefix=pr-,enable=${{ matrix.variant == 'alpine' }}
             type=semver,pattern={{raw}},enable=${{ matrix.variant == 'alpine' }}
             type=raw,value=latest,enable=${{ github.ref_name == github.event.repository.default_branch && matrix.variant == 'alpine' }}
-            type=ref,event=branch,suffix=-${{ matrix.variant }}
+            type=ref,event=branch,enable={{is_default_branch}},suffix=-${{ matrix.variant }}
             type=ref,event=pr,prefix=pr-,suffix=-${{ matrix.variant }}
             type=semver,pattern={{raw}},suffix=-${{ matrix.variant }}
             type=raw,value=latest,enable={{is_default_branch}},suffix=-${{ matrix.variant }}
+            type=sha,prefix=g,enable=${{ matrix.variant == 'alpine' }}
+            type=sha,prefix=g,suffix=-${{ matrix.variant }}
           labels: |
             org.opencontainers.image.documentation=https://dexidp.io/docs/
+        env:
+          DOCKER_METADATA_SHORT_SHA_LENGTH: 12
 
       # Multiple exporters are not supported yet
       # See https://github.com/moby/buildkit/pull/2760