diff --git a/ci/96b-avenger96.yml b/ci/96b-avenger96.yml
index 6d632f1..bcdccf3 100644
--- a/ci/96b-avenger96.yml
+++ b/ci/96b-avenger96.yml
@@ -1,6 +1,6 @@
 header:
   version: 9
   includes:
-    - base.yml
+    - ci/base.yml
 
 machine: 96b-avenger96
diff --git a/ci/96b-nitrogen.yml b/ci/96b-nitrogen.yml
index ecd96fb..d033d02 100644
--- a/ci/96b-nitrogen.yml
+++ b/ci/96b-nitrogen.yml
@@ -1,6 +1,6 @@
 header:
   version: 9
   includes:
-    - base.yml
+    - ci/base.yml
 
 machine: 96b-nitrogen
diff --git a/ci/arduino-nano-33-ble.yml b/ci/arduino-nano-33-ble.yml
index ca332da..eb878b9 100644
--- a/ci/arduino-nano-33-ble.yml
+++ b/ci/arduino-nano-33-ble.yml
@@ -1,6 +1,6 @@
 header:
   version: 9
   includes:
-    - base.yml
+    - ci/base.yml
 
 machine: arduino-nano-33-ble
diff --git a/ci/base.yml b/ci/base.yml
index fb1699c..678b45d 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -1,7 +1,7 @@
 header:
   version: 11
   includes:
-    - meta-openembedded.yml
+    - ci/meta-openembedded.yml
 
 distro: zephyr
 
diff --git a/ci/intel-x86-64.yml b/ci/intel-x86-64.yml
index 525a38f..23e711c 100644
--- a/ci/intel-x86-64.yml
+++ b/ci/intel-x86-64.yml
@@ -1,6 +1,6 @@
 header:
   version: 9
   includes:
-    - base.yml
+    - ci/base.yml
 
 machine: intel-x86-64
diff --git a/ci/nrf52840dk-nrf52840.yml b/ci/nrf52840dk-nrf52840.yml
index cbbf434..53ab8af 100644
--- a/ci/nrf52840dk-nrf52840.yml
+++ b/ci/nrf52840dk-nrf52840.yml
@@ -1,6 +1,6 @@
 header:
   version: 9
   includes:
-    - base.yml
+    - ci/base.yml
 
 machine: nrf52840dk-nrf52840
diff --git a/ci/qemu-nios2.yml b/ci/qemu-nios2.yml
index c382582..b818371 100644
--- a/ci/qemu-nios2.yml
+++ b/ci/qemu-nios2.yml
@@ -1,7 +1,7 @@
 header:
   version: 9
   includes:
-    - base.yml
+    - ci/base.yml
 
 local_conf_header:
   nonbuilding_tests: |
diff --git a/ci/qemu-x86.yml b/ci/qemu-x86.yml
index ba80dd3..df744a1 100644
--- a/ci/qemu-x86.yml
+++ b/ci/qemu-x86.yml
@@ -1,7 +1,7 @@
 header:
   version: 9
   includes:
-    - base.yml
+    - ci/base.yml
 
 local_conf_header:
   failing_tests: |
diff --git a/ci/stm32mp157c-dk2.yml b/ci/stm32mp157c-dk2.yml
index c833794..8929b00 100644
--- a/ci/stm32mp157c-dk2.yml
+++ b/ci/stm32mp157c-dk2.yml
@@ -1,6 +1,6 @@
 header:
   version: 9
   includes:
-    - base.yml
+    - ci/base.yml
 
 machine: stm32mp157c-dk2