diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml
index 0bcf0b0..b62a0cd 100644
--- a/.github/workflows/.test.yml
+++ b/.github/workflows/.test.yml
@@ -313,7 +313,7 @@ jobs:
     with:
       output: local
       push: ${{ github.event_name != 'pull_request' }}
-      artifact-name: build-output-single
+      artifact-name: build-single-output
       build-file: test/hello.Dockerfile
       build-sbom: true
 
@@ -564,7 +564,7 @@ jobs:
       output: local
       push: ${{ github.event_name != 'pull_request' }}
       cache: true
-      artifact-name: bake-output-single
+      artifact-name: bake-single-output
       bake-sbom: true
 
   bake-local-single-verify:
diff --git a/.github/workflows/bake.yml b/.github/workflows/bake.yml
index 3ba6867..f56c375 100644
--- a/.github/workflows/bake.yml
+++ b/.github/workflows/bake.yml
@@ -632,7 +632,7 @@ jobs:
         if: ${{ inputs.output == 'local' }}
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
-          name: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix }}
+          name: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix || '0' }}
           path: ${{ env.LOCAL_EXPORT_DIR }}
           if-no-files-found: error
       -
@@ -746,6 +746,14 @@ jobs:
                 });
               }
             }
+      -
+        name: Merge artifacts
+        if: ${{ inputs.output == 'local' }}
+        uses: actions/upload-artifact/merge@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: ${{ inputs.artifact-name }}
+          pattern: ${{ inputs.artifact-name }}*
+          delete-merged: true
       -
         name: Set outputs
         id: set
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cf02592..33481f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -526,7 +526,7 @@ jobs:
         if: ${{ inputs.output == 'local' }}
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
-          name: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix }}
+          name: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix || '0' }}
           path: ${{ env.LOCAL_EXPORT_DIR }}
           if-no-files-found: error
       -
@@ -639,6 +639,14 @@ jobs:
                 });
               }
             }
+      -
+        name: Merge artifacts
+        if: ${{ inputs.output == 'local' }}
+        uses: actions/upload-artifact/merge@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: ${{ inputs.artifact-name }}
+          pattern: ${{ inputs.artifact-name }}*
+          delete-merged: true
       -
         name: Set outputs
         id: set
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 50cf93d..d71bcdb 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -51,12 +51,11 @@ jobs:
         with:
           registry-auth: ${{ secrets.registry-auths }}
       -
-        name: Download artifact
+        name: Download artifacts
         if: ${{ steps.vars.outputs.output-type == 'local' }}
         uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
-          pattern: ${{ steps.vars.outputs.artifact-name }}*
-          merge-multiple: true
+          name: ${{ steps.vars.outputs.artifact-name }}
       -
         name: Verify signatures
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0