diff --git a/kas/corstone1000-base.yml b/kas/corstone1000-base.yml
index c36b294a..4438bcb8 100644
--- a/kas/corstone1000-base.yml
+++ b/kas/corstone1000-base.yml
@@ -8,19 +8,27 @@ defaults:
     branch: master
 
 repos:
-  meta-arm:
+  bitbake:
+    url: https://git.openembedded.org/bitbake
     layers:
-      meta-arm:
-      meta-arm-bsp:
-      meta-arm-toolchain:
+      bitbake: disabled
 
-  poky:
-    url: https://git.yoctoproject.org/git/poky
-    # commit: 5465094be9a61a1639e1dab6d2b4ebea2bee7440
+  core:
+    url: https://git.openembedded.org/openembedded-core
     layers:
       meta:
+
+  meta-yocto:
+    url: https://git.yoctoproject.org/meta-yocto
+    layers:
       meta-poky:
 
+  meta-arm:
+    layers:
+      meta-arm:
+      meta-arm-bsp:
+      meta-arm-toolchain:
+
   meta-openembedded:
     url: https://git.openembedded.org/meta-openembedded
     # commit: 461d85a1831318747af5abe86da193bcde3fd9b4