diff --git a/samples/analog_input/CMakeLists.txt b/samples/analog_input/CMakeLists.txt
index 18f057cae..e00f9f946 100644
--- a/samples/analog_input/CMakeLists.txt
+++ b/samples/analog_input/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/samples/attach_interrupt/CMakeLists.txt b/samples/attach_interrupt/CMakeLists.txt
index 7c5731ac5..4ba6c1f41 100644
--- a/samples/attach_interrupt/CMakeLists.txt
+++ b/samples/attach_interrupt/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/samples/blinky_arduino/CMakeLists.txt b/samples/blinky_arduino/CMakeLists.txt
index 8750c193d..cc180ddb1 100644
--- a/samples/blinky_arduino/CMakeLists.txt
+++ b/samples/blinky_arduino/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/samples/button_press_led/CMakeLists.txt b/samples/button_press_led/CMakeLists.txt
index 273b846af..cfe5f8cd6 100644
--- a/samples/button_press_led/CMakeLists.txt
+++ b/samples/button_press_led/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/samples/fade/CMakeLists.txt b/samples/fade/CMakeLists.txt
index 89d6d56c0..cba962b23 100644
--- a/samples/fade/CMakeLists.txt
+++ b/samples/fade/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/samples/hello_arduino/CMakeLists.txt b/samples/hello_arduino/CMakeLists.txt
index 348785758..bd614e6af 100644
--- a/samples/hello_arduino/CMakeLists.txt
+++ b/samples/hello_arduino/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/samples/i2cdemo/CMakeLists.txt b/samples/i2cdemo/CMakeLists.txt
index dea51f7d8..0fe6c4573 100644
--- a/samples/i2cdemo/CMakeLists.txt
+++ b/samples/i2cdemo/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/samples/serial_event/CMakeLists.txt b/samples/serial_event/CMakeLists.txt
index 22b961db5..71dd2ba11 100644
--- a/samples/serial_event/CMakeLists.txt
+++ b/samples/serial_event/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/samples/spi_controller/CMakeLists.txt b/samples/spi_controller/CMakeLists.txt
index cbb8f001d..33f8ad89e 100644
--- a/samples/spi_controller/CMakeLists.txt
+++ b/samples/spi_controller/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/samples/threads_arduino/CMakeLists.txt b/samples/threads_arduino/CMakeLists.txt
index 15202f59b..cd327f501 100644
--- a/samples/threads_arduino/CMakeLists.txt
+++ b/samples/threads_arduino/CMakeLists.txt
@@ -5,10 +5,20 @@ cmake_minimum_required(VERSION 3.20.0)
 # get value of NORMALIZED_BOARD_TARGET early
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
 
-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
-elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
-  set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${NORMALIZED_BOARD_TARGET})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+  set(variant_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../variants/${BOARD})
+endif()
+
+if (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}_${BOARD_REVISION}.overlay)
+elseif (EXISTS ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${NORMALIZED_BOARD_TARGET}.overlay)
+elseif (EXISTS ${variant_dir}/${BOARD}.overlay)
+  set(DTC_OVERLAY_FILE ${variant_dir}/${BOARD}.overlay)
 endif()
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
diff --git a/variants/arduino_mkrzero_samd21g18a/arduino_mkrzero_samd21g18a.overlay b/variants/arduino_mkrzero/arduino_mkrzero.overlay
similarity index 100%
rename from variants/arduino_mkrzero_samd21g18a/arduino_mkrzero_samd21g18a.overlay
rename to variants/arduino_mkrzero/arduino_mkrzero.overlay
diff --git a/variants/arduino_mkrzero_samd21g18a/variant.h b/variants/arduino_mkrzero/variant.h
similarity index 100%
rename from variants/arduino_mkrzero_samd21g18a/variant.h
rename to variants/arduino_mkrzero/variant.h
diff --git a/variants/arduino_nano_33_ble_nrf52840/arduino_nano_33_ble_nrf52840.overlay b/variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay
similarity index 100%
rename from variants/arduino_nano_33_ble_nrf52840/arduino_nano_33_ble_nrf52840.overlay
rename to variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay
diff --git a/variants/arduino_nano_33_ble_nrf52840/variant.h b/variants/arduino_nano_33_ble/variant.h
similarity index 100%
rename from variants/arduino_nano_33_ble_nrf52840/variant.h
rename to variants/arduino_nano_33_ble/variant.h
diff --git a/variants/arduino_nano_33_iot_samd21g18a/arduino_nano_33_iot_samd21g18a.overlay b/variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay
similarity index 100%
rename from variants/arduino_nano_33_iot_samd21g18a/arduino_nano_33_iot_samd21g18a.overlay
rename to variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay
diff --git a/variants/arduino_nano_33_iot_samd21g18a/variant.h b/variants/arduino_nano_33_iot/variant.h
similarity index 100%
rename from variants/arduino_nano_33_iot_samd21g18a/variant.h
rename to variants/arduino_nano_33_iot/variant.h
diff --git a/variants/beagleconnect_freedom_cc1352p7/beagleconnect_freedom_cc1352p7.overlay b/variants/beagleconnect_freedom/beagleconnect_freedom.overlay
similarity index 100%
rename from variants/beagleconnect_freedom_cc1352p7/beagleconnect_freedom_cc1352p7.overlay
rename to variants/beagleconnect_freedom/beagleconnect_freedom.overlay
diff --git a/variants/beagleconnect_freedom_cc1352p7/variant.h b/variants/beagleconnect_freedom/variant.h
similarity index 100%
rename from variants/beagleconnect_freedom_cc1352p7/variant.h
rename to variants/beagleconnect_freedom/variant.h
diff --git a/variants/cc3220sf_launchxl_cc3220sf/cc3220sf_launchxl_cc3220sf.overlay b/variants/cc3220sf_launchxl/cc3220sf_launchxl.overlay
similarity index 100%
rename from variants/cc3220sf_launchxl_cc3220sf/cc3220sf_launchxl_cc3220sf.overlay
rename to variants/cc3220sf_launchxl/cc3220sf_launchxl.overlay
diff --git a/variants/cc3220sf_launchxl_cc3220sf/variant.h b/variants/cc3220sf_launchxl/variant.h
similarity index 100%
rename from variants/cc3220sf_launchxl_cc3220sf/variant.h
rename to variants/cc3220sf_launchxl/variant.h
diff --git a/variants/rpi_pico_rp2040/rpi_pico_rp2040.overlay b/variants/rpi_pico/rpi_pico.overlay
similarity index 100%
rename from variants/rpi_pico_rp2040/rpi_pico_rp2040.overlay
rename to variants/rpi_pico/rpi_pico.overlay
diff --git a/variants/rpi_pico_rp2040/variant.h b/variants/rpi_pico/variant.h
similarity index 100%
rename from variants/rpi_pico_rp2040/variant.h
rename to variants/rpi_pico/variant.h