diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 94db218e4a..e1fee5a28f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,4 +14,4 @@ env:
 
 jobs:
   build:
-    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@v0.3.0
+    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
diff --git a/build.yaml b/build.yaml
index 85023152b6..acdbfdb0c9 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,14 +1,6 @@
 ---
+# Canary build: testing ZMK main / Zephyr 4.1 with nice_nano only
+# See: https://github.com/rdlu/zmk-sofle/issues/3
 include:
- # - board: eyelash_sofle_left
-#    shield: nice_view
-  - board: eyelash_sofle_right
-#   shield: nice_view_custom
-    shield: nice_view
-  - board: eyelash_sofle_left
-    shield: nice_view
-    snippet: studio-rpc-usb-uart
-    cmake-args: -DCONFIG_ZMK_STUDIO=y -DCONFIG_ZMK_STUDIO_LOCKING=n
-    artifact-name: eyelash_sofle_studio_left
-  - board: nice_nano_v2
+  - board: nice_nano//zmk
     shield: settings_reset
diff --git a/config/west.yml b/config/west.yml
index 918c40e941..0e67706466 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -17,7 +17,7 @@ manifest:
       revision: main
     - name: zmk
       remote: zmkfirmware
-      revision: v0.3.0
+      revision: main
       import: app/west.yml
   self:
     path: boards