diff --git a/.github/scripts/draft-release.sh b/.github/scripts/draft-release.sh
index c55d8a71..76bbdc52 100755
--- a/.github/scripts/draft-release.sh
+++ b/.github/scripts/draft-release.sh
@@ -10,10 +10,10 @@ if [[ "$tag" = v*-rc* ]]; then
 fi
 
 files=(
-	win64/rgbds-win64.zip
-	win32/rgbds-win32.zip
-	macos/rgbds-macos.zip
-	linux/rgbds-linux-x86_64.tar.xz
+	rgbds-win64.zip
+	rgbds-win32.zip
+	rgbds-macos.zip
+	rgbds-linux-x86_64.tar.xz
 	rgbds-source.tar.gz
 )
 
diff --git a/.github/workflows/create-release-artifacts.yml b/.github/workflows/create-release-artifacts.yml
index 3f5a7331..d780828a 100644
--- a/.github/workflows/create-release-artifacts.yml
+++ b/.github/workflows/create-release-artifacts.yml
@@ -80,8 +80,8 @@ jobs:
       - name: Upload macOS binaries
         uses: actions/upload-artifact@v7
         with:
-          name: macos
           path: rgbds-macos.zip
+          archive: false
           if-no-files-found: error
 
   linux:
@@ -105,8 +105,8 @@ jobs:
       - name: Upload Linux binaries
         uses: actions/upload-artifact@v7
         with:
-          name: linux
           path: rgbds-linux-x86_64.tar.xz
+          archive: false
           if-no-files-found: error
 
   release:
@@ -122,6 +122,9 @@ jobs:
           make dist Q=
       - name: Download all binary packages
         uses: actions/download-artifact@v8
+        with:
+          skip-decompress: true # Do not decompress `.zip`s, we want them as-is.
+          merge-multiple: true # Do not download non-`.zip`s into separate directories.
       - name: Draft the release
         run: |
           .github/scripts/draft-release.sh "${ref#refs/tags/}"