diff --git a/.github/workflows/build_client.yml b/.github/workflows/build_client.yml
index 29fa2be..faf4353 100644
--- a/.github/workflows/build_client.yml
+++ b/.github/workflows/build_client.yml
@@ -70,5 +70,5 @@ jobs:
       - name: Upload release artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.name }}-release-artifacts
+          name: release-artifacts-${{ matrix.name }}
           path: client-${{ matrix.name }}.zip
diff --git a/.github/workflows/build_firmware.yml b/.github/workflows/build_firmware.yml
index 1ad8d09..6d7df98 100644
--- a/.github/workflows/build_firmware.yml
+++ b/.github/workflows/build_firmware.yml
@@ -94,5 +94,5 @@ jobs:
       - name: Upload release artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.device_type }}-release-artifacts
+          name: release-artifacts-${{ matrix.device_type }}
           path: firmware/objects/*.zip
diff --git a/.github/workflows/on_push.yml b/.github/workflows/on_push.yml
index 115e62a..ebe58ab 100644
--- a/.github/workflows/on_push.yml
+++ b/.github/workflows/on_push.yml
@@ -28,7 +28,8 @@ jobs:
       - name: Download release artifacts
         uses: actions/download-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-*
+          merge-multiple: true
           path: release-artifacts
       - name: Upload to dev release
         uses: softprops/action-gh-release@v1
@@ -64,7 +65,8 @@ jobs:
       - name: Download release artifacts
         uses: actions/download-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-*
+          merge-multiple: true
           path: release-artifacts
       - name: Upload to tagged release
         uses: softprops/action-gh-release@v1