diff --git a/kas/inc/common.yml b/kas/inc/common.yml
index 619bbb53cfaa2edaf8ef42080e4ea6aad4a85276..4f6a149643a35e587c1573d442c4726ccf3618e1 100644
--- a/kas/inc/common.yml
+++ b/kas/inc/common.yml
@@ -3,30 +3,26 @@
 
 header:
   version: 12
-  includes:
-    - repo: meta-ked-bsp
-      file: kas/series/kirkstone.yml
+
+distro: ked
+
+env:
+  SEMVER: 0.0.0-dev
 
 repos:
   meta-ked-bsp:
     url: https://git.kontron-electronics.de/sw/ked/meta-ked-bsp.git
-    refspec: 6.1.0
+    branch: main
     path: layers/meta-ked-bsp
+    layers:
+      layers/meta-ked:
   meta-ked-bootloader:
     layers:
       layers/meta-ked-bootloader:
-  meta-openembedded:
-    layers:
-      .: excluded
-  meta-qt5:
-    layers:
-      .: excluded
-  meta-python2:
-    layers:
-      .: excluded
-  meta-swupdate:
-    layers:
-      .: excluded
-  meta-arm:
+  poky:
+    url: "https://git.yoctoproject.org/git/poky"
+    branch: kirkstone
+    path: layers/poky
     layers:
-      .: excluded
+      meta:
+      meta-poky:
diff --git a/kas/ked-mx8mm.yml b/kas/ked-mx8mm.yml
index 76aa5d9c248e0ee86130b11c768a403c03a93b61..1aebe3a7849a7ea6fc26303992c5b3b5946b860d 100644
--- a/kas/ked-mx8mm.yml
+++ b/kas/ked-mx8mm.yml
@@ -4,9 +4,7 @@
 header:
   version: 12
   includes:
-    - inc/common.yml
-    - repo: meta-ked-bsp
-      file: kas/inc/imx.yml
+    - kas/inc/imx.yml
 
 machine: kontron-mx8mm
 target: