diff --git a/ci/96b-avenger96.yml b/ci/96b-avenger96.yml
index 6d632f1e5f8d2564640707005f331ceb0a5c3da9..bcdccf34b501f3c5ffa668f9633f391e842e033e 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 ecd96fb6713688688624be9421583af0b29c7a59..d033d02d8a67039e75c7b385f208f2d4a40ba965 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 ca332da44ee8b642a06f023f2c25759323cfdfc9..eb878b99ec21930c6a6fac88d87d8aed6becdb8a 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 fb1699cd7bc45ab13c10f67d172fe3e42e939302..678b45d7725735f72ce3cf139605933e9dd8ff56 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 525a38f6db137fdc3b670dd3573ac0dc3ed147bd..23e711ceac91dfecd5dad321547d5f55f58e4a28 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 cbbf4343aff5c28cd136d9fff61b27f310d0a529..53ab8af3989310d7bf8505f15dd40c615d020089 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 c38258292eed0ba295495f9cd23b0a85712c4d95..b818371c8be0a15f14a5cd5e51e1d79832a22058 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 ba80dd3b5508cb9c9632cae7fe9f9bcebdc53fbd..df744a1206fa82dcca3dd446d80cfd475d4122f9 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 c833794efbe5ab5499583d05ebbcc1a0702f2e03..8929b004ef0f799adc9cbb037d69d645d42a04be 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