diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4b66121b..a4d57b5b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -804,17 +804,32 @@ jobs:
             gam*.zip
             gam*.msi
 
-      - name: Archive production artifacts
+      - name: Archive tar.xz artifacts
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # 7.0.0
-        #if: (github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && matrix.goal != 'test'
         if: always()
         with:
           archive: false
+          if-no-files-found: ignore
           path: |
             gam*.tar.xz
+
+      - name: Archive zip artifacts
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # 7.0.0
+        if: always()
+        with:
+          archive: false
+          if-no-files-found: ignore
+          path: |
             gam*.zip
+
+      - name: Archive msi artifacts
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # 7.0.0
+        if: always()
+        with:
+          archive: false
+          if-no-files-found: ignore
+          path: |
             gam*.msi
-            *.png
 
       - name: Basic Tests build jobs only
         if: matrix.goal != 'test' && steps.cache-python-ssl.outputs.cache-hit != 'true'
@@ -1048,20 +1063,6 @@ jobs:
           echo '.git*' > ./excludes.txt
           tar cJvvf cache.tar.xz --exclude-from=excludes.txt $tar_folders
 
-  merge:
-    if: (github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
-    runs-on: ubuntu-24.04
-    needs: build
-    permissions:
-      contents: write
-      packages: write
-    steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # 7.0.0
-        with:
-          archive: false
-          pattern: gam-binaries-*
-
   publish:
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
     runs-on: ubuntu-24.04
@@ -1080,6 +1081,9 @@ jobs:
 
       - name: Download artifacts
         uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        with:
+          path: gam-binaries/
+          merge-multiple: true
 
       - name: VirusTotal Scan
         uses: crazy-max/ghaction-virustotal@d34968c958ae283fe976efed637081b9f9dcf74f # 4.2.0