diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb
index bd5ce4f..c2a1e55 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb
@@ -1,3 +1,3 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/basic/blinky"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/basic/blinky"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
index d7ea837..7796f6b 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
@@ -1,3 +1,3 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_client"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/coap_client"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
index dece67d..5e345d4 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
@@ -1,3 +1,3 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_server"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/coap_server"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
index 53d1ef3..73187cf 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
@@ -1,3 +1,3 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/echo_client"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb
index c66c7ec..ebc6dc3 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb
@@ -1,5 +1,5 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/hci_uart"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/bluetooth/hci_uart"
 
 COMPATIBLE_MACHINE = "(96b-nitrogen)"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb
index 20d1700..68b42aa 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb
@@ -4,4 +4,4 @@ console"
 
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/hello_world"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/hello_world"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
index bf99bbd..8bff2be 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
@@ -1,4 +1,4 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/http_client"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/http_client"
 
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
index d4127d6..f4c9db1 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
@@ -3,7 +3,7 @@ inherit testimage
 
 QEMU_BIN_PATH = "${STAGING_BINDIR_NATIVE}"
 
-OECMAKE_SOURCEPATH = "${S}/${ZEPHYR_SRC_DIR}"
+OECMAKE_SOURCEPATH = "${ZEPHYR_BASE}/${ZEPHYR_SRC_DIR}"
 
 addtask deploy after do_compile
 do_install[noexec] = "1"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
index efe2154..a635da2 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
@@ -1,6 +1,6 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/subsys/display/lvgl"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/subsys/display/lvgl"
 
 # TODO Once more machines and displays are supported, add a PACKAGECONFIG.
 EXTRA_OECMAKE:append =" -DSHIELD=adafruit_2_8_tft_touch_v2"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb
index c679798..f314841 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb
@@ -1,3 +1,3 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/net/mqtt_publisher"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/mqtt_publisher"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb
index 3eec58a..5e51c23 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb
@@ -5,6 +5,6 @@ ZEPHYR_MAKE_OUTPUT = "zephyr_openamp_rsc_table.elf"
 ZEPHYR_MAKE_BIN_OUTPUT = "zephyr_openamp_rsc_table.bin"
 ZEPHYR_MAKE_EFI_OUTPUT = "zephyr_openamp_rsc_table.efi"
 
-ZEPHYR_SRC_DIR = "${S}/samples/subsys/ipc/openamp_rsc_table"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/subsys/ipc/openamp_rsc_table"
 
 COMPATIBLE_MACHINE = "(stm32mp157c-dk2)"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb
index b83c6b3..e2b3efd 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb
@@ -1,6 +1,6 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/echo_client"
 
 EXTRA_OECMAKE += "-DOVERLAY_CONFIG=overlay-ot.conf"
 
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp.bb
index 6d3f860..ed86a9b 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp.bb
@@ -1,6 +1,6 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/net/openthread/coprocessor"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/openthread/coprocessor"
 
 EXTRA_OECMAKE += "-DCONF_FILE="prj.conf overlay-rcp.conf overlay-usb-nrf-br.conf" -DDTC_OVERLAY_FILE="usb.overlay" -DCONFIG_OPENTHREAD_THREAD_VERSION_1_2=y"
 
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
index 14655e5..0aac7f6 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
@@ -1,3 +1,3 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_esp"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/bluetooth/peripheral_esp"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb
index 53fc771..80e3505 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb
@@ -1,3 +1,3 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_hr"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/bluetooth/peripheral_hr"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb
index 5a2ac70..2b4fca3 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb
@@ -5,4 +5,4 @@ operate correctly by printing a greeting to the console from two threads."
 
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/philosophers"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/philosophers"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronization.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronization.bb
index 4cb207d..a55736b 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronization.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronization.bb
@@ -5,4 +5,4 @@ operate correctly by printing a greeting to the console from two threads."
 
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/synchronization"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/synchronization"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb
index c2c47d0..b92e986 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb
@@ -1,3 +1,3 @@
 include zephyr-sample.inc
 
-ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/websocket_client"
+ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/websocket_client"