diff --git a/.github/workflows/build-test-and-push.yaml b/.github/workflows/build-test-and-push.yaml
index 235e327..800f345 100644
--- a/.github/workflows/build-test-and-push.yaml
+++ b/.github/workflows/build-test-and-push.yaml
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: ci
 
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
 
     strategy:
       matrix:
@@ -91,10 +91,10 @@ jobs:
         with:
           images: hsldevcom/infodevops-docker-base-images
           tags: |
-            type=edge,suffix=${{ matrix.image }},enable={{is_default_branch}}
-            type=semver,suffix=${{ matrix.image }},pattern={{version}}
-            type=semver,suffix=${{ matrix.image }},pattern={{major}}.{{minor}}
-            type=semver,suffix=${{ matrix.image }},pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
+            type=edge,suffix=-${{ matrix.image }},enable={{is_default_branch}}
+            type=semver,suffix=-${{ matrix.image }},pattern={{version}}
+            type=semver,suffix=-${{ matrix.image }},pattern={{major}}.{{minor}}
+            type=semver,suffix=-${{ matrix.image }},pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
           labels: |
             org.opencontainers.image.title=${{ matrix.image }}
             org.opencontainers.image.vendor=hsldevcom