diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index db60ef66a..cf0a719f2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,9 +42,10 @@ jobs:
         uses: actions/download-artifact@v6
         with:
           path: ./artifacts/
+          merge-multiple: true
 
       - name: Display Downloaded Artifacts
-        run: find ./artifacts/
+        run: find ./artifacts/ -type f | sort
 
       - name: Create Preview Release
         if: github.ref == 'refs/heads/master'
@@ -55,19 +56,19 @@ jobs:
           prerelease: true
           title: "Latest Preview Build"
           files: |
-            ./artifacts/windows-x64/duckstation-windows-x64-release.zip
-            ./artifacts/windows-x64/duckstation-windows-x64-release-symbols.zip
-            ./artifacts/windows-x64-sse2/duckstation-windows-x64-sse2-release.zip
-            ./artifacts/windows-x64-sse2/duckstation-windows-x64-sse2-release-symbols.zip
-            ./artifacts/windows-arm64/duckstation-windows-arm64-release.zip
-            ./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
-            ./artifacts/linux-x64-appimage/DuckStation-x64.AppImage
-            ./artifacts/linux-x64-sse2-appimage/DuckStation-x64-SSE2.AppImage
-            ./artifacts/linux-arm64-appimage/DuckStation-arm64.AppImage
-            ./artifacts/linux-arm64-appimage/DuckStation-Mini-arm64.AppImage
-            ./artifacts/linux-armhf-appimage/DuckStation-armhf.AppImage
-            ./artifacts/linux-armhf-appimage/DuckStation-Mini-armhf.AppImage
-            ./artifacts/macos/duckstation-mac-release.zip
+            ./artifacts/duckstation-windows-x64-release.zip
+            ./artifacts/duckstation-windows-x64-release-symbols.zip
+            ./artifacts/duckstation-windows-x64-sse2-release.zip
+            ./artifacts/duckstation-windows-x64-sse2-release-symbols.zip
+            ./artifacts/duckstation-windows-arm64-release.zip
+            ./artifacts/duckstation-windows-arm64-release-symbols.zip
+            ./artifacts/DuckStation-x64.AppImage
+            ./artifacts/DuckStation-x64-SSE2.AppImage
+            ./artifacts/DuckStation-arm64.AppImage
+            ./artifacts/DuckStation-Mini-arm64.AppImage
+            ./artifacts/DuckStation-armhf.AppImage
+            ./artifacts/DuckStation-Mini-armhf.AppImage
+            ./artifacts/duckstation-mac-release.zip
 
       - name: Create Rolling Release
         if: github.ref == 'refs/heads/dev'
@@ -78,16 +79,16 @@ jobs:
           prerelease: false
           title: "Latest Rolling Release"
           files: |
-            ./artifacts/windows-x64/duckstation-windows-x64-release.zip
-            ./artifacts/windows-x64/duckstation-windows-x64-release-symbols.zip
-            ./artifacts/windows-x64-sse2/duckstation-windows-x64-sse2-release.zip
-            ./artifacts/windows-x64-sse2/duckstation-windows-x64-sse2-release-symbols.zip
-            ./artifacts/windows-arm64/duckstation-windows-arm64-release.zip
-            ./artifacts/windows-arm64/duckstation-windows-arm64-release-symbols.zip
-            ./artifacts/linux-x64-appimage/DuckStation-x64.AppImage
-            ./artifacts/linux-x64-sse2-appimage/DuckStation-x64-SSE2.AppImage
-            ./artifacts/linux-arm64-appimage/DuckStation-arm64.AppImage
-            ./artifacts/linux-arm64-appimage/DuckStation-Mini-arm64.AppImage
-            ./artifacts/linux-armhf-appimage/DuckStation-armhf.AppImage
-            ./artifacts/linux-armhf-appimage/DuckStation-Mini-armhf.AppImage
-            ./artifacts/macos/duckstation-mac-release.zip
+            ./artifacts/duckstation-windows-x64-release.zip
+            ./artifacts/duckstation-windows-x64-release-symbols.zip
+            ./artifacts/duckstation-windows-x64-sse2-release.zip
+            ./artifacts/duckstation-windows-x64-sse2-release-symbols.zip
+            ./artifacts/duckstation-windows-arm64-release.zip
+            ./artifacts/duckstation-windows-arm64-release-symbols.zip
+            ./artifacts/DuckStation-x64.AppImage
+            ./artifacts/DuckStation-x64-SSE2.AppImage
+            ./artifacts/DuckStation-arm64.AppImage
+            ./artifacts/DuckStation-Mini-arm64.AppImage
+            ./artifacts/DuckStation-armhf.AppImage
+            ./artifacts/DuckStation-Mini-armhf.AppImage
+            ./artifacts/duckstation-mac-release.zip