diff --git a/.github/actions/setup-qmk/action.yml b/.github/actions/setup-qmk/action.yml
new file mode 100644
index 000000000000..f7f63546185c
--- /dev/null
+++ b/.github/actions/setup-qmk/action.yml
@@ -0,0 +1,31 @@
+name: Setup QMK
+description: Install Python, ARM/AVR toolchains, and QMK CLI
+
+inputs:
+  python-version:
+    description: Python version to use
+    default: '3.11'
+  include-avr:
+    description: Install AVR toolchain (needed for ErgoDox EZ, Planck EZ)
+    default: 'false'
+
+runs:
+  using: composite
+  steps:
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ inputs.python-version }}
+
+    - name: Install ARM toolchain and QMK CLI
+      shell: bash
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi dfu-util
+        pip install qmk
+
+    - name: Install AVR toolchain
+      if: inputs.include-avr == 'true'
+      shell: bash
+      run: |
+        sudo apt-get install -y gcc-avr avr-libc binutils-avr
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cfc7de101c39..b006a29643f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,14 +12,18 @@ on:
 jobs:
   build-firmware:
     runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
     strategy:
       fail-fast: false
       matrix:
-        keymap:
-          - default
-          - oryx
-          - klayi
+        include:
+          - keyboard: zsa/moonlander/reva
+            keymap: oryx
+          - keyboard: zsa/moonlander/revb
+            keymap: oryx
+          - keyboard: zsa/moonlander/reva
+            keymap: klayi
+          - keyboard: zsa/moonlander/revb
+            keymap: klayi
 
     steps:
     - name: Checkout QMK Firmware
@@ -29,7 +33,10 @@ jobs:
         persist-credentials: false
         submodules: true
 
+    - name: Setup QMK
+      uses: ./.github/actions/setup-qmk
+
     - name: Build
       id: build
       run: |
-        qmk mass-compile -f manufacturer="ZSA Technology Labs" -km ${{ matrix.keymap }} -e SKIP_GIT=1
+        qmk compile -kb ${{ matrix.keyboard }} -km ${{ matrix.keymap }} -e SKIP_GIT=1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f36418414f79..d17968558d54 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,10 +29,12 @@ jobs:
         minor_pattern: "(feat)"
         version_format: "${major}.${minor}.${patch}"
 
+    - name: Setup QMK
+      uses: ./.github/actions/setup-qmk
+
     - name: Build firmware
-      uses: docker://qmkfm/qmk_cli
-      with:
-        args: qmk compile -kb zsa/moonlander -km klayi -e SKIP_GIT=1
+      run: |
+        qmk compile -kb zsa/moonlander -km klayi -e SKIP_GIT=1
 
     - name: Prepare release assets
       run: |
diff --git a/keyboards/zsa/moonlander/keymaps/default/keymap.json b/keyboards/zsa/moonlander/keymaps/default/keymap.json
index 2f8049c30e5d..1588584bb03a 100644
--- a/keyboards/zsa/moonlander/keymaps/default/keymap.json
+++ b/keyboards/zsa/moonlander/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
     "modules": [
-        "zsa/default"
+        "zsa/defaults"
     ]
 }
diff --git a/keyboards/zsa/moonlander/keymaps/oryx/keymap.json b/keyboards/zsa/moonlander/keymaps/oryx/keymap.json
index a078976b311c..50bd75d77d4d 100644
--- a/keyboards/zsa/moonlander/keymaps/oryx/keymap.json
+++ b/keyboards/zsa/moonlander/keymaps/oryx/keymap.json
@@ -1,6 +1,6 @@
 {
     "modules": [
-        "zsa/default",
+        "zsa/defaults",
         "zsa/oryx"
     ]
 }