diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml
index b381a08..d573ae5 100644
--- a/.github/workflows/publish-image.yaml
+++ b/.github/workflows/publish-image.yaml
@@ -30,12 +30,9 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            # on tag, tag the tag :)
             type=ref,event=tag
-            # latest based on default branch
             type=raw,value=latest,enable={{is_default_branch}}
-            # prefix for development
-            type=sha,prefix={{branch}}-
+            type=ref,event=branch,suffix=-{{sha}}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4