diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 690907ffae1e..7dcc6160c35a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,14 +16,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - keyboard: zsa/moonlander/reva
-            keymap: oryx
-          - keyboard: zsa/moonlander/revb
-            keymap: oryx
           - keyboard: zsa/moonlander/reva
             keymap: klayi
+            firmware: zsa_moonlander_reva_klayi
           - keyboard: zsa/moonlander/revb
             keymap: klayi
+            firmware: zsa_moonlander_revb_klayi
 
     steps:
     - name: Checkout QMK Firmware
@@ -41,8 +39,10 @@ jobs:
         qmk compile -kb ${{ matrix.keyboard }} -km ${{ matrix.keymap }} -e SKIP_GIT=1
 
     - name: Upload firmware
-      if: matrix.keymap == 'klayi'
       uses: actions/upload-artifact@v4
       with:
-        name: firmware-${{ matrix.keyboard == 'zsa/moonlander/reva' && 'reva' || 'revb' }}
-        path: .build/*.bin
+        name: ${{ matrix.firmware }}
+        path: |
+          .build/${{ matrix.firmware }}.bin
+          .build/${{ matrix.firmware }}.hex
+        if-no-files-found: error
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5c1597edccfa..fbdef6b6d4a2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
       uses: actions/download-artifact@v4
       with:
         path: release
-        pattern: firmware-*
+        pattern: zsa_moonlander_*_klayi
         merge-multiple: true
         run-id: ${{ github.event.workflow_run.id }}
         github-token: ${{ secrets.GITHUB_TOKEN }}