diff --git a/.github/workflows/build_iotm.yml b/.github/workflows/build_iotm.yml
index c4563c25..76dcb8f2 100644
--- a/.github/workflows/build_iotm.yml
+++ b/.github/workflows/build_iotm.yml
@@ -46,10 +46,10 @@ jobs:
     - name: Rearrange Artifacts
       run: |
         mkdir -p artifacts/${{ matrix.board }}
-        mv .pio/build/${{ matrix.board }}/*.bin artifacts/${{ matrix.board }}
+        find .pio/build/${{ matrix.board }} -name "*.bin" -exec mv {} artifacts/${{ matrix.board }} \;
       working-directory: ${{ github.workspace }}
     - name: Attach artifact
       uses: actions/upload-artifact@v4
       with:
-        name: firmware
+        name: firmware-${{ matrix.board }}-${{ github.run_number }}
         path: artifacts/${{ matrix.board }}
\ No newline at end of file