diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 17cbe88..4ae4870 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,11 +34,10 @@ jobs:
         with:
           images: ${{ github.actor }}/ufw-docker-agent
           tags: |
-            type=schedule,suffix=${{ matrix.variant.name }}
-            type=ref,event=branch,suffix=${{ matrix.variant.name }}
-            type=ref,event=pr,suffix=${{ matrix.variant.name }}
-            type=semver,pattern={{version}},suffix=${{ matrix.variant.name }}
-            type=sha,suffix=${{ matrix.variant.name }}
+            type=schedule,suffix=-${{ matrix.variant.name }}
+            type=ref,event=branch,suffix=-${{ matrix.variant.name }}
+            type=ref,event=pr,suffix=-${{ matrix.variant.name }}
+            type=semver,pattern={{version}},suffix=-${{ matrix.variant.name }}
 
       - name: Build and push
         uses: docker/build-push-action@v6