diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 1fe4d1f..205871f 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -75,5 +75,15 @@ jobs:
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: fanpico-firmware-${{github.run_number}}-${{github.sha}}
+        name: firmware-${{matrix.runs-on}}-${{github.run_number}}-${{github.sha}}
         path: main/build/dist
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+	with:
+	  name: fanpico-firmware-${{github.run_number}}-${{github.sha}}
+	  pattern: firmware-*