diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c6e4ad9..4707c0d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{env.PROJECT_NAME}}_$(git rev-parse --short HEAD)
+          name: ${{env.PROJECT_NAME}}_rpi${{ matrix.builds.rpi }}_${{ github.sha }}
           path: ./build/sdcard/*
 
       - name: Release
diff --git a/scripts/build.sh b/scripts/build.sh
index 85b5da8..d580e3d 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -54,4 +54,8 @@ make -j
 ls *.img
 cd ..
 
+mkdir -p build/kernels
+mkdir -p build/sdcard
+
 cp src/*.img build/kernels/
+cp src/*.img build/sdcard/
diff --git a/scripts/zip.sh b/scripts/zip.sh
index 4593c88..5fe4392 100755
--- a/scripts/zip.sh
+++ b/scripts/zip.sh
@@ -2,6 +2,11 @@
 
 echo "Zipping boot files..."
 
+if [ -z "${RPI}" ] ; then
+  echo "\$RPI missing, exiting"
+  exit 1
+fi
+
 DEST="build/sdcard"
 
 mkdir -p ${DEST}
@@ -17,7 +22,6 @@ rm -rf \
 cp \
   build/kernels/* \
   src/config.txt \
-  src/*img \
   src/minidexed.ini \
   src/performance.ini \
   ${DEST}
@@ -26,6 +30,6 @@ echo "usbspeed=full" > ${DEST}/cmdline.txt
 
 cp build/kernels/* ${DEST}
 
-zip -r build/MiniDexed_$(date +%Y-%m-%d).zip ${DEST}/*
+zip -r build/MiniDexed_rpi_${RPI}_$(date +%Y-%m-%d).zip ${DEST}/*
 
 echo "  Done."