diff --git a/build.yaml b/build.yaml
index f236de9..a790d0c 100644
--- a/build.yaml
+++ b/build.yaml
@@ -51,13 +51,14 @@
 # pressing the reset buttons at the same time.
 ---
 include:
-  - board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
-    shield: corne_left nice_view_adapter nice_view # con display
-    # shield: corne_left  # con OLED display
-    # - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
-  - board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
-    shield: corne_right nice_view_adapter nice_view # con display
+  - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
+    shield: corne_left  # con OLED display
+    # shield: corne_left nice_view_adapter nice_view # con display
+    # - board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
+  - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
+    shield: corne_right # con OLED display
+    # shield: corne_right nice_view_adapter nice_view # con display
+    # - board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
     # shield: corne_right # con OLED display
-    # - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
     # - board: puchi_ble_v1
     # shield: settings_reset
diff --git a/config/west.yml b/config/west.yml
index 3215af5..1c439a0 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -2,14 +2,14 @@ manifest:
   remotes:
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
-    - name: urob
-      url-base: https://github.com/urob
-    - name: mctechnology17
-      url-base: https://github.com/mctechnology17
+    - name: petejohanson
+      url-base: https://github.com/petejohanson
   projects:
     - name: zmk
-      remote: mctechnology17
+      remote: zmkfirmware
       revision: main
+      remote: petejohanson
+      revision: power/domains-and-device-runtime
       import: app/west.yml
   self:
     path: config