diff --git a/west.yml b/west.yml
index 9515c5f090..bc27451375 100644
--- a/west.yml
+++ b/west.yml
@@ -21,8 +21,8 @@ manifest:
     - name: ncs
       url-base: https://github.com/nrfconnect
     # Third-party repository sources:
-    - name: voxelbotics
-      url-base: https://github.com/voxelbotics
+    - name: emcraftsystems
+      url-base: https://github.com/EmcraftSystems
     - name: zephyrproject
       url-base: https://github.com/zephyrproject-rtos
     - name: throwtheswitch
@@ -65,8 +65,8 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: voxelbotics-v3.5.99-ncs1-1-branch
-      remote: voxelbotics
+      revision: emcraft-v3.5.99-ncs1-1-branch
+      remote: emcraftsystems
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -134,8 +134,8 @@ manifest:
           compare-by-default: true
     - name: mcuboot
       repo-path: sdk-mcuboot
-      revision: voxelbotics-v2.0.99-ncs1-1-branch
-      remote: voxelbotics
+      revision: emcraft-v2.0.99-ncs1-1-branch
+      remote: emcraftsystems
       path: bootloader/mcuboot
     - name: qcbor
       url: https://github.com/laurencelundblade/QCBOR