diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
index 0cd5bd8e3..c47bb6d8c 100644
--- a/.github/workflows/build-and-publish.yaml
+++ b/.github/workflows/build-and-publish.yaml
@@ -32,7 +32,7 @@ jobs:
             quay.io/project-koku/koku-metrics-operator
           tags: |
             type=semver,pattern={{raw}}
-            type=sha,prefix=,enable={{ startsWith(github.ref, 'refs/tags/v') }}
+            type=sha,prefix=,enable=${{ github.ref_type == 'tag' }}
             # set latest tag for default branch
             type=raw,value=latest
             type=ref,event=branch