diff --git a/build.yaml b/build.yaml
index 414c9c2..c5d0240 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3,9 +3,9 @@ include:
   - board: nice_nano_v2
     shield: settings_reset
 
-  - board: raytac_mdbt50q_rx
+  - board: raytac_mdbt50q_cx_40
     shield: corne_dongle
-  - board: raytac_mdbt50q_rx
+  - board: raytac_mdbt50q_cx_40
     shield: settings_reset
 
   # Dongle setup: both halves are peripherals (dongle is central)
diff --git a/config/west.yml b/config/west.yml
index efb5611..4ad6586 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -2,15 +2,15 @@ manifest:
   remotes:
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
-    - name: rschenk
-      url-base: https://github.com/rschenk
+    - name: perrwa
+      url-base: https://github.com/perrwa
   projects:
     - name: zmk
       remote: zmkfirmware
       revision: v0.3
       import: app/west.yml
     - name: zmk-component-raytac-dongle
-      remote: rschenk
-      revision: v0.3
+      remote: perrwa
+      revision: perrwa/add-cx40-zmk03
   self:
     path: config