diff --git a/app/scripts/west-commands.yml b/app/scripts/west-commands.yml
index 64583a90678e..40fee6614a86 100644
--- a/app/scripts/west-commands.yml
+++ b/app/scripts/west-commands.yml
@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: MIT
 
 west-commands:
-  - file: scripts/west_commands/test.py
+  - file: app/scripts/west_commands/test.py
     commands:
       - name: test
         class: Test
         help: run ZMK testsuite
-  - file: scripts/west_commands/metadata.py
+  - file: app/scripts/west_commands/metadata.py
     commands:
       - name: metadata
         class: Metadata
diff --git a/app/west.yml b/app/west.yml
index 1b50247786b4..90bb388b47e6 100644
--- a/app/west.yml
+++ b/app/west.yml
@@ -10,6 +10,7 @@ manifest:
       revision: v3.5.0+zmk-fixes
       clone-depth: 1
       import:
+        path-prefix: modules/zephyr
         name-blocklist:
           - ci-tools
           - hal_altera
@@ -30,4 +31,4 @@ manifest:
           - edtt
           - trusted-firmware-m
   self:
-    west-commands: scripts/west-commands.yml
+    west-commands: app/scripts/west-commands.yml