diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f3e791..0f5b5cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -91,17 +91,12 @@ jobs:
         run: |
           curl -O -L ${{ env.RPI_FIRMWARE_URL }}/raw/${{ env.DTB_VERSION }}/boot/bcm2712-rpi-5-b.dtb
 
-      - name: Create firmware archive
-        run: |
-          zip -r \
-              RPi${{ matrix.MODEL }}_UEFI_${{ matrix.CONFIGURATION }}_${{ steps.get_version_tag.outputs.version }}.zip \
-              RPI_EFI.fd \
-              config.txt \
-              *.dtb
-
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: RPi${{ matrix.MODEL }}_UEFI_${{ matrix.CONFIGURATION }}_${{ steps.get_version_tag.outputs.version }}
-          path: ./*.zip
+          path: |
+            RPI_EFI.fd
+            config.txt
+            *.dtb
           if-no-files-found: error
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 356370a..7e3717d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,12 +15,20 @@ jobs:
       contents: write
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
+
+      - name: Create firmware archive
+        run: |
+          for dir in *Release*/; do
+            pushd "${dir}"
+            zip -r "../${dir%/}.zip" .
+            popd
+          done
 
       - name: Create release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           prerelease: false
-          files: "*/*Release*.zip"
+          files: "*.zip"
           fail_on_unmatched_files: true