diff --git a/.github/workflows/container_images.yml b/.github/workflows/container_images.yml
index 490626f3..ae365832 100644
--- a/.github/workflows/container_images.yml
+++ b/.github/workflows/container_images.yml
@@ -89,7 +89,7 @@ jobs:
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.variance.image }}-${{ matrix.platform.arch }}
+          name: digests-${{ replace(matrix.variance.image, '/', '-') }}-${{ matrix.platform.arch }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -121,7 +121,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: /tmp/digests
-          pattern: digests-${{ matrix.variance.image }}-*
+          pattern: digests-${{ replace(matrix.variance.image, '/', '-') }}-*
           merge-multiple: true
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -132,8 +132,12 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ matrix.variance.image }}
           tags: |
             type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
             type=sha,format=short
-            type=raw,value=latest
+            type=raw,value=latest,enable={{is_default_branch}}
       - name: Login to Registry
         uses: docker/login-action@v3
         with: