diff --git a/.craft.yml b/.craft.yml
index 87954283..c168776b 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -16,12 +16,11 @@ statusProvider:
   name: github
   config:
     contexts:
-      - "Build"
+      - "Merge Artifacts"
 
 requireNames:
-  - /^built-packages$/
-  - /^spotlight-binaries$/
-  - /^electron-binaries$/
+  - /^spotlight-/
+  - /\.dmg$/
 
 targets:
   - name: npm
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b92ca4e8..28da4158 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -406,3 +406,22 @@ jobs:
             packages/spotlight/dist-electron/*.zip
             packages/spotlight/dist-electron/*.blockmap
             packages/spotlight/dist-electron/*.yml
+
+  merge-artifacts:
+    name: Merge Artifacts
+    needs: [build, electron-mac]
+    if: always() && needs.build.result == 'success' && needs.electron-mac.result == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download release artifacts
+        uses: actions/download-artifact@v5
+        with:
+          pattern: '{built-packages,spotlight-binaries,electron-binaries}'
+          path: artifacts/
+          merge-multiple: true
+
+      - name: Upload merged artifact
+        uses: actions/upload-artifact@v5
+        with:
+          name: ${{ github.sha }}
+          path: artifacts/