diff --git a/.github/workflows/auto-tag.yml b/.github/workflows/auto-tag.yml
index f234b11..23880a1 100644
--- a/.github/workflows/auto-tag.yml
+++ b/.github/workflows/auto-tag.yml
@@ -77,21 +77,24 @@ jobs:
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
+        with:
+          pattern: gosh-*
+          merge-multiple: true
+          path: release-assets
 
-      - name: Flatten artifacts for release
+      - name: Verify binaries
         run: |
-          for dir in gosh-*/; do
-            [ -d "$dir" ] && cp "$dir"* . 2>/dev/null || true
-          done
-          ls -la gosh-*
+          ls -la release-assets/
+          test -f release-assets/gosh-linux-amd64 && test -f release-assets/gosh-darwin-arm64 || (echo "Missing binaries" && exit 1)
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.bump.outputs.new_tag }}
           files: |
-            gosh-linux-amd64
-            gosh-darwin-arm64
+            release-assets/gosh-linux-amd64
+            release-assets/gosh-darwin-arm64
+          fail_on_unmatched_files: true
           generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85d26e0..c3cca30 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,20 +50,23 @@ jobs:
     steps:
       - name: Download all artifacts
         uses: actions/download-artifact@v4
+        with:
+          pattern: gosh-*
+          merge-multiple: true
+          path: release-assets
 
-      - name: Flatten artifacts for release
+      - name: Verify binaries
         run: |
-          for dir in gosh-*/; do
-            [ -d "$dir" ] && cp "$dir"* . 2>/dev/null || true
-          done
-          ls -la gosh-*
+          ls -la release-assets/
+          test -f release-assets/gosh-linux-amd64 && test -f release-assets/gosh-darwin-arm64 || (echo "Missing binaries" && exit 1)
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            gosh-linux-amd64
-            gosh-darwin-arm64
+            release-assets/gosh-linux-amd64
+            release-assets/gosh-darwin-arm64
+          fail_on_unmatched_files: true
           generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}