diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2289bef..c8e3a09 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,12 +1,33 @@
-on: [push, pull_request, workflow_dispatch]
+name: zmk-build-and-release
+
+on:
+  push:
+    paths:
+      - 'config/**'
+      - '.github/workflows/build.yml'
+      - 'build.yaml'
+    branches: [ "mainline" ]
+  pull_request:
+    paths:
+      - 'config/**'
+      - '.github/workflows/build.yml'
+      - 'build.yaml'
+    branches: [ "mainline" ]
+  workflow_dispatch:
 
 jobs:
   build:
-    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
+    permissions:
+      contents: read
+
+    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@v0.3
 
   release:
     needs: build
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
     steps:
       - name: Release artifacts
         uses: softprops/action-gh-release@v2
diff --git a/config/boards/arm/hennish65/CMakeLists.txt b/boards/arm/hennish65/CMakeLists.txt
similarity index 100%
rename from config/boards/arm/hennish65/CMakeLists.txt
rename to boards/arm/hennish65/CMakeLists.txt
diff --git a/config/boards/arm/hennish65/Kconfig.board b/boards/arm/hennish65/Kconfig.board
similarity index 100%
rename from config/boards/arm/hennish65/Kconfig.board
rename to boards/arm/hennish65/Kconfig.board
diff --git a/config/boards/arm/hennish65/Kconfig.defconfig b/boards/arm/hennish65/Kconfig.defconfig
similarity index 100%
rename from config/boards/arm/hennish65/Kconfig.defconfig
rename to boards/arm/hennish65/Kconfig.defconfig
diff --git a/config/boards/arm/hennish65/board.cmake b/boards/arm/hennish65/board.cmake
similarity index 100%
rename from config/boards/arm/hennish65/board.cmake
rename to boards/arm/hennish65/board.cmake
diff --git a/config/boards/arm/hennish65/hennish65.conf b/boards/arm/hennish65/hennish65.conf
similarity index 100%
rename from config/boards/arm/hennish65/hennish65.conf
rename to boards/arm/hennish65/hennish65.conf
diff --git a/config/boards/arm/hennish65/hennish65.dts b/boards/arm/hennish65/hennish65.dts
similarity index 100%
rename from config/boards/arm/hennish65/hennish65.dts
rename to boards/arm/hennish65/hennish65.dts
diff --git a/config/boards/arm/hennish65/hennish65.dtsi b/boards/arm/hennish65/hennish65.dtsi
similarity index 100%
rename from config/boards/arm/hennish65/hennish65.dtsi
rename to boards/arm/hennish65/hennish65.dtsi
diff --git a/config/boards/arm/hennish65/hennish65.keymap b/boards/arm/hennish65/hennish65.keymap
similarity index 100%
rename from config/boards/arm/hennish65/hennish65.keymap
rename to boards/arm/hennish65/hennish65.keymap
diff --git a/config/boards/arm/hennish65/hennish65.yaml b/boards/arm/hennish65/hennish65.yaml
similarity index 100%
rename from config/boards/arm/hennish65/hennish65.yaml
rename to boards/arm/hennish65/hennish65.yaml
diff --git a/config/boards/arm/hennish65/hennish65_defconfig b/boards/arm/hennish65/hennish65_defconfig
similarity index 100%
rename from config/boards/arm/hennish65/hennish65_defconfig
rename to boards/arm/hennish65/hennish65_defconfig
diff --git a/config/boards/shields/sanic62/Kconfig.defconfig b/boards/shields/sanic62/Kconfig.defconfig
similarity index 100%
rename from config/boards/shields/sanic62/Kconfig.defconfig
rename to boards/shields/sanic62/Kconfig.defconfig
diff --git a/config/boards/shields/sanic62/Kconfig.shield b/boards/shields/sanic62/Kconfig.shield
similarity index 100%
rename from config/boards/shields/sanic62/Kconfig.shield
rename to boards/shields/sanic62/Kconfig.shield
diff --git a/config/boards/shields/sanic62/sanic62.conf b/boards/shields/sanic62/sanic62.conf
similarity index 100%
rename from config/boards/shields/sanic62/sanic62.conf
rename to boards/shields/sanic62/sanic62.conf
diff --git a/config/boards/shields/sanic62/sanic62.dtsi b/boards/shields/sanic62/sanic62.dtsi
similarity index 100%
rename from config/boards/shields/sanic62/sanic62.dtsi
rename to boards/shields/sanic62/sanic62.dtsi
diff --git a/config/boards/shields/sanic62/sanic62.keymap b/boards/shields/sanic62/sanic62.keymap
similarity index 100%
rename from config/boards/shields/sanic62/sanic62.keymap
rename to boards/shields/sanic62/sanic62.keymap
diff --git a/config/boards/shields/sanic62/sanic62.zmk.yml b/boards/shields/sanic62/sanic62.zmk.yml
similarity index 100%
rename from config/boards/shields/sanic62/sanic62.zmk.yml
rename to boards/shields/sanic62/sanic62.zmk.yml
diff --git a/config/boards/shields/sanic62/sanic62_left.conf b/boards/shields/sanic62/sanic62_left.conf
similarity index 100%
rename from config/boards/shields/sanic62/sanic62_left.conf
rename to boards/shields/sanic62/sanic62_left.conf
diff --git a/config/boards/shields/sanic62/sanic62_left.overlay b/boards/shields/sanic62/sanic62_left.overlay
similarity index 100%
rename from config/boards/shields/sanic62/sanic62_left.overlay
rename to boards/shields/sanic62/sanic62_left.overlay
diff --git a/config/boards/shields/sanic62/sanic62_right.conf b/boards/shields/sanic62/sanic62_right.conf
similarity index 100%
rename from config/boards/shields/sanic62/sanic62_right.conf
rename to boards/shields/sanic62/sanic62_right.conf
diff --git a/config/boards/shields/sanic62/sanic62_right.overlay b/boards/shields/sanic62/sanic62_right.overlay
similarity index 100%
rename from config/boards/shields/sanic62/sanic62_right.overlay
rename to boards/shields/sanic62/sanic62_right.overlay
diff --git a/config/boards/shields/sodium62/Kconfig.defconfig b/boards/shields/sodium62/Kconfig.defconfig
similarity index 100%
rename from config/boards/shields/sodium62/Kconfig.defconfig
rename to boards/shields/sodium62/Kconfig.defconfig
diff --git a/config/boards/shields/sodium62/Kconfig.shield b/boards/shields/sodium62/Kconfig.shield
similarity index 100%
rename from config/boards/shields/sodium62/Kconfig.shield
rename to boards/shields/sodium62/Kconfig.shield
diff --git a/config/boards/shields/sodium62/sodium62.conf b/boards/shields/sodium62/sodium62.conf
similarity index 100%
rename from config/boards/shields/sodium62/sodium62.conf
rename to boards/shields/sodium62/sodium62.conf
diff --git a/config/boards/shields/sodium62/sodium62.dtsi b/boards/shields/sodium62/sodium62.dtsi
similarity index 100%
rename from config/boards/shields/sodium62/sodium62.dtsi
rename to boards/shields/sodium62/sodium62.dtsi
diff --git a/config/boards/shields/sodium62/sodium62.keymap b/boards/shields/sodium62/sodium62.keymap
similarity index 100%
rename from config/boards/shields/sodium62/sodium62.keymap
rename to boards/shields/sodium62/sodium62.keymap
diff --git a/config/boards/shields/sodium62/sodium62.zmk.yml b/boards/shields/sodium62/sodium62.zmk.yml
similarity index 100%
rename from config/boards/shields/sodium62/sodium62.zmk.yml
rename to boards/shields/sodium62/sodium62.zmk.yml
diff --git a/config/boards/shields/sodium62/sodium62_left.conf b/boards/shields/sodium62/sodium62_left.conf
similarity index 100%
rename from config/boards/shields/sodium62/sodium62_left.conf
rename to boards/shields/sodium62/sodium62_left.conf
diff --git a/config/boards/shields/sodium62/sodium62_left.overlay b/boards/shields/sodium62/sodium62_left.overlay
similarity index 100%
rename from config/boards/shields/sodium62/sodium62_left.overlay
rename to boards/shields/sodium62/sodium62_left.overlay
diff --git a/config/boards/shields/sodium62/sodium62_right.conf b/boards/shields/sodium62/sodium62_right.conf
similarity index 100%
rename from config/boards/shields/sodium62/sodium62_right.conf
rename to boards/shields/sodium62/sodium62_right.conf
diff --git a/config/boards/shields/sodium62/sodium62_right.overlay b/boards/shields/sodium62/sodium62_right.overlay
similarity index 100%
rename from config/boards/shields/sodium62/sodium62_right.overlay
rename to boards/shields/sodium62/sodium62_right.overlay
diff --git a/config/boards/shields/splitreus62/splitreus62.conf b/boards/shields/splitreus62/splitreus62.conf
similarity index 100%
rename from config/boards/shields/splitreus62/splitreus62.conf
rename to boards/shields/splitreus62/splitreus62.conf
diff --git a/config/boards/shields/splitreus62/splitreus62.keymap b/boards/shields/splitreus62/splitreus62.keymap
similarity index 100%
rename from config/boards/shields/splitreus62/splitreus62.keymap
rename to boards/shields/splitreus62/splitreus62.keymap
diff --git a/config/west.yml b/config/west.yml
index 379d291..10b39b7 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -1,11 +1,12 @@
 manifest:
+  defaults:
+    revision: v0.3
   remotes:
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
   projects:
     - name: zmk
       remote: zmkfirmware
-      revision: main
       import: app/west.yml
   self:
     path: config
diff --git a/zephyr/module.yml b/zephyr/module.yml
new file mode 100644
index 0000000..2c80f98
--- /dev/null
+++ b/zephyr/module.yml
@@ -0,0 +1,3 @@
+build:
+  settings:
+    board_root: .
\ No newline at end of file