diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fdd2add4..afe3fe3e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,27 +15,28 @@ jobs:
           path: Arduino-Zephyr-API
 
       - name: Initialize
-        working-directory: Arduino-Zephyr-API
         run: |
-          west init -m https://github.com/zephyrproject-rtos/gsoc-2022-arduino-core.git
+          west init -l Arduino-Zephyr-API/
           west update
           git clone https://github.com/arduino/ArduinoCore-API.git ArduinoCore-API
-          cp -r ArduinoCore-API/api modules/lib/Arduino-Zephyr-API/cores/arduino/.
+          mkdir -p modules/lib
+          ln -s Arduino-Zephyr-API modules/lib/
+          cp -rfp ArduinoCore-API/api Arduino-Zephyr-API/cores/arduino/
 
       - name: Build fade
         working-directory: Arduino-Zephyr-API
         run: |
-          west build -p -b arduino_nano_33_ble_sense samples/fade
+          west build -p -b arduino_nano_33_ble/nrf52840/sense samples/fade
 
       - name: Build i2cdemo
         working-directory: Arduino-Zephyr-API
         run: |
-          west build -p -b arduino_nano_33_ble_sense samples/i2cdemo
+          west build -p -b arduino_nano_33_ble/nrf52840/sense samples/i2cdemo
 
       - name: Build adc
         working-directory: Arduino-Zephyr-API
         run: |
-          west build -p -b beagleconnect_freedom samples/analog_input
+          west build -p -b beagleconnect_freedom/cc1352p7 samples/analog_input
 
       - name: Archive firmware
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/checkpatch.yml b/.github/workflows/checkpatch.yml
index a6ff7bc6..cac90270 100644
--- a/.github/workflows/checkpatch.yml
+++ b/.github/workflows/checkpatch.yml
@@ -20,11 +20,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: 'Calculate PR commits + 1'
-      run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> $GITHUB_ENV
+      run: |
+        echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> $GITHUB_ENV
+        wget https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/refs/heads/main/scripts/checkpatch.pl
     - uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: ${{ env.PR_FETCH_DEPTH }}
     - name: Run checkpatch review
       uses: webispy/checkpatch-action@v9
+      env:
+        CHECKPATCH_COMMAND:  perl ./checkpatch.pl
 
diff --git a/.github/workflows/license_check.yml b/.github/workflows/license_check.yml
index a57e9e57..212c7636 100644
--- a/.github/workflows/license_check.yml
+++ b/.github/workflows/license_check.yml
@@ -2,20 +2,25 @@ name: Scancode
 
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   scancode_job:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     name: Scan code for licenses
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        fetch-depth: 0
     - name: Scan the code
       id: scancode
-      uses: zephyrproject-rtos/action_scancode@v4
+      uses: zephyrproject-rtos/action_scancode@23ef91ce31cd4b954366a7b71eea47520da9b380 # v4
       with:
         directory-to-scan: 'scan/'
     - name: Artifact Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: scancode
         path: ./artifacts
diff --git a/samples/analog_input/CMakeLists.txt b/samples/analog_input/CMakeLists.txt
index 83ac0d6b..b7cbc203 100644
--- a/samples/analog_input/CMakeLists.txt
+++ b/samples/analog_input/CMakeLists.txt
@@ -2,8 +2,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(analog_input)
diff --git a/samples/attach_interrupt/CMakeLists.txt b/samples/attach_interrupt/CMakeLists.txt
index 711b9673..1bf7bce3 100644
--- a/samples/attach_interrupt/CMakeLists.txt
+++ b/samples/attach_interrupt/CMakeLists.txt
@@ -2,8 +2,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(attach_interrupt)
diff --git a/samples/blinky_arduino/CMakeLists.txt b/samples/blinky_arduino/CMakeLists.txt
index e5c58ee3..e3a17bfc 100644
--- a/samples/blinky_arduino/CMakeLists.txt
+++ b/samples/blinky_arduino/CMakeLists.txt
@@ -2,8 +2,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(blinky)
diff --git a/samples/button_press_led/CMakeLists.txt b/samples/button_press_led/CMakeLists.txt
index e5c58ee3..56569b9e 100644
--- a/samples/button_press_led/CMakeLists.txt
+++ b/samples/button_press_led/CMakeLists.txt
@@ -2,11 +2,13 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(blinky)
+project(button_press_led)
 
 target_sources(app PRIVATE src/main.cpp)
 
diff --git a/samples/fade/CMakeLists.txt b/samples/fade/CMakeLists.txt
index 6f3c4cff..c0303418 100644
--- a/samples/fade/CMakeLists.txt
+++ b/samples/fade/CMakeLists.txt
@@ -2,8 +2,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(fade)
diff --git a/samples/hello_arduino/CMakeLists.txt b/samples/hello_arduino/CMakeLists.txt
index 0675b10d..83ea1b05 100644
--- a/samples/hello_arduino/CMakeLists.txt
+++ b/samples/hello_arduino/CMakeLists.txt
@@ -2,8 +2,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hello_world)
diff --git a/samples/i2cdemo/CMakeLists.txt b/samples/i2cdemo/CMakeLists.txt
index e79ab241..e6251ff5 100644
--- a/samples/i2cdemo/CMakeLists.txt
+++ b/samples/i2cdemo/CMakeLists.txt
@@ -2,11 +2,14 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(blinky)
+project(i2cdemo)
 
 target_sources(app PRIVATE src/main.cpp)
+
 zephyr_compile_options(-Wno-unused-variable -Wno-comment)
diff --git a/samples/serial_event/CMakeLists.txt b/samples/serial_event/CMakeLists.txt
index a275e3cc..8493bb79 100644
--- a/samples/serial_event/CMakeLists.txt
+++ b/samples/serial_event/CMakeLists.txt
@@ -2,8 +2,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(serial_event)
diff --git a/samples/spi_controller/CMakeLists.txt b/samples/spi_controller/CMakeLists.txt
index 824634e5..bd1b6e40 100644
--- a/samples/spi_controller/CMakeLists.txt
+++ b/samples/spi_controller/CMakeLists.txt
@@ -2,8 +2,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(spi_controller)
diff --git a/samples/threads_arduino/CMakeLists.txt b/samples/threads_arduino/CMakeLists.txt
index f9aea636..b09f2e20 100644
--- a/samples/threads_arduino/CMakeLists.txt
+++ b/samples/threads_arduino/CMakeLists.txt
@@ -2,11 +2,14 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
-set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
+# get value of NORMALIZED_BOARD_TARGET early
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS yaml boards)
+
+set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/../../variants/${NORMALIZED_BOARD_TARGET}/${NORMALIZED_BOARD_TARGET}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(threads)
 
 target_sources(app PRIVATE src/main.cpp)
-zephyr_compile_options(-Wno-unused-variable -Wno-comment)
\ No newline at end of file
+
+zephyr_compile_options(-Wno-unused-variable -Wno-comment)
diff --git a/variants/arduino_mkrzero/arduino_mkrzero.overlay b/variants/arduino_mkrzero_samd21g18a/arduino_mkrzero_samd21g18a.overlay
similarity index 100%
rename from variants/arduino_mkrzero/arduino_mkrzero.overlay
rename to variants/arduino_mkrzero_samd21g18a/arduino_mkrzero_samd21g18a.overlay
diff --git a/variants/arduino_mkrzero/variant.h b/variants/arduino_mkrzero_samd21g18a/variant.h
similarity index 100%
rename from variants/arduino_mkrzero/variant.h
rename to variants/arduino_mkrzero_samd21g18a/variant.h
diff --git a/variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay b/variants/arduino_nano_33_ble_nrf52840/arduino_nano_33_ble_nrf52840.overlay
similarity index 100%
rename from variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay
rename to variants/arduino_nano_33_ble_nrf52840/arduino_nano_33_ble_nrf52840.overlay
diff --git a/variants/arduino_nano_33_ble/variant.h b/variants/arduino_nano_33_ble_nrf52840/variant.h
similarity index 100%
rename from variants/arduino_nano_33_ble/variant.h
rename to variants/arduino_nano_33_ble_nrf52840/variant.h
diff --git a/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense.overlay b/variants/arduino_nano_33_ble_nrf52840_sense/arduino_nano_33_ble_nrf52840_sense.overlay
similarity index 100%
rename from variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense.overlay
rename to variants/arduino_nano_33_ble_nrf52840_sense/arduino_nano_33_ble_nrf52840_sense.overlay
diff --git a/variants/arduino_nano_33_ble_sense/variant.h b/variants/arduino_nano_33_ble_nrf52840_sense/variant.h
similarity index 100%
rename from variants/arduino_nano_33_ble_sense/variant.h
rename to variants/arduino_nano_33_ble_nrf52840_sense/variant.h
diff --git a/variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay b/variants/arduino_nano_33_iot_samd21g18a/arduino_nano_33_iot_samd21g18a.overlay
similarity index 100%
rename from variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay
rename to variants/arduino_nano_33_iot_samd21g18a/arduino_nano_33_iot_samd21g18a.overlay
diff --git a/variants/arduino_nano_33_iot/variant.h b/variants/arduino_nano_33_iot_samd21g18a/variant.h
similarity index 100%
rename from variants/arduino_nano_33_iot/variant.h
rename to variants/arduino_nano_33_iot_samd21g18a/variant.h
diff --git a/variants/beagleconnect_freedom/beagleconnect_freedom.overlay b/variants/beagleconnect_freedom_cc1352p7/beagleconnect_freedom_cc1352p7.overlay
similarity index 100%
rename from variants/beagleconnect_freedom/beagleconnect_freedom.overlay
rename to variants/beagleconnect_freedom_cc1352p7/beagleconnect_freedom_cc1352p7.overlay
diff --git a/variants/beagleconnect_freedom/variant.h b/variants/beagleconnect_freedom_cc1352p7/variant.h
similarity index 100%
rename from variants/beagleconnect_freedom/variant.h
rename to variants/beagleconnect_freedom_cc1352p7/variant.h
diff --git a/variants/cc3220sf_launchxl/cc3220sf_launchxl.overlay b/variants/cc3220sf_launchxl_cc3220sf/cc3220sf_launchxl_cc3220sf.overlay
similarity index 100%
rename from variants/cc3220sf_launchxl/cc3220sf_launchxl.overlay
rename to variants/cc3220sf_launchxl_cc3220sf/cc3220sf_launchxl_cc3220sf.overlay
diff --git a/variants/cc3220sf_launchxl/variant.h b/variants/cc3220sf_launchxl_cc3220sf/variant.h
similarity index 100%
rename from variants/cc3220sf_launchxl/variant.h
rename to variants/cc3220sf_launchxl_cc3220sf/variant.h
diff --git a/variants/rpi_pico/rpi_pico.overlay b/variants/rpi_pico_rp2040/rpi_pico_rp2040.overlay
similarity index 100%
rename from variants/rpi_pico/rpi_pico.overlay
rename to variants/rpi_pico_rp2040/rpi_pico_rp2040.overlay
diff --git a/variants/rpi_pico/variant.h b/variants/rpi_pico_rp2040/variant.h
similarity index 100%
rename from variants/rpi_pico/variant.h
rename to variants/rpi_pico_rp2040/variant.h
diff --git a/west.yml b/west.yml
index c707e0d6..5715e49d 100644
--- a/west.yml
+++ b/west.yml
@@ -19,5 +19,6 @@ manifest:
       import:
         name-allowlist:
           - cmsis      # required by the ARM port
+          - cmsis_6    # required by the ARM port
           - hal_nordic # required by the custom_plank board (Nordic based)
           - hal_ti