diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f4ff97a..2059d28 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,8 +26,8 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: SC64
-          path: SC64.zip
+          name: SC64-FW-HW-SW
+          path: SC64-FW-HW-SW.zip
 
       - name: Get release
         if: github.event_name == 'release' && github.event.action == 'created'
@@ -43,14 +43,21 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: SC64.zip
-          asset_name: SC64.zip
+          asset_path: SC64-FW-HW-SW.zip
+          asset_name: SC64-FW-HW-SW.zip
           asset_content_type: application/zip
 
   build-executables:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
+        include:
+          - os: windows-latest
+            artifact: SC64-Windows
+          - os: ubuntu-latest
+            artifact: SC64-Linux
+          - os: macos-latest
+            artifact: SC64-macOS
 
     runs-on: ${{ matrix.os }}
 
@@ -78,4 +85,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
+          name: ${{ matrix.artifact }}
           path: sw/pc/dist/*
diff --git a/build.sh b/build.sh
index 3087b3a..bf2caad 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-PACKAGE_FILE_NAME="SC64"
+PACKAGE_FILE_NAME="SC64-FW-HW-SW"
 
 TOP_FILES=(
     "./sw/pc/dd64.py"