diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d41c7054..375786a8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,7 +25,7 @@ jobs:
 
     - name: Build Firmware
 #      run: touch firmware.bin # Testing
-      run: cd code; platformio run --environment esp32cam; cp .pio/build/esp32cam/firmware.bin ../
+      run: cd code; platformio run --environment esp32cam; cp .pio/build/esp32cam/firmware.bin ../firmware__${{ github.ref_name }}__${{ steps.vars.outputs.sha_short }}.bin
 
     - name: Set outputs
       id: vars
@@ -35,7 +35,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: firmware__${{ github.ref_name }}__${{ steps.vars.outputs.sha_short }}
-        path: firmware.bin
+        path: firmware__${{ github.ref_name }}__${{ steps.vars.outputs.sha_short }}.bin
 
     - name: Upload Web interface Artifact
       uses: actions/upload-artifact@v3