diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86fe77cf..37cba725 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,53 +1,5 @@
 on: [push, pull_request, workflow_dispatch]
 
-name: Build
-
 jobs:
   build:
-    runs-on: ubuntu-20.04
-    container:
-      image: zmkfirmware/zmk-build-arm:stable
-    name: Build
-    steps:
-      - name: Prepare variables
-        shell: sh -x {0}
-        env:
-          shield: ${{ matrix.shield }}
-        run: |
-          echo "zephyr_version=${ZEPHYR_VERSION}" >> $GITHUB_ENV
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Cache west modules
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-zephyr-modules
-        with:
-          path: |
-            modules/
-            tools/
-            zephyr/
-            bootloader/
-            zmk/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-      - name: West Init
-        run: west init -l config
-      - name: West Update
-        run: west update
-      - name: West Zephyr export
-        run: west zephyr-export
-      - name: West Build (bt60)
-        shell: sh -x {0}
-        run: west build -s zmk/app -b bt60 -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
-      - name: bt60 Kconfig file
-        run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
-      - name: Rename zmk.uf2
-        run: cp build/zephyr/zmk.uf2 bt60.uf2
-      - name: Archive (bt60)
-        uses: actions/upload-artifact@v3
-        with:
-          name: firmware
-          path: bt60.uf2
+    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
\ No newline at end of file
diff --git a/build.yaml b/build.yaml
new file mode 100644
index 00000000..9cf0de91
--- /dev/null
+++ b/build.yaml
@@ -0,0 +1,18 @@
+# This file generates the GitHub Actions matrix
+# For simple board + shield combinations, add them
+# to the top level board and shield arrays, for more
+# control, add individual board + shield combinations to
+# the `include` property, e.g:
+#
+# board: [ "nice_nano_v2" ]
+# shield: [ "corne_left", "corne_right" ]
+# include:
+#   - board: bdn9_rev2
+#   - board: nice_nano_v2
+#     shield: reviung41
+#
+---
+include:
+  - board: bt60
+    # cmake-args: -DDTS_EXTRA_CPPFLAGS=-DEQUALS60=1
+    # Uncomment above for the Equals60