diff --git a/ci/base.yml b/ci/base.yml
index d8953390..87192fba 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -10,18 +10,27 @@ defaults:
     branch: master
 
 repos:
+  bitbake:
+    url: https://git.openembedded.org/bitbake
+    layers:
+      bitbake: disabled
+
+  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:
 
-  poky:
-    url: https://git.yoctoproject.org/poky
-    layers:
-      meta:
-      meta-poky:
-
 env:
   BB_LOGCONFIG: ""
   TOOLCHAIN_DIR: ""
diff --git a/ci/genericarm64.yml b/ci/genericarm64.yml
index 2fbe766f..48818fb1 100644
--- a/ci/genericarm64.yml
+++ b/ci/genericarm64.yml
@@ -6,7 +6,7 @@ header:
     - ci/base.yml
 
 repos:
-  poky:
+  meta-yocto:
     layers:
       meta-yocto-bsp: