diff --git a/.github/workflows/platformio.yml b/.github/workflows/platformio.yml
index 06f17cc..a6d95dd 100644
--- a/.github/workflows/platformio.yml
+++ b/.github/workflows/platformio.yml
@@ -37,10 +37,11 @@ jobs:
     - name: Make artifacts
       run: |
         mkdir -p zip
-        tools/mkarduinosrc.py -1 zip/arduino.zip
+        tools/mkarduinosrc.py -1 zip/source-$(git rev-parse --short HEAD).zip
 
         cd .pio/build
-        zip ../../zip/wifinfo-$(git describe).zip $(ls */spiffs.bin */firmware.bin)
+        for i in */spiffs.bin; do mv $i $(dirname $i)/erfs.bin; done
+        zip ../../zip/wifinfo-$(git rev-parse --short HEAD).zip $(ls */*.bin)
 
     - name: Archive firmware+spiffs
       uses: actions/upload-artifact@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fb3011a..56e0a23 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
           platformio run -e esp01s_prod -e esp12e_prod
           platformio run -e esp01s_prod -e esp12e_prod -t buildfs
 
-          tools/mkarduinosrc.py -1 arduino.zip
+          tools/mkarduinosrc.py arduino.zip
 
           cd .pio/build
           for i in */spiffs.bin; do mv $i $(dirname $i)/erfs.bin; done