diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml
index bca7668..87d75fa 100644
--- a/.github/workflows/publish-image.yaml
+++ b/.github/workflows/publish-image.yaml
@@ -10,12 +10,15 @@ env:
 
 jobs:
   build:
-    runs-on: ${{ startsWith(matrix.platforms, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
+    runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
+    outputs:
+      tags: ${{ steps.prep.outputs.tags }}
     strategy:
       fail-fast: false
       matrix:
-        platform: ["linux/amd64", "linux/arm64"]
-
+        platform:
+          - linux/amd64
+          - linux/arm64
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -63,14 +66,15 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build and push by digest
-        id: docker_build
+        id: build
         uses: docker/build-push-action@v6
         with:
           context: debian
           build-args: INVOICENINJA_VERSION=${{ steps.prep.outputs.version }}
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.prep.outputs.tags }}
-          outputs: type=image,push-by-digest=true,name-canonical=true
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ env.REGISTRY_IMAGE }}
+          outputs: type=image,push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
@@ -115,10 +119,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY_IMAGE }}
           tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
+            ${{ needs.build.outputs.tags }}
 
       - name: Create manifest list and push
         working-directory: ${{ runner.temp }}/digests
@@ -128,12 +129,15 @@ jobs:
             $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
 
       - name: Inspect image
+        if: ${{ github.event_name != 'pull_request' }}
         run: |
           docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
 
   Description:
     if: ${{ github.event_name != 'pull_request' }}
     runs-on: ubuntu-latest
+    needs:
+      - merge
     steps:
       - name: Checkout
         uses: actions/checkout@v5