diff --git a/.gitignore b/.gitignore
index 93c801d9..73d3202f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /modules
 /tools
 /zephyr
+/zmk-zephyr
 /zmk-config
 /build
 *.DS_Store
diff --git a/app/west.yml b/app/west.yml
index cab02a5a..ebef0c7e 100644
--- a/app/west.yml
+++ b/app/west.yml
@@ -6,10 +6,12 @@ manifest:
       url-base: https://github.com/zmkfirmware
     - name: microsoft
       url-base: https://github.com/microsoft
+    - name: infused-kim
+      url-base: https://github.com/infused-kim
   projects:
-    - name: zephyr
-      remote: zmkfirmware
-      revision: v2.5.0+zmk-fixes
+    - name: zmk-zephyr
+      remote: infused-kim
+      revision: v2.5.0+zmk-fixes+kim-fixes
       clone-depth: 1
       import:
         # TODO: Rename once upstream offers option like `exclude` or `denylist`