diff --git a/.github/test-spec.yml b/.github/test-spec.yml
new file mode 100644
index 00000000000..6da6bdbaa87
--- /dev/null
+++ b/.github/test-spec.yml
@@ -0,0 +1,392 @@
+# This is the Jenkins ci variant of the .github/labler.yaml
+
+"CI-run-zephyr-twister":
+  - any:
+      - "!.github/**/*"
+      - "!doc/**/*"
+      - "!CODEOWNERS"
+      - "!LICENSE"
+      - "!**/*.rst"
+      - "!VERSION"
+      - "!submanifests/**/*"
+      - "!MAINTAINERS.yml"
+      - "!version.h.in"
+      - "!Jenkinsfile"
+      - "!**/*.md"
+
+"CI-iot-zephyr-lwm2m-test":
+  - "drivers/console/**/*"
+  - "drivers/flash/**/*"
+  - "subsys/dfu/boot/**/*"
+  - "subsys/net/ip/**/*"
+  - "subsys/net/lib/http/**/*"
+  - "subsys/net/lib/lwm2m//**/*"
+  - "subsys/net/**/*"
+
+"CI-iot-samples-test":
+  - "boards/nordic/nrf9160dk/**/*"
+  - "dts/arm/nordic/nrf9160*"
+  - "include/net/**/*"
+  - "subsys/net/lib/**/*"
+
+"CI-iot-libraries-test":
+  - "boards/nordic/nrf9160dk/**/*"
+  - "dts/arm/nordic/nrf9160*"
+  - "include/net/socket_ncs.h"
+  - "subsys/testsuite/ztest/**/*"
+
+"CI-lwm2m-test": null
+# Not necessary to run tests on changes to this repo.
+
+"CI-boot-test":
+  - "subsys/mgmt/mcumgr/**/*"
+  - "subsys/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "include/dfu/**/*"
+  - "samples/subsys/mgmt/mcumgr/smp_svr/**/*"
+  - "tests/boot/**/*"
+  - "tests/subsys/dfu/**/*"
+  - "tests/subsys/mgmt/mcumgr/**/*"
+
+"CI-tfm-test":
+  - "boards/nordic/nrf5340dk/**/*"
+  - "boards/nordic/nrf9160dk/**/*"
+  - "drivers/entropy/*"
+  - "dts/arm/nordic/nrf5340*"
+  - "dts/arm/nordic/nrf9160*"
+  - "modules/trusted-firmware-m/**/*"
+  - "samples/tfm_integration/**/*"
+
+"CI-ble-test":
+  - any:
+      - "drivers/bluetooth/**/*"
+  - any:
+      - "dts/arm/nordic/nrf5*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+  - any:
+      - "include/zephyr/bluetooth/**/*"
+      - "!include/zephyr/bluetooth/mesh/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+
+"CI-ble-samples-test":
+  - any:
+      - "drivers/bluetooth/**/*"
+  - any:
+      - "dts/arm/nordic/nrf5*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+  - any:
+      - "include/zephyr/bluetooth/**/*"
+      - "!include/zephyr/bluetooth/mesh/**/*"
+  - "samples/bluetooth/**/*"
+
+"CI-mesh-test":
+  - "subsys/bluetooth/mesh/**/*"
+  - "include/zephyr/bluetooth/mesh/**/*"
+  - "samples/bluetooth/mesh/**/*"
+  - "samples/bluetooth/mesh_demo/**/*"
+  - "samples/bluetooth/mesh_provisioner/**/*"
+  - "tests/bluetooth/mesh/**/*"
+  - "tests/bluetooth/mesh_shell/**/*"
+
+"CI-thingy91-test":
+  - "boards/nordic/nrf9160dk/**/*"
+  - "arch/x86/core/**/*"
+  - "arch/x86/include/**/*"
+  - "drivers/console/**/*"
+  - "drivers/ethernet/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/hwinfo/**/*"
+  - "drivers/interrupt_controller/**/*"
+  - "drivers/net/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/timer/**/*"
+  - "include/**/*"
+  - "kernel/**/*"
+  - "lib/libc/common/source/stdlib/**/*"
+  - "lib/libc/newlib/**/*"
+  - "lib/libc/picolibc/**/*"
+  - "lib/os/**/*"
+  - "lib/posix/**/*"
+  - "misc/**/*"
+  - "modules/mbedtls/**/*"
+  - "soc/x86/ia32/**/*"
+  - "subsys/fs/fcb/**/*"
+  - "subsys/logging/**/*"
+  - "subsys/net/**/*"
+  - "subsys/random/**/*"
+  - "subsys/settings/include/**/*"
+  - "subsys/settings/src/**/*"
+  - "subsys/stats/**/*"
+  - "subsys/storage/flash_map/**/*"
+  - "subsys/storage/stream/**/*"
+  - "subsys/tracing/**/*"
+
+"CI-desktop-test":
+  - "drivers/bluetooth/*"
+  - "subsys/bluetooth/*"
+  - "include/zephyr/bluetooth/*"
+
+"CI-crypto-test":
+  - "boards/nordic/nrf52840dk/**/*"
+  - "boards/nordic/nrf5340dk/**/*"
+  - "boards/nordic/nrf9160dk/**/*"
+  - "drivers/entropy/*"
+  - "drivers/serial/**/*"
+  - "dts/arm/nordic/nrf52840*"
+  - "dts/arm/nordic/nrf5340*"
+  - "dts/arm/nordic/nrf9160*"
+  - "include/drivers/serial/**/*"
+  - "modules/mbedtls/**/*"
+
+"CI-fem-test":
+  - "boards/nordic/**/*"
+  - "drivers/bluetooth/hci/**/*"
+  - "drivers/entropy/**/*"
+  - "dts/bindings/**/*"
+  - "include/zephyr/net/**/*"
+  - "include/zephyr/arch/**/*"
+  - "lib/libc/**/*"
+  - "lib/open-amp/**/*"
+  - "modules/hal_nordic/**/*"
+  - "modules/mbedtls/**/*"
+  - "modules/openthread/**/*"
+  - "modules/trusted-firmware-m/**/*"
+  - "samples/net/sockets/echo_*/**/*"
+  - "share/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/bluetooth/shell/**/*"
+  - "subsys/ipc/**/*"
+  - "Kconfig"
+  - "CMakeLists.txt"
+
+"CI-rs-test":
+  - "boards/nordic/**/*"
+  - "drivers/bluetooth/hci/**/*"
+  - "drivers/entropy/**/*"
+  - "dts/bindings/**/*"
+  - "include/zephyr/net/**/*"
+  - "include/zephyr/arch/**/*"
+  - "lib/libc/**/*"
+  - "lib/open-amp/**/*"
+  - "modules/hal_nordic/**/*"
+  - "modules/mbedtls/**/*"
+  - "modules/openthread/**/*"
+  - "modules/trusted-firmware-m/**/*"
+  - "samples/net/sockets/echo_*/**/*"
+  - "share/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/bluetooth/shell/**/*"
+  - "subsys/ipc/**/*"
+  - "Kconfig"
+  - "CMakeLists.txt"
+
+"CI-thread-test":
+  - "include/zephyr/net/**/*"
+  - "modules/mbedtls/**/*"
+  - "modules/openthread/**/*"
+  - "samples/net/openthread/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-nfc-test":
+  - "drivers/bluetooth/hci/**/*"
+  - "drivers/entropy/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/mbox/**/*"
+  - "drivers/spi/**/*"
+  - "lib/crc/**/*"
+  - "modules/hal_nordic/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/ipc/ipc_service/**/*"
+  - "subsys/fs/**/*"
+  - "subsys/mem_mgmt/**/*"
+  - "subsys/net/**/*"
+  - "subsys/random/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/shell/**/*"
+  - "subsys/storage/**/*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+
+"CI-matter-test":
+  - "include/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/net/**/*"
+  - "subsys/mgmt/mcumgr/**/*"
+  - "drivers/net/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+      - "!subsys/bluetooth/audio/**/*"
+
+"CI-find-my-test":
+  - "boards/nordic/**/*"
+  - "drivers/bluetooth/**/*"
+  - "drivers/entropy/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/usb/**/*"
+  - "drivers/regulator/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/fs/**/*"
+  - "subsys/ipc/**/*"
+  - "subsys/net/**/*"
+  - "subsys/random/**/*"
+  - "subsys/settings/**/*"
+  - "subsys/storage/**/*"
+  - "subsys/tracing/**/*"
+  - "subsys/usb/device/**/*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+
+"CI-rpc-test":
+  - "subsys/ipc/ipc_service/**/*"
+  - "subsys/random/**/*"
+  - "soc/nordic/nrf53/**/*"
+
+"CI-modemshell-test":
+  - "include/net/**/*"
+  - "include/posix/**/*"
+  - "include/shell/**/*"
+  - "drivers/net/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/wifi/**/*"
+  - "subsys/shell/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-positioning-test":
+  - "include/net/**/*"
+  - "include/posix/**/*"
+  - "drivers/net/**/*"
+  - "drivers/wifi/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-cloud-test":
+  - "include/zephyr/dfu/**/*"
+  - "include/zephyr/net/**/*"
+  - "include/zephyr/posix/**/*"
+  - "include/zephyr/settings/**/*"
+  - "drivers/led/**/*"
+  - "drivers/net/**/*"
+  - "drivers/sensor/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/wifi/**/*"
+  - "lib/posix/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/net/**/*"
+  - "subsys/settings/**/*"
+
+"CI-wifi":
+  - "subsys/net/l2/wifi/**/*"
+  - "subsys/net/l2/ethernet/**/*"
+
+"CI-audio-test":
+  - "boards/nordic/nrf5340_audio_dk/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/spi/**/*"
+  - "drivers/gpio/**/*"
+  - "drivers/i2c/**/*"
+  - "drivers/watchdog/**/*"
+  - "include/dfu/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "samples/bluetooth/hci_ipc/**/*"
+  - "soc/nordic/**/*"
+  - "subsys/bluetooth/audio/**/*"
+  - "subsys/bluetooth/host/**/*"
+  - "subsys/dfu/**/*"
+  - "subsys/fs/**/*"
+  - "subsys/mgmt/mcumgr/**/*"
+  - "subsys/sd/**/*"
+  - "subsys/storage/**/*"
+  - "subsys/task_wdt/**/*"
+  - "subsys/usb/**/*"
+  - "subsys/zbus/**/*"
+
+"CI-pmic-samples-test":
+  - "samples/shields/npm1300_ek/**/*"
+  - "boards/shields/npm1300_ek/**/*"
+  - "**/**npm1300**/**"
+  - "drivers/regulator/regulator_common.c"
+  - "drivers/regulator/regulator_shell.c"
+  - "drivers/gpio/gpio_shell.c"
+  - "drivers/sensor/sensor_shell.c"
+
+"CI-test-low-level":
+  - "arch/**/*"
+  - "boards/nordic/nrf54*/**/*"
+  - "drivers/**/*"
+  - "dts/**/*"
+  - "include/zephyr/**/*"
+  - "kernel/**/*"
+  - "modules/hal_nordic/**/*"
+  - "samples/basic/blinky_pwm/**/*"
+  - "samples/basic/fade_led/**/*"
+  - "samples/boards/nrf/**/*"
+  - "samples/boards/nordic/**/*"
+  - "samples/drivers/adc/**/*"
+  - "samples/drivers/jesd216/**/*"
+  - "samples/drivers/mbox/**/*"
+  - "samples/drivers/soc_flash_nrf/**/*"
+  - "samples/drivers/spi_flash/**/*"
+  - "samples/drivers/watchdog/**/*"
+  - "samples/hello_world/**/*"
+  - "samples/sensor/**/*"
+  - "samples/subsys/ipc/**/*"
+  - "samples/subsys/logging/**/*"
+  - "samples/subsys/settings/**/*"
+  - "samples/subsys/usb/cdc_acm/**/*"
+  - "samples/subsys/usb/mass/**/*"
+  - "samples/synchronization/**/*"
+  - "subsys/logging/**/*"
+  - "subsys/settings/**/*"
+  - "tests/arch/**/*"
+  - "tests/boards/nrf/**/*"
+  - "tests/boards/nordic/**/*"
+  - "tests/drivers/**/*"
+  - "tests/kernel/**/*"
+
+"CI-suit-dfu-test":
+  - "subsys/mgmt/mcumgr/**/*"
+  - "include/mgmt/mcumgr/**/*"
+  - "samples/subsys/mgmt/mcumgr/smp_svr/**/*"
+  - "subsys/bluetooth/**/*"
+  - "drivers/bluetooth/**/*"
+  - "drivers/flash/**/*"
+  - "drivers/spi/**/*"
+  - "drivers/mbox/**/*"
+  - "drivers/serial/**/*"
+  - "drivers/console/**/*"
+  - "drivers/gpio/**/*"
+  - "dts/common/nordic/*"
+  - "dts/arm/nordic/nrf54h*/**/*"
+  - "dts/riscv/nordic/nrf54h*/**/*"
+  - "boards/nordic/nrf54h*/**/*"
+  - "soc/nordic/nrf54h/**/*"
+  - "include/zephyr/**/*"
+  - "subsys/logging/**/*"
+  - "subsys/tracing/**/*"
+  - "scripts/west_commands/build.py"
+  - "scripts/west_commands/flash.py"
+  - "scripts/west_commands/runners/nrfutil.py"
+  - "scripts/west_commands/runners/core.py"
+  - "scripts/west_commands/runners/nrf_common.py"
diff --git a/.github/workflows/commit-tags.yml b/.github/workflows/commit-tags.yml
new file mode 100644
index 00000000000..828f0297167
--- /dev/null
+++ b/.github/workflows/commit-tags.yml
@@ -0,0 +1,28 @@
+name: Commit tags
+
+on:
+  pull_request:
+    types: [synchronize, opened, reopened, edited, labeled, unlabeled,
+            milestoned, demilestoned, assigned, unassigned, ready_for_review,
+            review_requested]
+
+jobs:
+  commit_tags:
+    runs-on: ubuntu-22.04
+    name: Run commit tags checks on patch series (PR)
+    steps:
+    - name: Update PATH for west
+      run: |
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: Checkout the code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+
+    - name: Run the commit tags
+      uses: nrfconnect/action-commit-tags@main
+      with:
+        target: .
+        upstream: zephyrproject-rtos/zephyr/main
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
index 12f2601c016..62e209860be 100644
--- a/.github/workflows/compliance.yml
+++ b/.github/workflows/compliance.yml
@@ -34,8 +34,8 @@ jobs:
         git config --global user.name "Your Name"
         git remote -v
         # Ensure there's no merge commits in the PR
-        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        (echo "::error ::Merge commits not allowed, rebase instead";false)
+        #[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
+        #(echo "::error ::Merge commits not allowed, rebase instead";false)
         rm -fr ".git/rebase-apply"
         rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
@@ -72,12 +72,9 @@ jobs:
         git log  --pretty=oneline | head -n 10
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
-        excludes="-e KconfigBasic -e SysbuildKconfigBasic -e ClangFormat"
-        # The signed-off-by check for dependabot should be skipped
-        if [ "${{ github.actor }}" == "dependabot[bot]" ]; then
-          excludes="$excludes -e Identity"
-        fi
-        ./scripts/ci/check_compliance.py --annotate $excludes -c origin/${BASE_REF}..
+        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e SysbuildKconfigBasic \
+        -e Kconfig -e SysbuildKconfig -e KconfigBasicNoModules -e SysbuildKconfigBasicNoModules \
+        -e ModulesMaintainers -c origin/${BASE_REF}..
 
     - name: upload-results
       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
diff --git a/.github/workflows/manifest-PR.yml b/.github/workflows/manifest-PR.yml
new file mode 100644
index 00000000000..a871aa381de
--- /dev/null
+++ b/.github/workflows/manifest-PR.yml
@@ -0,0 +1,17 @@
+name: handle manifest PR
+on:
+  pull_request_target:
+    types: [opened, synchronize, closed]
+    branches:
+      - main
+
+
+jobs:
+  call-manifest-pr-action:
+    runs-on: ubuntu-latest
+    steps:
+      - name: handle manifest PR
+        uses: nrfconnect/action-manifest-pr@main
+        with:
+          token: ${{ secrets.NCS_GITHUB_TOKEN }}
+          manifest-pr-title-details: ${{ github.event.pull_request.title }}
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000000..3b9cf002239
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,5 @@
+@Library("CI_LIB") _
+
+def pipeline = new ncs.sdk_zephyr.Main()
+
+pipeline.run(JOB_NAME)
diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 12ac45e4e4d..1d6ce194239 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -1034,7 +1034,6 @@ Documentation:
     - doc/images/Zephyr-Kite-in-tree.png
     - doc/index-tex.rst
     - doc/index.rst
-    - doc/kconfig.rst
     - doc/templates/sample.tmpl
     - doc/templates/board.tmpl
     - boards/index.rst
diff --git a/arch/arm/core/mpu/arm_mpu_regions.c b/arch/arm/core/mpu/arm_mpu_regions.c
index 0bf7a219c27..383fd573513 100644
--- a/arch/arm/core/mpu/arm_mpu_regions.c
+++ b/arch/arm/core/mpu/arm_mpu_regions.c
@@ -8,6 +8,9 @@
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
 
 #include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#if USE_PARTITION_MANAGER
+#include <pm_config.h>
+#endif
 
 static const struct arm_mpu_region mpu_regions[] = {
 #ifdef CONFIG_XIP
@@ -24,6 +27,14 @@ static const struct arm_mpu_region mpu_regions[] = {
 
 	/* Region 1 */
 	MPU_REGION_ENTRY("SRAM_0",
+#if USE_PARTITION_MANAGER
+			 PM_SRAM_ADDRESS,
+#if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
+			 REGION_RAM_ATTR(PM_SRAM_ADDRESS, PM_SRAM_SIZE)),
+#else
+			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
+#endif
+#else
 			 CONFIG_SRAM_BASE_ADDRESS,
 #if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
 			 REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS, \
@@ -31,6 +42,8 @@ static const struct arm_mpu_region mpu_regions[] = {
 #else
 			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
 #endif
+
+#endif /* USE_PARTITION_MANAGER */
 };
 
 const struct arm_mpu_config mpu_config = {
diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
index de513858e9c..c509f968db6 100644
--- a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
+++ b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -4,9 +4,11 @@
 config BOARD_NRF54H20DK
 	select SOC_NRF54H20_CPUAPP if (BOARD_NRF54H20DK_NRF54H20_CPUAPP || \
 				       BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON)
-	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
+	select SOC_NRF54H20_CPURAD if (BOARD_NRF54H20DK_NRF54H20_CPURAD || \
+				       BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON)
 	select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
 				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP)
 	select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
 				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP)
-	select SOC_NRF54H20_IRON if BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON
+	select SOC_NRF54H20_IRON if (BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON || \
+				       BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON)
diff --git a/boards/nordic/nrf54h20dk/board.cmake b/boards/nordic/nrf54h20dk/board.cmake
index 5ad6557c003..093155e9322 100644
--- a/boards/nordic/nrf54h20dk/board.cmake
+++ b/boards/nordic/nrf54h20dk/board.cmake
@@ -2,8 +2,10 @@
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 
-if(CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD
-    OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON)
+if(CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP OR
+   CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD OR
+   CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON OR
+   CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON)
   if(CONFIG_SOC_NRF54H20_CPUAPP)
     set(JLINKSCRIPTFILE ${CMAKE_CURRENT_LIST_DIR}/support/nrf54h20_cpuapp.JLinkScript)
   else()
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
index 2009cc6130b..a54cf1ae549 100644
--- a/boards/nordic/nrf54h20dk/board.yml
+++ b/boards/nordic/nrf54h20dk/board.yml
@@ -11,6 +11,8 @@ board:
       cpucluster: cpuflpr
     - name: iron
       cpucluster: cpuapp
+    - name: iron
+      cpucluster: cpurad
   revision:
     format: major.minor.patch
     default: "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf_iron.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf_iron.dtsi
new file mode 100644
index 00000000000..a44db40538d
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-ipc_conf_iron.dtsi
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* This file is to be merged with the original ipc_conf.dtsi in the future. */
+
+/ {
+	ipc {
+		/delete-node/ ipc-1-2;
+		/delete-node/ ipc-1-3;
+
+		cpusec_cpuapp_ipc: ipc-1-2 {
+			compatible = "nordic,ironside-call";
+			memory-region = <&cpusec_cpuapp_ipc_shm>;
+			mboxes = <&cpusec_bellboard 12>,
+				 <&cpuapp_bellboard 0>;
+			status = "disabled";
+		};
+
+		cpusec_cpurad_ipc: ipc-1-3 {
+			compatible = "nordic,ironside-call";
+			memory-region = <&cpusec_cpurad_ipc_shm>;
+			mboxes = <&cpusec_bellboard 18>,
+				 <&cpurad_bellboard 0>;
+			status = "disabled";
+		};
+	};
+};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map_iron.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map_iron.dtsi
new file mode 100644
index 00000000000..2977e83758b
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map_iron.dtsi
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* This file is to be merged with the original memory_map.dtsi in the future.
+ * The following nodes will be replaced:
+ */
+/delete-node/ &cpuapp_cpusec_ipc_shm;
+/delete-node/ &cpuapp_cpusys_ipc_shm;
+/delete-node/ &cpurad_cpusec_ipc_shm;
+/delete-node/ &cpurad_cpusys_ipc_shm;
+/delete-node/ &cpusec_cpuapp_ipc_shm;
+/delete-node/ &cpusec_cpurad_ipc_shm;
+/delete-node/ &cpusys_cpuapp_ipc_shm;
+/delete-node/ &cpusys_cpurad_ipc_shm;
+/delete-node/ &cpuapp_rw_partitions;
+/delete-node/ &cpuapp_rx_partitions;
+/delete-node/ &cpurad_rx_partitions;
+
+/ {
+	reserved-memory {
+		cpuapp_cpusys_ipc_shm: memory@2f88f600 {
+			reg = <0x2f88f600 0x80>;
+		};
+
+		cpusys_cpuapp_ipc_shm: memory@2f88f680 {
+			reg = <0x2f88f680 0x80>;
+		};
+
+		cpurad_cpusys_ipc_shm: memory@2f88f700 {
+			reg = <0x2f88f700 0x80>;
+		};
+
+		cpusys_cpurad_ipc_shm: memory@2f88f780 {
+			reg = <0x2f88f780 0x80>;
+		};
+
+		cpusec_cpurad_ipc_shm: memory@2f88f800 {
+			reg = <0x2f88f800 0x80>;
+		};
+
+		cpurad_ironside_se_event_report: memory@2f88f880 {
+			reg = <0x2f88f880 0x100>;
+		};
+
+		cpurad_ironside_se_boot_report: memory@2f88f980 {
+			reg = <0x2f88f980 0x200>;
+		};
+
+		cpusec_cpuapp_ipc_shm: memory@2f88fb80 {
+			reg = <0x2f88fb80 0x80>;
+		};
+
+		cpuapp_ironside_se_event_report: memory@2f88fc00 {
+			reg = <0x2f88fc00 0x100>;
+		};
+
+		cpuapp_ironside_se_boot_report: memory@2f88fd00 {
+			reg = <0x2f88fd00 0x200>;
+		};
+	};
+};
+
+&mram1x {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpuapp_boot_partition: partition@2c000 {
+			reg = <0x2c000 DT_SIZE_K(64)>;
+		};
+
+		cpuapp_slot0_partition: partition@3c000 {
+			reg = <0x3c000 DT_SIZE_K(336)>;
+		};
+
+		cpurad_slot0_partition: partition@90000 {
+			reg = <0x90000 DT_SIZE_K(336)>;
+		};
+
+		cpuppr_code_partition: partition@e4000 {
+			reg = <0xe4000 DT_SIZE_K(64)>;
+		};
+
+		cpuflpr_code_partition: partition@f4000 {
+			reg = <0xf4000 DT_SIZE_K(48)>;
+		};
+
+		cpuapp_slot1_partition: partition@100000 {
+			reg = <0x100000 DT_SIZE_K(336)>;
+		};
+
+		cpurad_slot1_partition: partition@154000 {
+			reg = <0x154000 DT_SIZE_K(336)>;
+		};
+
+		storage_partition: partition@1a8000 {
+			reg = <0x1a8000 DT_SIZE_K(40)>;
+		};
+	};
+};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index c9c6603950f..6f28374d976 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -26,6 +26,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
+		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -106,6 +107,11 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ram0x_region {
@@ -143,11 +149,16 @@
 };
 
 &cpusec_cpuapp_ipc {
+	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpuapp_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpuapp_ipc_shm>;
 };
 
+&cpusec_bellboard {
+	status = "okay";
+};
+
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "rx", "tx";
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
index 943b2fb828a..1884ce0a4d0 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
@@ -17,6 +17,7 @@ supported:
   - counter
   - gpio
   - i2c
+  - i2s
   - pwm
   - retained_mem
   - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts
index 54e3014adea..245c4ee28d8 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts
@@ -5,13 +5,10 @@
  */
 
 #include "nrf54h20dk_nrf54h20_cpuapp.dts"
+#include "nrf54h20dk_nrf54h20-ipc_conf_iron.dtsi"
+#include "nrf54h20dk_nrf54h20-memory_map_iron.dtsi"
 
-/delete-node/&cpurad_rx_partitions;
-/delete-node/&cpuapp_rx_partitions;
-
-/* This is not yet an exhaustive memory map, and contain only a minimum required to boot
- * the application core.
- */
+/delete-node/ &cpusec_cpurad_ipc;
 
 / {
 	chosen {
@@ -20,34 +17,23 @@
 	};
 };
 
-&mram1x {
-	cpuapp_rx_partitions: cpuapp-rx-partitions {
-		compatible = "nordic,owned-partitions", "fixed-partitions";
-		nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot_partition: partition@2c000 {
-			label = "mcuboot";
-			reg = <0x2c000 DT_SIZE_K(64)>;
-		};
-
-		slot0_partition: partition@3c000 {
-			label = "image-0";
-			reg = <0x3c000 DT_SIZE_K(200)>;
-		};
-
-		slot1_partition: partition@6E000 {
-			label = "image-1";
-			reg = <0x6E000 DT_SIZE_K(200)>;
-		};
-
-		cpuppr_code_partition: partition@a4000 {
-			reg = <0xa4000 DT_SIZE_K(64)>;
-		};
-
-		cpuflpr_code_partition: partition@b4000 {
-			reg = <0xb4000 DT_SIZE_K(48)>;
-		};
-	};
+&cpusec_bellboard {
+	status = "okay";
+};
+
+&cpusec_cpuapp_ipc {
+	mbox-names = "tx", "rx";
+	status = "okay";
+};
+
+boot_partition: &cpuapp_boot_partition {
+	label = "mcuboot";
+};
+
+slot0_partition: &cpuapp_slot0_partition {
+	label = "image-0";
+};
+
+slot1_partition: &cpuapp_slot1_partition {
+	label = "image-1";
 };
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
index 383512caaf3..8734ff9f745 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -27,6 +27,11 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
+	};
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
@@ -59,11 +64,16 @@
 };
 
 &cpusec_cpurad_ipc {
+	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpurad_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpurad_ipc_shm>;
 };
 
+&cpusec_bellboard {
+	status = "okay";
+};
+
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "tx", "rx";
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron.dts
new file mode 100644
index 00000000000..d9f2ec40f6f
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "nrf54h20dk_nrf54h20_cpurad.dts"
+#include "nrf54h20dk_nrf54h20-ipc_conf_iron.dtsi"
+#include "nrf54h20dk_nrf54h20-memory_map_iron.dtsi"
+
+/ {
+	chosen {
+		zephyr,code-partition = &cpurad_slot0_partition;
+		zephyr,uart-mcumgr = &uart135;
+	};
+};
+
+
+&cpusec_cpurad_ipc {
+	mbox-names = "tx", "rx";
+	status = "okay";
+};
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron_0_9_0.yaml
new file mode 100644
index 00000000000..ef71cfa924c
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron_0_9_0.yaml
@@ -0,0 +1,20 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: nrf54h20dk/nrf54h20/cpurad/iron
+name: nRF54H20-DK-nRF54H20-Radio (IRONside SE compatible) (revision 0.9.0)
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 192
+flash: 336
+supported:
+  - counter
+  - gpio
+  - pwm
+  - retained_mem
+  - spi
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron_defconfig b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron_defconfig
new file mode 100644
index 00000000000..0ee0a96f99d
--- /dev/null
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron_defconfig
@@ -0,0 +1,28 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# MPU-based null-pointer dereferencing detection cannot be applied
+# as the (0x0 - 0x400) region is unmapped for this target.
+CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
+
+# Enable cache
+CONFIG_CACHE_MANAGEMENT=y
+CONFIG_EXTERNAL_CACHE=y
+
+# UICR generation is not supported, and when reintroduced will not use nrf-regtool.
+CONFIG_NRF_REGTOOL_GENERATE_UICR=n
diff --git a/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi
index 0bdab1b8851..d3b0156e838 100644
--- a/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi
@@ -18,7 +18,7 @@
 		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
 		zephyr,flash = &cpuapp_rram;
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,ieee802154 = &ieee802154;
 	};
 };
@@ -113,7 +113,7 @@
 	status = "okay";
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index 9628b1fdf96..b7b15587c58 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -9,6 +9,7 @@ if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
 	BOARD_NRF54L15DK_NRF54L15_CPUAPP
 
 config ROM_START_OFFSET
+	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
index 457694d4214..16bcd4d6f36 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
+++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi
@@ -18,7 +18,7 @@
 		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
 		zephyr,flash = &cpuapp_rram;
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,ieee802154 = &ieee802154;
 	};
 };
@@ -112,7 +112,7 @@
 	status = "okay";
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
index 94ff06e7bbe..164fd22206b 100644
--- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
+++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp.yaml
@@ -17,6 +17,7 @@ supported:
   - dmic
   - gpio
   - i2c
+  - i2s
   - pwm
   - spi
   - watchdog
diff --git a/boards/nordic/nrf7002dk/CMakeLists.txt b/boards/nordic/nrf7002dk/CMakeLists.txt
new file mode 100644
index 00000000000..db20255712b
--- /dev/null
+++ b/boards/nordic/nrf7002dk/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if((CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS) AND
+   CONFIG_BOARD_ENABLE_CPUNET)
+  zephyr_library()
+  zephyr_library_sources(nrf5340_cpunet_reset.c)
+endif()
diff --git a/boards/nordic/nrf7002dk/Kconfig b/boards/nordic/nrf7002dk/Kconfig
index e599cbcce07..bf5b239c98c 100644
--- a/boards/nordic/nrf7002dk/Kconfig
+++ b/boards/nordic/nrf7002dk/Kconfig
@@ -10,7 +10,9 @@ config MBOX_NRFX_IPC
 	default MBOX
 
 if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 
 config BT_HCI_IPC
 	default y if BT
@@ -38,7 +40,9 @@ config BT_ECC
 config DOMAIN_CPUAPP_BOARD
 	string
 	default "nrf7002dk/nrf5340/cpuapp" if BOARD_NRF7002DK_NRF5340_CPUAPP
+	default "nrf7002dk/nrf5340/cpuapp/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NS
 	default "nrf7002dk/nrf5340/cpuapp/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+	default "nrf7002dk/nrf5340/cpuapp/nrf7001/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
 	help
 	  The board which will be used for CPUAPP domain when creating a multi
 	  image application where one or more images should be located on
diff --git a/boards/nordic/nrf7002dk/Kconfig.defconfig b/boards/nordic/nrf7002dk/Kconfig.defconfig
new file mode 100644
index 00000000000..a6357ae50b2
--- /dev/null
+++ b/boards/nordic/nrf7002dk/Kconfig.defconfig
@@ -0,0 +1,76 @@
+# nRF5340 DK nRF5340 board configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+# By default, if we build for a Non-Secure version of the board,
+# force building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+if BUILD_WITH_TFM
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	bool
+	default y
+
+endif # BUILD_WITH_TFM
+
+# Code Partition:
+#
+# For the secure version of the board the firmware is linked at the beginning
+# of the flash, or into the code-partition defined in DT if it is intended to
+# be loaded by MCUboot. If the secure firmware is to be combined with a non-
+# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always
+# be restricted to the size of its code partition.
+#
+# For the non-secure version of the board, the firmware
+# must be linked into the code-partition (non-secure) defined in DT, regardless.
+# Apply this configuration below by setting the Kconfig symbols used by
+# the linker according to the information extracted from DT partitions.
+
+# SRAM Partition:
+#
+# If the secure firmware is to be combined with a non-secure image
+# (TRUSTED_EXECUTION_SECURE=y), the secure FW image SRAM shall always
+# be restricted to the secure image SRAM partition (sram-secure-partition).
+# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole zephyr,sram
+# may be used by the image.
+#
+# For the non-secure version of the board, the firmware image SRAM is
+# always restricted to the allocated non-secure SRAM partition.
+#
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
+
+if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) && \
+	TRUSTED_EXECUTION_SECURE
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config SRAM_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)
+
+endif
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+config FLASH_LOAD_OFFSET
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+endif
+
+endif
diff --git a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
index 61b9e818f36..91f52ee6f08 100644
--- a/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
+++ b/boards/nordic/nrf7002dk/Kconfig.nrf7002dk
@@ -4,4 +4,6 @@
 config BOARD_NRF7002DK
 	select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF7002DK_NRF5340_CPUNET
 	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF7002DK_NRF5340_CPUAPP || \
-					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
diff --git a/boards/nordic/nrf7002dk/board.cmake b/boards/nordic/nrf7002dk/board.cmake
index f85bbc86f48..11a27910eeb 100644
--- a/boards/nordic/nrf7002dk/board.cmake
+++ b/boards/nordic/nrf7002dk/board.cmake
@@ -1,10 +1,24 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001)
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
   board_runner_args(nrfutil "--ext-mem-config-file=${BOARD_DIR}/support/nrf7002dk_spi_nrfutil_config.json")
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
-elseif(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
+endif()
+
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
+endif()
+
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
diff --git a/boards/nordic/nrf7002dk/board.yml b/boards/nordic/nrf7002dk/board.yml
index 4f41341e442..39db5dcfa3a 100644
--- a/boards/nordic/nrf7002dk/board.yml
+++ b/boards/nordic/nrf7002dk/board.yml
@@ -5,5 +5,9 @@ board:
   socs:
     - name: nrf5340
       variants:
+        - name: ns
+          cpucluster: cpuapp
         - name: nrf7001
           cpucluster: cpuapp
+          variants:
+            - name: ns
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
new file mode 100644
index 00000000000..5ff28accf3f
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.dts
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
+#include "nrf5340_cpuapp_common.dtsi"
+
+/ {
+	model = "Nordic NRF5340 DK NRF5340 Application";
+	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
+
+	chosen {
+		zephyr,sram = &sram0_ns;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,entropy = &psa_rng;
+		zephyr,wifi = &wlan0;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+};
+
+&qspi {
+	nrf70: nrf7001@1 {
+		compatible = "nordic,nrf7001-qspi";
+		status = "okay";
+		reg = <1>;
+		qspi-frequency = <24000000>;
+		qspi-quad-mode;
+
+		#include "nrf70_common.dtsi"
+	};
+};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
new file mode 100644
index 00000000000..16575969126
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns.yaml
@@ -0,0 +1,19 @@
+identifier: nrf7002dk/nrf5340/cpuapp/nrf7001/ns
+name: NRF7002-DK-NRF7001-NRF5340-application-MCU-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 192
+flash: 192
+supported:
+  - gpio
+  - i2c
+  - pwm
+  - watchdog
+  - usbd
+  - usb_device
+  - netif:openthread
+vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
new file mode 100644
index 00000000000..2c435653140
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_nrf7001_ns_defconfig
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# Enable uart driver
+CONFIG_SERIAL=y
+
+# enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
new file mode 100644
index 00000000000..0deb8ccc1bf
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.dts
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf5340_cpuappns_qkaa.dtsi>
+#include "nrf5340_cpuapp_common.dtsi"
+
+/ {
+	model = "Nordic NRF5340 DK NRF5340 Application";
+	compatible = "nordic,nrf5340-dk-nrf5340-cpuapp";
+
+	chosen {
+		zephyr,sram = &sram0_ns_app;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_ns_partition;
+		zephyr,entropy = &psa_rng;
+		zephyr,wifi = &wlan0;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+};
+
+&qspi {
+	nrf70: nrf7002@1 {
+		compatible = "nordic,nrf7002-qspi";
+		status = "okay";
+		reg = <1>;
+		qspi-frequency = <24000000>;
+		qspi-quad-mode;
+
+		#include "nrf70_common.dtsi"
+		#include "nrf70_common_5g.dtsi"
+	};
+};
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
new file mode 100644
index 00000000000..ea43785b455
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns.yaml
@@ -0,0 +1,19 @@
+identifier: nrf7002dk/nrf5340/cpuapp/ns
+name: NRF7002-DK-NRF5340-application-MCU-Non-Secure
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+ram: 192
+flash: 192
+supported:
+  - gpio
+  - i2c
+  - pwm
+  - watchdog
+  - usbd
+  - usb_device
+  - netif:openthread
+vendor: nordic
diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
new file mode 100644
index 00000000000..1886b926bfd
--- /dev/null
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpuapp_ns_defconfig
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# This Board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+# Enable uart driver
+CONFIG_SERIAL=y
+
+# enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
diff --git a/boards/nordic/nrf9131ek/Kconfig.defconfig b/boards/nordic/nrf9131ek/Kconfig.defconfig
index b63e7ef8d34..8e0e1d02d1d 100644
--- a/boards/nordic/nrf9131ek/Kconfig.defconfig
+++ b/boards/nordic/nrf9131ek/Kconfig.defconfig
@@ -5,6 +5,21 @@
 
 if BOARD_NRF9131EK_NRF9131 || BOARD_NRF9131EK_NRF9131_NS
 
+# By default, if we build for a Non-Secure version of the board,
+# enable building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF9131EK_NRF9131_NS
+
+if BUILD_WITH_TFM
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	bool
+	default y
+
+endif # BUILD_WITH_TFM
+
 # For the secure version of the board the firmware is linked at the beginning
 # of the flash, or into the code-partition defined in DT if it is intended to
 # be loaded by MCUboot. If the secure firmware is to be combined with a non-
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
index bbd09a534c2..6abddbeafcc 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
@@ -27,6 +27,7 @@
 		zephyr,ieee802154 = &cpuapp_ieee802154;
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
 	};
 
 	aliases {
@@ -107,6 +108,11 @@
 			pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>;
 		};
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuapp_ram0x_region {
diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
index f9bfae09897..f1f3af54132 100644
--- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
+++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
@@ -28,6 +28,11 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
+		zephyr,entropy = &prng;
+	};
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
diff --git a/boards/nordic/thingy53/Kconfig.defconfig b/boards/nordic/thingy53/Kconfig.defconfig
index d149d360f85..f024144451a 100644
--- a/boards/nordic/thingy53/Kconfig.defconfig
+++ b/boards/nordic/thingy53/Kconfig.defconfig
@@ -5,6 +5,12 @@
 
 if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
+config BOOTLOADER_MCUBOOT
+	default y if !MCUBOOT
+
+config BOARD_ENABLE_CPUNET
+	default y if !MCUBOOT
+
 # Code Partition:
 #
 # For the secure version of the board the firmware is linked at the beginning
@@ -81,6 +87,16 @@ endif # !TRUSTED_EXECUTION_SECURE
 
 source "boards/common/usb/Kconfig.cdc_acm_serial.defconfig"
 
+# By default, a USB CDC ACM instance is already enabled in the board's DTS.
+# It is not necessary for nRF Connect SDK to add another instance if MCUBoot
+# bootloader is built as a child image.
+config MCUBOOT_USB_SUPPORT
+	bool
+	default n
+
+config NORDIC_QSPI_NOR
+	default y
+
 endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
 
 if BOARD_THINGY53_NRF5340_CPUNET
diff --git a/boards/nordic/thingy53/Kconfig.sysbuild b/boards/nordic/thingy53/Kconfig.sysbuild
new file mode 100644
index 00000000000..df489c1dd54
--- /dev/null
+++ b/boards/nordic/thingy53/Kconfig.sysbuild
@@ -0,0 +1,29 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT
+endchoice
+
+choice MCUBOOT_MODE
+	default MCUBOOT_MODE_OVERWRITE_ONLY
+endchoice
+
+config SECURE_BOOT_NETCORE
+	default y
+
+config NETCORE_APP_UPDATE
+	default y if SECURE_BOOT_NETCORE
+
+config NRF_DEFAULT_EMPTY
+	default y if SECURE_BOOT_NETCORE
+
+config MCUBOOT_USE_ALL_AVAILABLE_RAM
+	default y if BOARD_THINGY53_NRF5340_CPUAPP_NS && BOOTLOADER_MCUBOOT
+
+endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
+
+config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
+	default y if BOOTLOADER_MCUBOOT
diff --git a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
new file mode 100644
index 00000000000..7a48d51ec33
--- /dev/null
+++ b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp.yml
@@ -0,0 +1,55 @@
+app:
+  address: 0x10200
+  region: flash_primary
+  size: 0xdfe00
+mcuboot:
+  address: 0x0
+  region: flash_primary
+  size: 0x10000
+mcuboot_pad:
+  address: 0x10000
+  region: flash_primary
+  size: 0x200
+mcuboot_primary:
+  address: 0x10000
+  orig_span: &id001
+  - mcuboot_pad
+  - app
+  region: flash_primary
+  size: 0xe0000
+  span: *id001
+mcuboot_primary_app:
+  address: 0x10200
+  orig_span: &id002
+  - app
+  region: flash_primary
+  size: 0xdfe00
+  span: *id002
+settings_storage:
+  address: 0xf0000
+  region: flash_primary
+  size: 0x10000
+mcuboot_primary_1:
+  address: 0x0
+  size: 0x40000
+  device: flash_ctrl
+  region: ram_flash
+mcuboot_secondary:
+  address: 0x00000
+  size: 0xe0000
+  device: MX25R64
+  region: external_flash
+mcuboot_secondary_1:
+  address: 0xe0000
+  size: 0x40000
+  device: MX25R64
+  region: external_flash
+external_flash:
+  address: 0x120000
+  size: 0x6e0000
+  device: MX25R64
+  region: external_flash
+pcd_sram:
+  address: 0x20000000
+  size: 0x2000
+  region: sram_primary
diff --git a/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml
new file mode 100644
index 00000000000..70ffe6d9c12
--- /dev/null
+++ b/boards/nordic/thingy53/pm_static_thingy53_nrf5340_cpuapp_ns.yml
@@ -0,0 +1,73 @@
+mcuboot:
+  address: 0x0
+  region: flash_primary
+  size: 0x10000
+mcuboot_pad:
+  address: 0x10000
+  region: flash_primary
+  size: 0x200
+tfm_secure:
+  address: 0x10000
+  size: 0xc000
+  span: [mcuboot_pad, tfm]
+tfm_nonsecure:
+  address: 0x1c000
+  size: 0xd4000
+  span: [app]
+tfm:
+  address: 0x10200
+  region: flash_primary
+  size: 0xbe00
+app:
+  address: 0x1c000
+  region: flash_primary
+  size: 0xd4000
+mcuboot_primary:
+  address: 0x10000
+  orig_span: &id001
+  - mcuboot_pad
+  - tfm
+  - app
+  region: flash_primary
+  size: 0xe0000
+  span: *id001
+mcuboot_primary_app:
+  address: 0x10200
+  orig_span: &id002
+  - tfm
+  - app
+  region: flash_primary
+  size: 0xdfe00
+  span: *id002
+nonsecure_storage:
+  address: 0xf0000
+  size: 0x10000
+  span: [settings_storage]
+settings_storage:
+  address: 0xf0000
+  region: flash_primary
+  size: 0x10000
+mcuboot_primary_1:
+  address: 0x0
+  size: 0x40000
+  device: flash_ctrl
+  region: ram_flash
+mcuboot_secondary:
+  address: 0x00000
+  size: 0xe0000
+  device: MX25R64
+  region: external_flash
+mcuboot_secondary_1:
+  address: 0xe0000
+  size: 0x40000
+  device: MX25R64
+  region: external_flash
+external_flash:
+  address: 0x120000
+  size: 0x6e0000
+  device: MX25R64
+  region: external_flash
+pcd_sram:
+  address: 0x20000000
+  size: 0x2000
+  region: sram_primary
diff --git a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
index 72471a0c95e..8bc98ef65b4 100644
--- a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
+++ b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
@@ -13,6 +13,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,ieee802154 = &ieee802154;
+		nordic,pm-ext-flash = &mx25r64;
 	};
 
 	buttons {
diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake
index 733accda782..cee3dd011bc 100644
--- a/cmake/linker/ld/target.cmake
+++ b/cmake/linker/ld/target.cmake
@@ -80,6 +80,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
       ${current_includes}
       ${soc_linker_script_includes}
       ${template_script_defines}
+      -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
       -E ${LINKER_SCRIPT}
       -P # Prevent generation of debug `#line' directives.
       -o ${linker_script_gen}
diff --git a/cmake/linker/lld/target.cmake b/cmake/linker/lld/target.cmake
index b6b96525e70..bdea4f1ec92 100644
--- a/cmake/linker/lld/target.cmake
+++ b/cmake/linker/lld/target.cmake
@@ -52,6 +52,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
     -imacros ${AUTOCONF_H}
     ${current_includes}
     ${template_script_defines}
+    -DUSE_PARTITION_MANAGER=$<BOOL:${CONFIG_PARTITION_MANAGER_ENABLED}>
     -E ${LINKER_SCRIPT}
     -P # Prevent generation of debug `#line' directives.
     -o ${linker_script_gen}
diff --git a/cmake/modules/dts.cmake b/cmake/modules/dts.cmake
index 41e79dd7337..49408730dcd 100644
--- a/cmake/modules/dts.cmake
+++ b/cmake/modules/dts.cmake
@@ -127,6 +127,8 @@ set(GEN_DTS_CMAKE_SCRIPT        ${DT_SCRIPTS}/gen_dts_cmake.py)
 # The generated information itself, which we include() after
 # creating it.
 set(DTS_CMAKE                   ${PROJECT_BINARY_DIR}/dts.cmake)
+# The CMake target to be initialized by including ${DTS_CMAKE}.
+set(DEVICETREE_TARGET           devicetree_target)
 
 # The location of a file containing known vendor prefixes, relative to
 # each element of DTS_ROOT. Users can define their own in their own
diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake
index 843590d0638..4d09c7eda3e 100644
--- a/cmake/modules/extensions.cmake
+++ b/cmake/modules/extensions.cmake
@@ -3816,6 +3816,9 @@ endfunction()
 #   alias at the beginning of a path interchangeably with the full
 #   path to the aliased node in these functions. The usage comments
 #   will make this clear in each case.
+#
+# - Each of these methods also has a sysbuild_dt_* counterpart.
+#   See share/sysbuild/cmake/modules/sysbuild_extensions.cmake.
 
 # Usage:
 #   dt_nodelabel(<var> NODELABEL <label>)
@@ -3843,6 +3846,10 @@ endfunction()
 # NODELABEL <label>  : Node label
 # REQUIRED           : Generate a fatal error if the node-label is not found
 function(dt_nodelabel var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_nodelabel(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(options "REQUIRED")
   set(req_single_args "NODELABEL")
   cmake_parse_arguments(DT_LABEL "${options}" "${req_single_args}" "" ${ARGN})
@@ -3859,7 +3866,7 @@ function(dt_nodelabel var)
     endif()
   endforeach()
 
-  get_target_property(${var} devicetree_target "DT_NODELABEL|${DT_LABEL_NODELABEL}")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_NODELABEL|${DT_LABEL_NODELABEL}")
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     if(DT_LABEL_REQUIRED)
       message(FATAL_ERROR "required nodelabel not found: ${DT_LABEL_NODELABEL}")
@@ -3891,6 +3898,10 @@ endfunction()
 # PROPERTY <prop> : The alias to check
 # REQUIRED        : Generate a fatal error if the alias is not found
 function(dt_alias var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_alias(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(options "REQUIRED")
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_ALIAS "${options}" "${req_single_args}" "" ${ARGN})
@@ -3907,7 +3918,7 @@ function(dt_alias var)
     endif()
   endforeach()
 
-  get_target_property(${var} devicetree_target "DT_ALIAS|${DT_ALIAS_PROPERTY}")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_ALIAS|${DT_ALIAS_PROPERTY}")
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     if(DT_ALIAS_REQUIRED)
       message(FATAL_ERROR "required alias not found: ${DT_ALIAS_PROPERTY}")
@@ -3935,6 +3946,10 @@ endfunction()
 # <var>       : Return variable where the check result will be returned
 # PATH <path> : Node path
 function(dt_node_exists var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_node_exists(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   cmake_parse_arguments(DT_NODE "" "${req_single_args}" "" ${ARGN})
 
@@ -3980,6 +3995,10 @@ endfunction()
 # PATH <path>     : Node path
 # STATUS <status> : Status to check
 function(dt_node_has_status var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_node_has_status(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH;STATUS")
   cmake_parse_arguments(DT_NODE "" "${req_single_args}" "" ${ARGN})
 
@@ -4066,6 +4085,10 @@ endfunction()
 # INDEX <idx>    : Optional index when retrieving a value in an array property
 # REQUIRED       : Generate a fatal error if the property is not found
 function(dt_prop var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_prop(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(options "REQUIRED")
   set(req_single_args "PATH;PROPERTY")
   set(single_args "INDEX")
@@ -4084,7 +4107,7 @@ function(dt_prop var)
   endforeach()
 
   dt_path_internal(canonical "${DT_PROP_PATH}")
-  get_property(exists TARGET devicetree_target
+  get_property(exists TARGET "${DEVICETREE_TARGET}"
       PROPERTY "DT_PROP|${canonical}|${DT_PROP_PROPERTY}"
       SET
   )
@@ -4097,7 +4120,7 @@ function(dt_prop var)
     return()
   endif()
 
-  get_target_property(val devicetree_target
+  get_target_property(val "${DEVICETREE_TARGET}"
       "DT_PROP|${canonical}|${DT_PROP_PROPERTY}"
   )
 
@@ -4126,6 +4149,10 @@ endfunction()
 # INDEX <idx>            : Optional index when retrieving a value in an array property
 
 function(dt_comp_path var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_comp_path(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "COMPATIBLE")
   set(single_args "INDEX")
   cmake_parse_arguments(DT_COMP "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4142,7 +4169,7 @@ function(dt_comp_path var)
     endif()
   endforeach()
 
-  get_property(exists TARGET devicetree_target
+  get_property(exists TARGET "${DEVICETREE_TARGET}"
       PROPERTY "DT_COMP|${DT_COMP_COMPATIBLE}"
       SET
   )
@@ -4152,7 +4179,7 @@ function(dt_comp_path var)
     return()
   endif()
 
-  get_target_property(val devicetree_target
+  get_target_property(val "${DEVICETREE_TARGET}"
       "DT_COMP|${DT_COMP_COMPATIBLE}"
   )
 
@@ -4181,6 +4208,10 @@ endfunction()
 # <var>          : Return variable where the property value will be stored
 # PATH <path>    : Node path
 function(dt_num_regs var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_num_regs(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   cmake_parse_arguments(DT_REG "" "${req_single_args}" "" ${ARGN})
 
@@ -4197,7 +4228,7 @@ function(dt_num_regs var)
   endforeach()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var} devicetree_target "DT_REG|${canonical}|NUM")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_REG|${canonical}|NUM")
 
   set(${var} ${${var}} PARENT_SCOPE)
 endfunction()
@@ -4227,6 +4258,10 @@ endfunction()
 # INDEX <idx>    : Register block index number
 # NAME <name>    : Register block name
 function(dt_reg_addr var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_reg_addr(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   set(single_args "INDEX;NAME")
   cmake_parse_arguments(DT_REG "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4256,7 +4291,7 @@ function(dt_reg_addr var)
   endif()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var}_list devicetree_target "DT_REG|${canonical}|ADDR")
+  get_target_property(${var}_list "${DEVICETREE_TARGET}" "DT_REG|${canonical}|ADDR")
 
   list(GET ${var}_list ${DT_REG_INDEX} ${var})
 
@@ -4287,6 +4322,10 @@ endfunction()
 # INDEX <idx>    : Register block index number
 # NAME <name>    : Register block name
 function(dt_reg_size var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_reg_size(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PATH")
   set(single_args "INDEX;NAME")
   cmake_parse_arguments(DT_REG "" "${req_single_args};${single_args}" "" ${ARGN})
@@ -4316,7 +4355,7 @@ function(dt_reg_size var)
   endif()
 
   dt_path_internal(canonical "${DT_REG_PATH}")
-  get_target_property(${var}_list devicetree_target "DT_REG|${canonical}|SIZE")
+  get_target_property(${var}_list "${DEVICETREE_TARGET}" "DT_REG|${canonical}|SIZE")
 
   list(GET ${var}_list ${DT_REG_INDEX} ${var})
 
@@ -4364,6 +4403,10 @@ endfunction()
 # <var>           : Return variable
 # PROPERTY <prop> : Chosen property
 function(dt_has_chosen var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_has_chosen(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_CHOSEN "" "${req_single_args}" "" ${ARGN})
 
@@ -4379,7 +4422,7 @@ function(dt_has_chosen var)
     endif()
   endforeach()
 
-  get_target_property(exists devicetree_target "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
+  get_target_property(exists "${DEVICETREE_TARGET}" "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
 
   if(${exists} STREQUAL exists-NOTFOUND)
     set(${var} FALSE PARENT_SCOPE)
@@ -4399,6 +4442,10 @@ endfunction()
 # <var>           : Return variable where the node path will be stored
 # PROPERTY <prop> : Chosen property
 function(dt_chosen var)
+  if(NOT DEFINED DEVICETREE_TARGET OR NOT TARGET "${DEVICETREE_TARGET}")
+    message(FATAL_ERROR "dt_chosen(${ARGV0} ...) devicetree is not available.")
+  endif()
+
   set(req_single_args "PROPERTY")
   cmake_parse_arguments(DT_CHOSEN "" "${req_single_args}" "" ${ARGN})
 
@@ -4414,7 +4461,7 @@ function(dt_chosen var)
     endif()
   endforeach()
 
-  get_target_property(${var} devicetree_target "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
+  get_target_property(${var} "${DEVICETREE_TARGET}" "DT_CHOSEN|${DT_CHOSEN_PROPERTY}")
 
   if(${${var}} STREQUAL ${var}-NOTFOUND)
     set(${var} PARENT_SCOPE)
@@ -4486,7 +4533,7 @@ endfunction()
 # to an existing node. Set it to FALSE otherwise. See
 # dt_path_internal for a definition and examples of 'canonical' paths.
 function(dt_path_internal_exists var path)
-  get_target_property(path_prop devicetree_target "DT_NODE|${path}")
+  get_target_property(path_prop "${DEVICETREE_TARGET}" "DT_NODE|${path}")
   if (path_prop)
     set(${var} TRUE PARENT_SCOPE)
   else()
diff --git a/cmake/modules/kernel.cmake b/cmake/modules/kernel.cmake
index b6192b1ba78..6bbd564c9e8 100644
--- a/cmake/modules/kernel.cmake
+++ b/cmake/modules/kernel.cmake
@@ -254,3 +254,7 @@ if("${CMAKE_EXTRA_GENERATOR}" STREQUAL "Eclipse CDT4")
   include(${ZEPHYR_BASE}/cmake/ide/eclipse_cdt4_generator_amendment.cmake)
   eclipse_cdt4_generator_amendment(1)
 endif()
+
+if(ZEPHYR_NRF_MODULE_DIR)
+  include(${ZEPHYR_NRF_MODULE_DIR}/cmake/partition_manager.cmake)
+endif()
diff --git a/doc/build/kconfig/setting.rst b/doc/build/kconfig/setting.rst
index ad62d86eb3d..6fe1feaed7d 100644
--- a/doc/build/kconfig/setting.rst
+++ b/doc/build/kconfig/setting.rst
@@ -7,8 +7,7 @@ The :ref:`menuconfig and guiconfig interfaces <menuconfig>` can be used to test
 out configurations during application development. This page explains how to
 make settings permanent.
 
-All Kconfig options can be searched in the :ref:`Kconfig search page
-<kconfig-search>`.
+All Kconfig options can be searched in the Kconfig search page.
 
 .. note::
 
@@ -115,8 +114,7 @@ Assignments in configuration files are only respected if the dependencies for
 the symbol are satisfied. A warning is printed otherwise. To figure out what
 the dependencies of a symbol are, use one of the :ref:`interactive
 configuration interfaces <menuconfig>` (you can jump directly to a symbol with
-:kbd:`/`), or look up the symbol in the :ref:`Kconfig search page
-<kconfig-search>`.
+:kbd:`/`), or look up the symbol in the Kconfig search page.
 
 
 .. _initial-conf:
diff --git a/doc/connectivity/networking/api/mqtt.rst b/doc/connectivity/networking/api/mqtt.rst
index 9a167ffe665..3d222d53816 100644
--- a/doc/connectivity/networking/api/mqtt.rst
+++ b/doc/connectivity/networking/api/mqtt.rst
@@ -150,6 +150,7 @@ additional configuration information:
    tls_config->sec_tag_list = m_sec_tags;
    tls_config->sec_tag_count = ARRAY_SIZE(m_sec_tags);
    tls_config->hostname = MQTT_BROKER_HOSTNAME;
+   tls_config->set_native_tls = true;
 
 In this sample code, the ``m_sec_tags`` array holds a list of tags, referencing TLS
 credentials that the MQTT library should use for authentication. We do not specify
@@ -162,6 +163,8 @@ Note, that TLS credentials referenced by the ``m_sec_tags`` array must be
 registered in the system first. For more information on how to do that, refer
 to :ref:`secure sockets documentation <secure_sockets_interface>`.
 
+Finally, ``set_native_tls`` can be optionally set to enable native TLS support instead of offloading TLS operations to the modem.
+
 An example of how to use TLS with MQTT is also present in
 :zephyr:code-sample:`mqtt-publisher` sample application.
 
diff --git a/doc/develop/application/index.rst b/doc/develop/application/index.rst
index 7dc4539677e..42d53040bd2 100644
--- a/doc/develop/application/index.rst
+++ b/doc/develop/application/index.rst
@@ -648,9 +648,8 @@ started.
 
 See :ref:`setting_configuration_values` for detailed documentation on setting
 Kconfig configuration values. The :ref:`initial-conf` section on the same page
-explains how the initial configuration is derived. See :ref:`kconfig-search`
-for a complete list of configuration options.
-See :ref:`hardening` for security information related with Kconfig options.
+explains how the initial configuration is derived. See :ref:`hardening` for
+security information related with Kconfig options.
 
 The other pages in the :ref:`Kconfig section of the manual <kconfig>` are also
 worth going through, especially if you planning to add new configuration
diff --git a/doc/kconfig.rst b/doc/kconfig.rst
deleted file mode 100644
index 1123de2adbd..00000000000
--- a/doc/kconfig.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-:orphan:
-
-.. _kconfig-search:
-
-Kconfig Search
-==============
-
-.. kconfig:search::
diff --git a/doc/services/storage/settings/index.rst b/doc/services/storage/settings/index.rst
index 4f8831e3a11..68b1faed548 100644
--- a/doc/services/storage/settings/index.rst
+++ b/doc/services/storage/settings/index.rst
@@ -78,6 +78,14 @@ backend.
     This gets called when loading values from persistent storage using
     :c:func:`settings_load()`.
 
+**csi_load_one**
+    This gets called when loading only one item from persistent storage using
+    :c:func:`settings_load_one()`.
+
+**csi_get_val_len**
+    This gets called when getting a value's length from persistent storage using
+    :c:func:`settings_get_val_len()`.
+
 **csi_save**
     This gets called when saving a single setting to persistent storage using
     :c:func:`settings_save_one()`.
@@ -148,6 +156,12 @@ After all data is loaded, the ``h_commit`` handler is issued,
 signalling the application that the settings were successfully
 retrieved.
 
+Alternatively, a call to :c:func:`settings_load_one()` will load only one
+Settings entry and store it in the provided buffer.
+
+To get the value's length associated with the Settings entry, a call to
+:c:func:`settings_get_val_len()` should be performed
+
 Technically FCB and file backends may store some history of the entities.
 This means that the newest data entity is stored after any
 older existing data entities.
diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index 22a839a5f35..ae7339e00d7 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -318,8 +318,13 @@ static int adc_nrfx_channel_setup(const struct device *dev,
 	}
 
 	if (config.mode == NRF_SAADC_MODE_DIFFERENTIAL) {
+#if defined(CONFIG_NRF_PLATFORM_HALTIUM)
+		if ((input_negative > NRF_SAADC_AIN7) !=
+		    (channel_cfg->input_positive > NRF_SAADC_AIN7)) {
+#else
 		if (input_negative > NRF_SAADC_AIN7 ||
 		    input_negative < NRF_SAADC_AIN0) {
+#endif
 			return -EINVAL;
 		}
 
@@ -719,6 +724,27 @@ static DEVICE_API(adc, adc_nrfx_driver_api) = {
 #endif
 };
 
+#if defined(CONFIG_NRF_PLATFORM_HALTIUM)
+/* AIN8-AIN14 inputs are on 3v3 GPIO port and they cannot be mixed with other
+ * analog inputs (from 1v8 ports) in differential mode.
+ */
+#define CH_IS_3V3(val) (val >= NRF_SAADC_AIN8)
+
+#define MIXED_3V3_1V8_INPUTS(node)					\
+	(DT_NODE_HAS_PROP(node, zephyr_input_negative) &&		\
+	 (CH_IS_3V3(DT_PROP_OR(node, zephyr_input_negative, 0)) !=	\
+	  CH_IS_3V3(DT_PROP_OR(node, zephyr_input_positive, 0))))
+#else
+#define MIXED_3V3_1V8_INPUTS(node) false
+#endif
+
+#define VALIDATE_CHANNEL_CONFIG(node)					\
+	BUILD_ASSERT(MIXED_3V3_1V8_INPUTS(node) == false,		\
+		     "1v8 inputs cannot be mixed with 3v3 inputs");
+
+/* Validate configuration of all channels. */
+#define VALIDATE_CHANNELS_CONFIG(inst) DT_FOREACH_CHILD(DT_DRV_INST(inst), VALIDATE_CHANNEL_CONFIG)
+
 /*
  * There is only one instance on supported SoCs, so inst is guaranteed
  * to be 0 if any instance is okay. (We use adc_0 above, so the driver
@@ -731,6 +757,7 @@ static DEVICE_API(adc, adc_nrfx_driver_api) = {
 #define SAADC_INIT(inst)						\
 	BUILD_ASSERT((inst) == 0,					\
 		     "multiple instances not supported");		\
+	VALIDATE_CHANNELS_CONFIG(inst)					\
 	PM_DEVICE_DT_INST_DEFINE(0, saadc_pm_hook, 1);			\
 	DEVICE_DT_INST_DEFINE(0,					\
 			    init_saadc,					\
diff --git a/drivers/audio/dmic_nrfx_pdm.c b/drivers/audio/dmic_nrfx_pdm.c
index ea78330deb5..2e8d71b0a93 100644
--- a/drivers/audio/dmic_nrfx_pdm.c
+++ b/drivers/audio/dmic_nrfx_pdm.c
@@ -18,14 +18,21 @@ LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
 #if CONFIG_SOC_SERIES_NRF54HX
 #define DMIC_NRFX_CLOCK_FREQ MHZ(16)
 #define DMIC_NRFX_CLOCK_FACTOR 8192
+#define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(DT_NODELABEL(audiopll), frequency, 0)
 #else
 #define DMIC_NRFX_CLOCK_FREQ MHZ(32)
 #define DMIC_NRFX_CLOCK_FACTOR 4096
+#define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency, \
+				   DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency, 0))
 #endif
 
 struct dmic_nrfx_pdm_drv_data {
 	const nrfx_pdm_t *pdm;
+#if CONFIG_CLOCK_CONTROL_NRF
 	struct onoff_manager *clk_mgr;
+#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
+	const struct device *audiopll_dev;
+#endif
 	struct onoff_client clk_cli;
 	struct k_mem_slab *mem_slab;
 	uint32_t block_size;
@@ -61,6 +68,35 @@ static void stop_pdm(struct dmic_nrfx_pdm_drv_data *drv_data)
 	nrfx_pdm_stop(drv_data->pdm);
 }
 
+static int request_clock(struct dmic_nrfx_pdm_drv_data *drv_data)
+{
+	if (!drv_data->request_clock) {
+		return 0;
+	}
+#if CONFIG_CLOCK_CONTROL_NRF
+	return onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
+#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
+	return nrf_clock_control_request(drv_data->audiopll_dev, NULL, &drv_data->clk_cli);
+#else
+	return -ENOTSUP;
+#endif
+}
+
+static int release_clock(struct dmic_nrfx_pdm_drv_data *drv_data)
+{
+	if (!drv_data->request_clock) {
+		return 0;
+	}
+
+#if CONFIG_CLOCK_CONTROL_NRF
+	return onoff_release(drv_data->clk_mgr);
+#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
+	return nrf_clock_control_release(drv_data->audiopll_dev, NULL);
+#else
+	return -ENOTSUP;
+#endif
+}
+
 static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 {
 	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
@@ -119,8 +155,10 @@ static void event_handler(const struct device *dev, const nrfx_pdm_evt_t *evt)
 
 		if (drv_data->active) {
 			drv_data->active = false;
-			if (drv_data->request_clock) {
-				(void)onoff_release(drv_data->clk_mgr);
+			ret = release_clock(drv_data);
+			if (ret < 0) {
+				LOG_ERR("Failed to release clock: %d", ret);
+				return;
 			}
 		}
 	} else if (evt->buffer_released) {
@@ -191,9 +229,11 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 {
 	uint32_t req_rate = pdm_cfg->streams[0].pcm_rate;
 	bool better_found = false;
-
+	const uint32_t src_freq =
+		(NRF_PDM_HAS_SELECTABLE_CLOCK && drv_cfg->clk_src == ACLK)
+		? DMIC_NRFX_AUDIO_CLOCK_FREQ
+		: DMIC_NRFX_CLOCK_FREQ;
 #if NRF_PDM_HAS_PRESCALER
-	uint32_t src_freq = 32 * 1000 * 1000UL;
 	uint32_t req_freq = req_rate * ratio;
 	uint32_t prescaler = src_freq / req_freq;
 	uint32_t act_freq = src_freq / prescaler;
@@ -224,24 +264,6 @@ static bool check_pdm_frequencies(const struct dmic_nrfx_pdm_drv_cfg *drv_cfg,
 	}
 #else
 	if (IS_ENABLED(CONFIG_SOC_SERIES_NRF53X) || IS_ENABLED(CONFIG_SOC_SERIES_NRF54HX)) {
-		const uint32_t src_freq =
-			(NRF_PDM_HAS_MCLKCONFIG && drv_cfg->clk_src == ACLK)
-			/* The DMIC_NRFX_PDM_DEVICE() macro contains build
-			 * assertions that make sure that the ACLK clock
-			 * source is only used when it is available and only
-			 * with the "hfclkaudio-frequency" property defined,
-			 * but the default value of 0 here needs to be used
-			 * to prevent compilation errors when the property is
-			 * not defined (this expression will be eventually
-			 * optimized away then).
-			 */
-			/* TODO : PS does not provide correct formula for nRF54H20 PDM_CLK.
-			 * Assume that master clock source frequency is 8 MHz. Remove once
-			 * correct formula is found.
-			 */
-			? DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency,
-				     0)
-			: DMIC_NRFX_CLOCK_FREQ;
 		uint32_t req_freq = req_rate * ratio;
 		/* As specified in the nRF5340 PS:
 		 *
@@ -461,7 +483,7 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 		nrfx_cfg.edge = NRF_PDM_EDGE_LEFTRISING;
 		channel->act_chan_map_lo = alt_map;
 	}
-#if NRF_PDM_HAS_MCLKCONFIG
+#if NRF_PDM_HAS_SELECTABLE_CLOCK
 	nrfx_cfg.mclksrc = drv_cfg->clk_src == ACLK
 			 ? NRF_PDM_MCLKSRC_ACLK
 			 : NRF_PDM_MCLKSRC_PCLK32M;
@@ -489,8 +511,10 @@ static int dmic_nrfx_pdm_configure(const struct device *dev,
 	 * (which is always available without any additional actions),
 	 * it is required to request the proper clock to be running
 	 * before starting the transfer itself.
+	 * Targets using CLKSELECT register to select clock source
+	 * do not need to request audio clock.
 	 */
-	drv_data->request_clock = (drv_cfg->clk_src != PCLK32M);
+	drv_data->request_clock = (drv_cfg->clk_src != PCLK32M && !NRF_PDM_HAS_CLKSELECT);
 	drv_data->configured = true;
 	return 0;
 }
@@ -508,8 +532,10 @@ static int start_transfer(struct dmic_nrfx_pdm_drv_data *drv_data)
 	LOG_ERR("Failed to start PDM: 0x%08x", err);
 	ret =  -EIO;
 
-	if (drv_data->request_clock) {
-		(void)onoff_release(drv_data->clk_mgr);
+	ret = release_clock(drv_data);
+	if (ret < 0) {
+		LOG_ERR("Failed to release clock: %d", ret);
+		return ret;
 	}
 
 	drv_data->active = false;
@@ -529,7 +555,12 @@ static void clock_started_callback(struct onoff_manager *mgr,
 	 * the actual transfer in such case.
 	 */
 	if (!drv_data->active) {
-		(void)onoff_release(drv_data->clk_mgr);
+		int ret = release_clock(drv_data);
+
+		if (ret < 0) {
+			LOG_ERR("Failed to release clock: %d", ret);
+			return;
+		}
 	} else {
 		(void)start_transfer(drv_data);
 	}
@@ -548,7 +579,7 @@ static int trigger_start(const struct device *dev)
 	if (drv_data->request_clock) {
 		sys_notify_init_callback(&drv_data->clk_cli.notify,
 					 clock_started_callback);
-		ret = onoff_request(drv_data->clk_mgr, &drv_data->clk_cli);
+		ret = request_clock(drv_data);
 		if (ret < 0) {
 			drv_data->active = false;
 
@@ -624,12 +655,11 @@ static int dmic_nrfx_pdm_read(const struct device *dev,
 	return ret;
 }
 
-#if CONFIG_CLOCK_CONTROL_NRF
 static void init_clock_manager(const struct device *dev)
 {
-	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
+#if CONFIG_CLOCK_CONTROL_NRF
 	clock_control_subsys_t subsys;
-
+	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
 #if NRF_CLOCK_HAS_HFCLKAUDIO
 	const struct dmic_nrfx_pdm_drv_cfg *drv_cfg = dev->config;
 
@@ -643,8 +673,12 @@ static void init_clock_manager(const struct device *dev)
 
 	drv_data->clk_mgr = z_nrf_clock_control_get_onoff(subsys);
 	__ASSERT_NO_MSG(drv_data->clk_mgr != NULL);
-}
+#elif CONFIG_CLOCK_CONTROL_NRF2_AUDIOPLL
+	struct dmic_nrfx_pdm_drv_data *drv_data = dev->data;
+
+	drv_data->audiopll_dev = DEVICE_DT_GET(DT_NODELABEL(audiopll));
 #endif
+}
 
 static const struct _dmic_ops dmic_ops = {
 	.configure = dmic_nrfx_pdm_configure,
@@ -677,8 +711,7 @@ static const struct _dmic_ops dmic_ops = {
 		k_msgq_init(&dmic_nrfx_pdm_data##idx.mem_slab_queue,	     \
 			    (char *)mem_slab_msgs##idx, sizeof(void *),	     \
 			    ARRAY_SIZE(mem_slab_msgs##idx));		     \
-		IF_ENABLED(CONFIG_CLOCK_CONTROL_NRF,			     \
-			   (init_clock_manager(dev);))			     \
+		init_clock_manager(dev);				     \
 		return 0;						     \
 	}								     \
 	static void event_handler##idx(const nrfx_pdm_evt_t *evt)	     \
@@ -695,13 +728,20 @@ static const struct _dmic_ops dmic_ops = {
 		.clk_src = PDM_CLK_SRC(idx),				     \
 		.mem_reg = DMM_DEV_TO_REG(PDM(idx)),			     \
 	};								     \
-	BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK || NRF_PDM_HAS_MCLKCONFIG,     \
+	BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK ||			     \
+		     NRF_PDM_HAS_SELECTABLE_CLOCK,			     \
 		"Clock source ACLK is not available.");			     \
 	BUILD_ASSERT(PDM_CLK_SRC(idx) != ACLK ||			     \
 		     DT_NODE_HAS_PROP(DT_NODELABEL(clock),		     \
-				      hfclkaudio_frequency),		     \
+				      hfclkaudio_frequency) ||		     \
+		     DT_NODE_HAS_PROP(DT_NODELABEL(aclk),		     \
+				      clock_frequency) ||		     \
+		     DT_NODE_HAS_PROP(DT_NODELABEL(audiopll),		     \
+				      frequency),			     \
 		"Clock source ACLK requires the hfclkaudio-frequency "	     \
-		"property to be defined in the nordic,nrf-clock node.");     \
+		"property to be defined in the nordic,nrf-clock node "	     \
+		"or clock-frequency property to be defined in aclk node"     \
+		"or frequency property to be defined in audiopll node");     \
 	DEVICE_DT_DEFINE(PDM(idx), pdm_nrfx_init##idx, NULL,		     \
 			 &dmic_nrfx_pdm_data##idx, &dmic_nrfx_pdm_cfg##idx,  \
 			 POST_KERNEL, CONFIG_AUDIO_DMIC_INIT_PRIORITY,	     \
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index a1680af6583..e64a33f663c 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -12,7 +12,7 @@
 menuconfig BT_DRIVERS
 	bool "Bluetooth drivers"
 	default y
-	depends on BT
+	depends on BT && BT_HCI
 
 if BT_DRIVERS
 
diff --git a/drivers/clock_control/clock_control_nrf2_fll16m.c b/drivers/clock_control/clock_control_nrf2_fll16m.c
index cbec791aa77..69b551e1a45 100644
--- a/drivers/clock_control/clock_control_nrf2_fll16m.c
+++ b/drivers/clock_control/clock_control_nrf2_fll16m.c
@@ -21,7 +21,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 #define FLAG_HFXO_STARTED BIT(FLAGS_COMMON_BITS)
 
 #define FLL16M_MODE_OPEN_LOOP   0
-#define FLL16M_MODE_CLOSED_LOOP 1
+#define FLL16M_MODE_CLOSED_LOOP 1 /* <-- DO NOT IMPLEMENT, CAN CAUSE HARDWARE BUG */
 #define FLL16M_MODE_BYPASS      2
 #define FLL16M_MODE_DEFAULT     FLL16M_MODE_OPEN_LOOP
 
@@ -29,7 +29,6 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
 
 #define FLL16M_HFXO_ACCURACY DT_PROP(FLL16M_HFXO_NODE, accuracy_ppm)
 #define FLL16M_OPEN_LOOP_ACCURACY DT_INST_PROP(0, open_loop_accuracy_ppm)
-#define FLL16M_CLOSED_LOOP_BASE_ACCURACY DT_INST_PROP(0, closed_loop_base_accuracy_ppm)
 #define FLL16M_MAX_ACCURACY FLL16M_HFXO_ACCURACY
 
 #define BICR (NRF_BICR_Type *)DT_REG_ADDR(DT_NODELABEL(bicr))
@@ -43,9 +42,6 @@ static struct clock_options {
 		.accuracy = FLL16M_OPEN_LOOP_ACCURACY,
 		.mode = FLL16M_MODE_OPEN_LOOP,
 	},
-	{
-		.mode = FLL16M_MODE_CLOSED_LOOP,
-	},
 	{
 		/* Bypass mode uses HFXO */
 		.accuracy = FLL16M_HFXO_ACCURACY,
@@ -225,27 +221,6 @@ static int api_get_rate_fll16m(const struct device *dev,
 static int fll16m_init(const struct device *dev)
 {
 	struct fll16m_dev_data *dev_data = dev->data;
-	nrf_bicr_lfosc_mode_t lfosc_mode;
-
-	clock_options[1].accuracy = FLL16M_CLOSED_LOOP_BASE_ACCURACY;
-
-	/* Closed-loop mode uses LFXO as source if present, HFXO otherwise */
-	lfosc_mode = nrf_bicr_lfosc_mode_get(BICR);
-
-	if (lfosc_mode != NRF_BICR_LFOSC_MODE_UNCONFIGURED &&
-	    lfosc_mode != NRF_BICR_LFOSC_MODE_DISABLED) {
-		int ret;
-		uint16_t accuracy;
-
-		ret = lfosc_get_accuracy(&accuracy);
-		if (ret < 0) {
-			return ret;
-		}
-
-		clock_options[1].accuracy += accuracy;
-	} else {
-		clock_options[1].accuracy += FLL16M_HFXO_ACCURACY;
-	}
 
 	return clock_config_init(&dev_data->clk_cfg,
 				 ARRAY_SIZE(dev_data->clk_cfg.onoff),
diff --git a/drivers/disk/flashdisk.c b/drivers/disk/flashdisk.c
index 1ac3d15ba62..4d8e3f1eee0 100644
--- a/drivers/disk/flashdisk.c
+++ b/drivers/disk/flashdisk.c
@@ -469,6 +469,8 @@ static const struct disk_operations flash_disk_ops = {
 	.ioctl = disk_flash_access_ioctl,
 };
 
+#ifndef USE_PARTITION_MANAGER
+/* The non-Partition manager, DTS based generators below */
 #define DT_DRV_COMPAT zephyr_flash_disk
 
 #define PARTITION_PHANDLE(n) DT_PHANDLE_BY_IDX(DT_DRV_INST(n), partition, 0)
@@ -510,6 +512,82 @@ DT_INST_FOREACH_STATUS_OKAY(VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY)
 		"Devicetree node " DT_NODE_PATH(DT_DRV_INST(n))				\
 		" has cache size which is not a multiple of its sector size");
 DT_INST_FOREACH_STATUS_OKAY(VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE)
+#else /* ifndef USE_PARTITION_MANAGER */
+/* Partition Manager based generators below */
+
+/* Gets the PM_..._EXTRA_PARAM_##param value */
+#define PM_FLASH_DISK_ENTRY_EXTRA_PARAM(name, param) PM_##name##_EXTRA_PARAM_disk_##param
+
+/* Gets the PM_..._NAME value which is originally cased, as in yaml, partition name */
+#define PM_FLASH_DISK_ENTRY_PARTITION_NAME(name) PM_##name##_NAME
+
+/* Generates flashdiskN_cache variable name, where N is partition ID */
+#define PM_FLASH_DISK_CACHE_VARIABLE(n) UTIL_CAT(flashdisk, UTIL_CAT(FIXED_PARTITION_ID(n), _cache))
+
+/* Generate cache buffers */
+#define CACHE_SIZE(n) (COND_CODE_1(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, read_only), (0), (1)) * \
+		       PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size))
+#define DEFINE_FLASHDISKS_CACHE(n) \
+	static uint8_t __aligned(4) PM_FLASH_DISK_CACHE_VARIABLE(n)[CACHE_SIZE(n)];
+
+PM_FOREACH_AFFILIATED_TO_disk(DEFINE_FLASHDISKS_CACHE)
+
+/* Generated single Flash Disk device data from Partition Manager partition.
+ * Partition is required to have type set to disk in partition definitions:
+ *  type: disk
+ * and following extra params can be provided:
+ *  extra_params: {
+ *	name = "<name>",
+ *	cache_size = <size>,
+ *	sector_size = <ssize>,
+ *	read_only = <ro>
+ *  }
+ * where:
+ *  <name> is mandatory device name that will be used by Disk Access and FAT FS to mount device;
+ *  <cache_size> is cache r/w cache size, which is mandatory if read_only = 0 or not present,
+ *  and should be multiple of <ssize>;
+ *  <ssize> is mandatory device sector size information, usually should be erase page size,
+ *  for flash devices, for example 4096 bytes;
+ *  read_only is optional, if not present then assumed false; <ro> can be 0(false) or 1(true).
+ */
+#define DEFINE_FLASHDISKS_DEVICE(n)						\
+{										\
+	.info = {								\
+		.ops = &flash_disk_ops,						\
+		.name = STRINGIFY(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, name)),		\
+	},									\
+	.area_id = FIXED_PARTITION_ID(n),					\
+	.offset = FIXED_PARTITION_OFFSET(n),					\
+	.cache = PM_FLASH_DISK_CACHE_VARIABLE(n),				\
+	.cache_size = sizeof(PM_FLASH_DISK_CACHE_VARIABLE(n)),			\
+	.size = FIXED_PARTITION_SIZE(n),					\
+	.sector_size = PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, sector_size),		\
+},
+
+/* The bellow used PM_FOREACH_TYPE_disk is generated by Partition Manager foreach
+ * loop macro. The lower case _disk is type name for which the macro has been generated;
+ * partition entry can have multiple types set and foreach macro will be generated
+ * for every type found across partition definitions.
+ */
+static struct flashdisk_data flash_disks[] = {
+	PM_FOREACH_AFFILIATED_TO_disk(DEFINE_FLASHDISKS_DEVICE)
+};
+
+#define VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY(n)				\
+	COND_CODE_1(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, read_only),			\
+		(/* cache-size is not used for read-only disks */),			\
+		(BUILD_ASSERT(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size) != 0,	\
+		"Flash disk partition " STRINGIFY(PM_FLASH_DISK_ENTRY_PARTITION_NAME(n))\
+		" must have non-zero cache-size");))
+PM_FOREACH_AFFILIATED_TO_disk(VERIFY_CACHE_SIZE_IS_NOT_ZERO_IF_NOT_READ_ONLY)
+
+#define VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE(n)					\
+	BUILD_ASSERT(PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, cache_size) %			\
+		     PM_FLASH_DISK_ENTRY_EXTRA_PARAM(n, sector_size) == 0,		\
+		"Devicetree node " STRINGIFY(PM_FLASH_DISK_ENTRY_PARTITION_NAME(n))	\
+		" has cache size which is not a multiple of its sector size");
+PM_FOREACH_AFFILIATED_TO_disk(VERIFY_CACHE_SIZE_IS_MULTIPLY_OF_SECTOR_SIZE)
+#endif /* USE_PARTITION_MANAGER */
 
 static int disk_flash_init(void)
 {
diff --git a/drivers/display/display_st7567.c b/drivers/display/display_st7567.c
index 15491f05618..f37db1d7690 100644
--- a/drivers/display/display_st7567.c
+++ b/drivers/display/display_st7567.c
@@ -338,7 +338,7 @@ static int st7567_reset(const struct device *dev)
 static int st7567_clear(const struct device *dev)
 {
 	const struct st7567_config *config = dev->config;
-	int ret;
+	int ret = 0;
 	uint8_t buf = 0;
 
 	uint8_t cmd_buf[] = {
diff --git a/drivers/entropy/CMakeLists.txt b/drivers/entropy/CMakeLists.txt
index c59eba033b0..37a5999bd91 100644
--- a/drivers/entropy/CMakeLists.txt
+++ b/drivers/entropy/CMakeLists.txt
@@ -41,4 +41,11 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_MAXQ10XX_RNG    entropy_maxq10xx.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_RENESAS_RA      entropy_renesas_ra.c)
 zephyr_library_sources_ifdef(CONFIG_ENTROPY_SY1XX_TRNG      entropy_sy1xx_trng.c)
 
+if (CONFIG_FAKE_ENTROPY_NRF_PRNG)
+  zephyr_library_sources(fake_entropy_nrf_prng.c)
+
+  message(WARNING "\nA nRF PRNG is used, which does not produce real random bits."
+  "This is not secure and should therefore never be used in a product.")
+endif()
+
 zephyr_library_link_libraries_ifdef(CONFIG_BUILD_WITH_TFM tfm_api)
diff --git a/drivers/entropy/Kconfig b/drivers/entropy/Kconfig
index 3664ce0f184..3d31282ad78 100644
--- a/drivers/entropy/Kconfig
+++ b/drivers/entropy/Kconfig
@@ -43,6 +43,7 @@ source "drivers/entropy/Kconfig.max32"
 source "drivers/entropy/Kconfig.maxq10xx"
 source "drivers/entropy/Kconfig.renesas_ra"
 source "drivers/entropy/Kconfig.sy1xx"
+source "drivers/entropy/Kconfig.nrf_prng"
 
 config ENTROPY_HAS_DRIVER
 	bool
diff --git a/drivers/entropy/Kconfig.nrf_prng b/drivers/entropy/Kconfig.nrf_prng
new file mode 100644
index 00000000000..e81db4de4b1
--- /dev/null
+++ b/drivers/entropy/Kconfig.nrf_prng
@@ -0,0 +1,19 @@
+# nRF fake entropy prng generator driver configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if ENTROPY_GENERATOR
+
+config FAKE_ENTROPY_NRF_PRNG
+	bool "A fake nRF entropy driver"
+	default y
+	depends on DT_HAS_NORDIC_ENTROPY_PRNG_ENABLED
+	depends on (SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X || SOC_SERIES_NRF54LX)
+	select ENTROPY_HAS_DRIVER
+	help
+	  This is a super simple PRNG driver that can be used on nRF platforms that
+	  do not have an entropy source.
+	  This is NOT SAFE to use for cryptographic operations!
+
+endif
diff --git a/drivers/entropy/Kconfig.psa_crypto b/drivers/entropy/Kconfig.psa_crypto
index d06001225b0..18514a071d1 100644
--- a/drivers/entropy/Kconfig.psa_crypto
+++ b/drivers/entropy/Kconfig.psa_crypto
@@ -7,6 +7,7 @@ config ENTROPY_PSA_CRYPTO_RNG
 	bool "PSA Crypto Random source Entropy driver"
 	depends on DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED
 	select ENTROPY_HAS_DRIVER
+	select PSA_WANT_GENERATE_RANDOM
 	default y
 	help
 	  Enable the PSA Crypto source Entropy driver.
diff --git a/drivers/entropy/fake_entropy_nrf_prng.c b/drivers/entropy/fake_entropy_nrf_prng.c
new file mode 100644
index 00000000000..8624c844405
--- /dev/null
+++ b/drivers/entropy/fake_entropy_nrf_prng.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/init.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <zephyr/drivers/entropy.h>
+
+#define DT_DRV_COMPAT nordic_entropy_prng
+
+/* This file implements a pseudo-RNG
+ * https://vigna.di.unimi.it/xorshift/xoshiro128plus.c
+ */
+
+static uint32_t s[4];
+
+static inline uint32_t rotl(const uint32_t x, int k)
+{
+	return (x << k) | (x >> (32 - k));
+}
+
+static uint32_t rng_next(void)
+{
+	const uint32_t result = rotl(s[0] + s[3], 7) + s[0];
+
+	const uint32_t t = s[1] << 9;
+
+	s[2] ^= s[0];
+	s[3] ^= s[1];
+	s[1] ^= s[2];
+	s[0] ^= s[3];
+
+	s[2] ^= t;
+
+	s[3] = rotl(s[3], 11);
+
+	return result;
+}
+
+static int entropy_prng_get_entropy(const struct device *dev, uint8_t *buffer, uint16_t length)
+{
+	ARG_UNUSED(dev);
+
+	while (length) {
+		/*
+		 * Note that only 1 thread (Zephyr thread or HW models), runs at
+		 * a time, therefore there is no need to use random_r()
+		 */
+		uint32_t value = rng_next();
+
+		size_t to_copy = MIN(length, sizeof(long));
+
+		memcpy(buffer, &value, to_copy);
+		buffer += to_copy;
+		length -= to_copy;
+	}
+
+	return 0;
+}
+
+static int entropy_prng_get_entropy_isr(const struct device *dev, uint8_t *buf, uint16_t len,
+					uint32_t flags)
+{
+	ARG_UNUSED(flags);
+
+	int err;
+
+	/*
+	 * entropy_prng_get_entropy() is also safe for ISRs
+	 * and always produces data.
+	 */
+	err = entropy_prng_get_entropy(dev, buf, len);
+	if (err < 0) {
+		return err;
+	} else {
+		return len;
+	}
+}
+
+static int entropy_prng_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	/* Picked some arbitrary initial seed. */
+	s[0] = 0xAF568BC0;
+	s[1] = 0xAC34307E;
+	s[2] = 0x9B7F6DD1;
+	s[3] = 0xD84319FC;
+	return 0;
+}
+
+static const struct entropy_driver_api entropy_prng_api_funcs = {
+	.get_entropy = entropy_prng_get_entropy, .get_entropy_isr = entropy_prng_get_entropy_isr};
+
+DEVICE_DT_INST_DEFINE(0, entropy_prng_init, NULL, NULL, NULL, PRE_KERNEL_1,
+		      CONFIG_ENTROPY_INIT_PRIORITY, &entropy_prng_api_funcs);
diff --git a/drivers/ethernet/eth_native_tap.c b/drivers/ethernet/eth_native_tap.c
index 8e8f696e14e..27cfeadb530 100644
--- a/drivers/ethernet/eth_native_tap.c
+++ b/drivers/ethernet/eth_native_tap.c
@@ -307,7 +307,7 @@ static void create_rx_handler(struct eth_context *ctx)
 static void eth_iface_init(struct net_if *iface)
 {
 	struct eth_context *ctx = net_if_get_device(iface)->data;
-	struct net_linkaddr *ll_addr = eth_get_mac(ctx);
+	struct net_linkaddr *ll_addr;
 #if !defined(CONFIG_ETH_NATIVE_TAP_RANDOM_MAC)
 	const char *mac_addr =
 		mac_addr_cmd_opt ? mac_addr_cmd_opt : CONFIG_ETH_NATIVE_TAP_MAC_ADDR;
@@ -355,6 +355,8 @@ static void eth_iface_init(struct net_if *iface)
 	}
 #endif
 
+	ll_addr = eth_get_mac(ctx);
+
 	/* If we have only one network interface, then use the name
 	 * defined in the Kconfig directly. This way there is no need to
 	 * change the documentation etc. and break things.
diff --git a/drivers/firmware/CMakeLists.txt b/drivers/firmware/CMakeLists.txt
index 1222e9388ea..062106cf92b 100644
--- a/drivers/firmware/CMakeLists.txt
+++ b/drivers/firmware/CMakeLists.txt
@@ -1,3 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
+# zephyr-keep-sorted-start
 add_subdirectory_ifdef(CONFIG_ARM_SCMI scmi)
+add_subdirectory_ifdef(CONFIG_NRF_IRONSIDE nrf_ironside)
+# zephyr-keep-sorted-stop
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 41576061237..3e3afe9ffdd 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -10,6 +10,9 @@ config ARM_SCMI
 	  Enable support for ARM's System Configuration and Management
 	  Interface (SCMI).
 
+# zephyr-keep-sorted-start
+source "drivers/firmware/nrf_ironside/Kconfig"
 source "drivers/firmware/scmi/Kconfig"
+# zephyr-keep-sorted-stop
 
 endmenu
diff --git a/drivers/firmware/nrf_ironside/CMakeLists.txt b/drivers/firmware/nrf_ironside/CMakeLists.txt
new file mode 100644
index 00000000000..d21a132d67d
--- /dev/null
+++ b/drivers/firmware/nrf_ironside/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_CALL call.c)
+
+zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_CPUCONF_SERVICE cpuconf.c)
+zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_UPDATE_SERVICE update.c)
diff --git a/drivers/firmware/nrf_ironside/Kconfig b/drivers/firmware/nrf_ironside/Kconfig
new file mode 100644
index 00000000000..97e3604bf72
--- /dev/null
+++ b/drivers/firmware/nrf_ironside/Kconfig
@@ -0,0 +1,46 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config NRF_IRONSIDE
+	bool
+	depends on SOC_NRF54H20_IRON
+	help
+	  This is selected by drivers interacting with Nordic IRONside firmware.
+
+config NRF_IRONSIDE_CALL
+	bool
+	depends on DT_HAS_NORDIC_IRONSIDE_CALL_ENABLED
+	select NRF_IRONSIDE
+	select EVENTS
+	select MBOX
+	help
+	  This is selected by features that require support for IRONside calls.
+
+if NRF_IRONSIDE_CALL
+
+config NRF_IRONSIDE_CALL_INIT_PRIORITY
+	int "IRONside calls' initialization priority"
+	default 41
+	help
+	  Initialization priority of IRONside calls. It must be below MBOX_INIT_PRIORITY,
+	  but higher than the priority of any feature that selects NRF_IRONSIDE_CALL.
+
+endif # NRF_IRONSIDE_CALL
+
+menu "Nordic IRONside services"
+	depends on SOC_NRF54H20_IRON
+
+config NRF_IRONSIDE_CPUCONF_SERVICE
+	bool "IRONside CPUCONF service"
+	depends on SOC_NRF54H20_CPUAPP
+	select NRF_IRONSIDE_CALL
+	help
+	  Service used to boot local domain cores.
+
+config NRF_IRONSIDE_UPDATE_SERVICE
+	bool "IRONside update service"
+	select NRF_IRONSIDE_CALL
+	help
+	  Service used to update the IRONside SE firmware.
+
+endmenu
diff --git a/drivers/firmware/nrf_ironside/call.c b/drivers/firmware/nrf_ironside/call.c
new file mode 100644
index 00000000000..f120c017549
--- /dev/null
+++ b/drivers/firmware/nrf_ironside/call.c
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/cache.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/firmware/nrf_ironside/call.h>
+#include <zephyr/drivers/mbox.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/barrier.h>
+#include <zephyr/sys/math_extras.h>
+#include <zephyr/sys/util.h>
+
+#define DT_DRV_COMPAT nordic_ironside_call
+
+#define SHM_NODE     DT_INST_PHANDLE(0, memory_region)
+#define NUM_BUFS     (DT_REG_SIZE(SHM_NODE) / sizeof(struct ironside_call_buf))
+#define ALL_BUF_BITS BIT_MASK(NUM_BUFS)
+
+/* Note: this area is already zero-initialized at reset time. */
+static struct ironside_call_buf *const bufs = (void *)DT_REG_ADDR(SHM_NODE);
+
+#if defined(CONFIG_DCACHE_LINE_SIZE)
+BUILD_ASSERT((DT_REG_ADDR(SHM_NODE) % CONFIG_DCACHE_LINE_SIZE) == 0);
+BUILD_ASSERT((sizeof(struct ironside_call_buf) % CONFIG_DCACHE_LINE_SIZE) == 0);
+#endif
+
+static const struct mbox_dt_spec mbox_rx = MBOX_DT_SPEC_INST_GET(0, rx);
+static const struct mbox_dt_spec mbox_tx = MBOX_DT_SPEC_INST_GET(0, tx);
+
+static K_EVENT_DEFINE(alloc_evts);
+static K_EVENT_DEFINE(rsp_evts);
+
+static void ironside_call_rsp(const struct device *dev, mbox_channel_id_t channel_id,
+			      void *user_data, struct mbox_msg *data)
+{
+	ARG_UNUSED(dev);
+	ARG_UNUSED(channel_id);
+	ARG_UNUSED(user_data);
+	ARG_UNUSED(data);
+
+	struct ironside_call_buf *buf;
+	uint32_t rsp_buf_bits = 0;
+
+	/* Check which buffers are not being dispatched currently. Those must
+	 * not be cache-invalidated, in case they're used in thread context.
+	 *
+	 * This value will remain valid as long as ironside_call_rsp is never
+	 * preempted by ironside_call_dispatch; the former runs in MBOX ISR,
+	 * while the latter shall not run in ISR (because of k_event_wait).
+	 */
+	const uint32_t skip_buf_bits = k_event_test(&rsp_evts, ALL_BUF_BITS);
+
+	for (int i = 0; i < NUM_BUFS; i++) {
+		if (skip_buf_bits & BIT(i)) {
+			continue;
+		}
+
+		buf = &bufs[i];
+
+		sys_cache_data_invd_range(buf, sizeof(*buf));
+		barrier_dmem_fence_full();
+
+		if (buf->status != IRONSIDE_CALL_STATUS_IDLE &&
+		    buf->status != IRONSIDE_CALL_STATUS_REQ) {
+			rsp_buf_bits |= BIT(i);
+		}
+	}
+	k_event_post(&rsp_evts, rsp_buf_bits);
+}
+
+static int ironside_call_init(const struct device *dev)
+{
+	ARG_UNUSED(dev);
+
+	int err;
+
+	k_event_set(&alloc_evts, ALL_BUF_BITS);
+	k_event_set(&rsp_evts, ALL_BUF_BITS);
+
+	err = mbox_register_callback_dt(&mbox_rx, ironside_call_rsp, NULL);
+	__ASSERT_NO_MSG(err == 0);
+
+	err = mbox_set_enabled_dt(&mbox_rx, 1);
+	__ASSERT_NO_MSG(err == 0);
+
+	return 0;
+}
+
+DEVICE_DT_INST_DEFINE(0, ironside_call_init, NULL, NULL, NULL, POST_KERNEL,
+		      CONFIG_NRF_IRONSIDE_CALL_INIT_PRIORITY, NULL);
+
+struct ironside_call_buf *ironside_call_alloc(void)
+{
+	uint32_t avail_buf_bits;
+	uint32_t alloc_buf_bit;
+
+	do {
+		avail_buf_bits = k_event_wait(&alloc_evts, ALL_BUF_BITS, false, K_FOREVER);
+
+		/* Try allocating the first available block.
+		 * If it's claimed by another thread, go back and wait for another block.
+		 */
+		alloc_buf_bit = LSB_GET(avail_buf_bits);
+	} while (k_event_clear(&alloc_evts, alloc_buf_bit) == 0);
+
+	return &bufs[u32_count_trailing_zeros(alloc_buf_bit)];
+}
+
+void ironside_call_dispatch(struct ironside_call_buf *buf)
+{
+	const uint32_t buf_bit = BIT(buf - bufs);
+	int err;
+
+	buf->status = IRONSIDE_CALL_STATUS_REQ;
+	barrier_dmem_fence_full();
+
+	sys_cache_data_flush_range(buf, sizeof(*buf));
+
+	k_event_clear(&rsp_evts, buf_bit);
+
+	err = mbox_send_dt(&mbox_tx, NULL);
+	__ASSERT_NO_MSG(err == 0);
+
+	k_event_wait(&rsp_evts, buf_bit, false, K_FOREVER);
+}
+
+void ironside_call_release(struct ironside_call_buf *buf)
+{
+	const uint32_t buf_bit = BIT(buf - bufs);
+
+	buf->status = IRONSIDE_CALL_STATUS_IDLE;
+	barrier_dmem_fence_full();
+
+	sys_cache_data_flush_range(buf, sizeof(*buf));
+
+	k_event_post(&alloc_evts, buf_bit);
+}
diff --git a/drivers/firmware/nrf_ironside/cpuconf.c b/drivers/firmware/nrf_ironside/cpuconf.c
new file mode 100644
index 00000000000..93627eaca37
--- /dev/null
+++ b/drivers/firmware/nrf_ironside/cpuconf.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+
+#include <zephyr/drivers/firmware/nrf_ironside/call.h>
+#include <zephyr/drivers/firmware/nrf_ironside/cpuconf.h>
+
+int ironside_cpuconf(NRF_PROCESSORID_Type cpu, void *vector_table, bool cpu_wait, uint8_t *msg,
+		     size_t msg_size)
+{
+	int err;
+	struct ironside_call_buf *const buf = ironside_call_alloc();
+
+	buf->id = IRONSIDE_CALL_ID_CPUCONF_V0;
+
+	buf->args[IRONSIDE_CPUCONF_SERVICE_CPU_IDX] = cpu;
+	buf->args[IRONSIDE_CPUCONF_SERVICE_VECTOR_TABLE_IDX] = (uint32_t)vector_table;
+	buf->args[IRONSIDE_CPUCONF_SERVICE_CPU_WAIT_IDX] = cpu_wait;
+	buf->args[IRONSIDE_CPUCONF_SERVICE_MSG_IDX] = (uint32_t)msg;
+	buf->args[IRONSIDE_CPUCONF_SERVICE_MSG_SIZE_IDX] = msg_size;
+
+	ironside_call_dispatch(buf);
+
+	if (buf->status == IRONSIDE_CALL_STATUS_RSP_SUCCESS) {
+		err = buf->args[IRONSIDE_CPUCONF_SERVICE_RETCODE_IDX];
+	} else {
+		err = buf->status;
+	}
+
+	ironside_call_release(buf);
+
+	return err;
+}
diff --git a/drivers/firmware/nrf_ironside/update.c b/drivers/firmware/nrf_ironside/update.c
new file mode 100644
index 00000000000..8de21303b05
--- /dev/null
+++ b/drivers/firmware/nrf_ironside/update.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/firmware/nrf_ironside/update.h>
+#include <zephyr/drivers/firmware/nrf_ironside/call.h>
+
+int ironside_update(const struct ironside_update_blob *update)
+{
+	int err;
+	struct ironside_call_buf *const buf = ironside_call_alloc();
+
+	buf->id = IRONSIDE_CALL_ID_UPDATE_SERVICE_V0;
+	buf->args[IRONSIDE_UPDATE_SERVICE_UPDATE_PTR_IDX] = (uintptr_t)update;
+
+	ironside_call_dispatch(buf);
+
+	if (buf->status == IRONSIDE_CALL_STATUS_RSP_SUCCESS) {
+		err = buf->args[IRONSIDE_UPDATE_SERVICE_RETCODE_IDX];
+	} else {
+		err = buf->status;
+	}
+
+	ironside_call_release(buf);
+
+	return err;
+}
diff --git a/drivers/flash/Kconfig.nrf_rram b/drivers/flash/Kconfig.nrf_rram
index 3dea687a0f8..a59560e86a4 100644
--- a/drivers/flash/Kconfig.nrf_rram
+++ b/drivers/flash/Kconfig.nrf_rram
@@ -70,14 +70,14 @@ config SOC_FLASH_NRF_TIMEOUT_MULTIPLIER
 
 config NRF_RRAM_REGION_ADDRESS_RESOLUTION
 	hex
-	default 0x400
+	default 0x1000
 	help
 	  RRAMC's region protection address resolution.
 	  Applies to region with configurable start address.
 
 config NRF_RRAM_REGION_SIZE_UNIT
 	hex
-	default 0x400
+	default 0x1000
 	help
 	  Base unit for the size of RRAMC's region protection.
 
diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
index f60ca2d2c0e..12eeb3f4a3e 100644
--- a/drivers/flash/nrf_qspi_nor.c
+++ b/drivers/flash/nrf_qspi_nor.c
@@ -1359,6 +1359,18 @@ void z_impl_nrf_qspi_nor_xip_enable(const struct device *dev, bool enable)
 #endif
 	if (enable) {
 		(void)nrfx_qspi_activate(false);
+	} else {
+		/* It turns out that when the QSPI peripheral is deactivated
+		 * after a XIP transaction, it cannot be later successfully
+		 * reactivated and an attempt to perform another XIP transaction
+		 * results in the CPU being hung; even a debug session cannot be
+		 * started then and the SoC has to be recovered.
+		 * As a workaround, at least until the cause of such behavior
+		 * is fully clarified, perform a simple non-XIP transaction
+		 * (a read of the status register) before deactivating the QSPI.
+		 * This prevents the issue from occurring.
+		 */
+		(void)qspi_rdsr(dev, 1);
 	}
 	dev_data->xip_enabled = enable;
 
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index 9e1ba68319f..574739082dc 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/drivers/flash/soc_flash_nrf.c
@@ -37,6 +37,11 @@ LOG_MODULE_REGISTER(flash_nrf);
 
 #define SOC_NV_FLASH_NODE DT_INST(0, soc_nv_flash)
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
+#include <soc_secure.h>
+#include <pm_config.h>
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
+
 #ifndef CONFIG_SOC_FLASH_NRF_RADIO_SYNC_NONE
 #define FLASH_SLOT_WRITE     7500
 #if defined(CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE)
@@ -166,6 +171,12 @@ static int flash_nrf_read(const struct device *dev, off_t addr,
 	}
 #endif
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
+	if (addr < PM_APP_ADDRESS) {
+		return soc_secure_mem_read(data, (void *)addr, len);
+	}
+#endif
+
 	nrf_nvmc_buffer_read(data, (uint32_t)addr, len);
 
 	return 0;
diff --git a/drivers/flash/soc_flash_nrf_rram.c b/drivers/flash/soc_flash_nrf_rram.c
index d26a15cf723..d46e3524ea8 100644
--- a/drivers/flash/soc_flash_nrf_rram.c
+++ b/drivers/flash/soc_flash_nrf_rram.c
@@ -54,6 +54,11 @@ LOG_MODULE_REGISTER(flash_nrf_rram, CONFIG_FLASH_LOG_LEVEL);
 #define WRITE_BLOCK_SIZE_FROM_DT DT_PROP(RRAM, write_block_size)
 #define ERASE_VALUE              0xFF
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
+#include <soc_secure.h>
+#include <pm_config.h>
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
+
 #ifdef CONFIG_MULTITHREADING
 static struct k_sem sem_lock;
 #define SYNC_INIT()   k_sem_init(&sem_lock, 1, 1)
@@ -279,6 +284,12 @@ static int nrf_rram_read(const struct device *dev, off_t addr, void *data, size_
 	}
 	addr += RRAM_START;
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
+	if (addr < PM_APP_ADDRESS) {
+		return soc_secure_mem_read(data, (void *)addr, len);
+	}
+#endif
+
 	memcpy(data, (void *)addr, len);
 
 	return 0;
diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index 3d2c1a12f46..6b491819626 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -254,6 +254,9 @@ static int gpio_nrfx_pin_get_config(const struct device *port, gpio_pin_t pin,
 
 	if (dir == NRF_GPIO_PIN_DIR_OUTPUT) {
 		*flags |= GPIO_OUTPUT;
+		*flags |= nrf_gpio_pin_out_read(abs_pin)
+			? GPIO_OUTPUT_INIT_HIGH
+			: GPIO_OUTPUT_INIT_LOW;
 	}
 
 	nrf_gpio_pin_input_t input = nrf_gpio_pin_input_get(abs_pin);
diff --git a/drivers/i2s/CMakeLists.txt b/drivers/i2s/CMakeLists.txt
index 7857b6e863b..43284026f31 100644
--- a/drivers/i2s/CMakeLists.txt
+++ b/drivers/i2s/CMakeLists.txt
@@ -11,6 +11,7 @@ zephyr_library_sources_ifdef(CONFIG_I2S_STM32		i2s_ll_stm32.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_LITEX		i2s_litex.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_FLEXCOMM	i2s_mcux_flexcomm.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_NRFX		i2s_nrfx.c)
+zephyr_library_sources_ifdef(CONFIG_TDM_NRF		i2s_nrfx_tdm.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_SAI	i2s_mcux_sai.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_ESP32		i2s_esp32.c)
 zephyr_library_sources_ifdef(CONFIG_I2S_TEST		i2s_test.c)
diff --git a/drivers/i2s/Kconfig.nrfx b/drivers/i2s/Kconfig.nrfx
index b36f3eb9c64..92966c306ba 100644
--- a/drivers/i2s/Kconfig.nrfx
+++ b/drivers/i2s/Kconfig.nrfx
@@ -22,3 +22,25 @@ config I2S_NRFX_TX_BLOCK_COUNT
 	default 4
 
 endif # I2S_NRFX
+
+menuconfig TDM_NRF
+	bool "nRF TDM nrfx driver"
+	default y
+	depends on DT_HAS_NORDIC_NRF_TDM_ENABLED
+	select NRFX_TDM130 if HAS_HW_NRF_TDM130
+	select CLOCK_CONTROL
+	select PINCTRL
+	help
+	  Enable support for nrfx TDM driver for nRF MCU series.
+
+if TDM_NRF
+
+config TDM_NRFX_RX_BLOCK_COUNT
+	int "RX queue length"
+	default 4
+
+config TDM_NRFX_TX_BLOCK_COUNT
+	int "TX queue length"
+	default 4
+
+endif # TDM_NRF
diff --git a/drivers/i2s/i2s_nrfx_tdm.c b/drivers/i2s/i2s_nrfx_tdm.c
new file mode 100644
index 00000000000..1116b22e94b
--- /dev/null
+++ b/drivers/i2s/i2s_nrfx_tdm.c
@@ -0,0 +1,1117 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <stdlib.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <soc.h>
+#include <dmm.h>
+#include <hal/nrf_tdm.h>
+#include <haly/nrfy_gpio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
+
+LOG_MODULE_REGISTER(tdm_nrfx, CONFIG_I2S_LOG_LEVEL);
+
+/* The application must provide buffers that are to be used in the next
+ * part of the transfer.
+ */
+#define NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED BIT(0)
+
+/* The TDM peripheral has been stopped and all buffers that were passed
+ * to the driver have been released.
+ */
+#define NRFX_TDM_STATUS_TRANSFER_STOPPED BIT(1)
+
+#define NODE_AUDIOPLL DT_NODELABEL(audiopll)
+
+#if DT_NODE_HAS_STATUS_OKAY(NODE_AUDIOPLL)
+static const struct device *audiopll = DEVICE_DT_GET(NODE_AUDIOPLL);
+const struct nrf_clock_spec aclk_spec = {
+	.frequency = DT_PROP_OR(NODE_AUDIOPLL, frequency, 0),
+	.accuracy = 0,
+	.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,
+};
+#endif
+
+typedef struct {
+	uint32_t *p_rx_buffer;
+	uint32_t const *p_tx_buffer;
+	void *p_tx_mem_slab;
+	void *p_rx_mem_slab;
+	uint16_t buffer_size;
+} tdm_buffers_t;
+
+typedef void (*tdm_data_handler_t)(tdm_buffers_t const *p_released, uint32_t status);
+
+typedef struct {
+	tdm_data_handler_t handler;
+	bool use_rx: 1;
+	bool use_tx: 1;
+	bool rx_ready: 1;
+	bool tx_ready: 1;
+	bool buffers_needed: 1;
+	bool buffers_reused: 1;
+	tdm_buffers_t next_buffers;
+	tdm_buffers_t current_buffers;
+} tdm_ctrl_t;
+
+struct stream_cfg {
+	struct i2s_config cfg;
+	nrf_tdm_config_t nrfx_cfg;
+};
+
+struct tdm_buf {
+	void *mem_block;
+	size_t size;
+	void *dmm_buf;
+};
+
+struct tdm_drv_cfg {
+	tdm_data_handler_t data_handler;
+	const struct pinctrl_dev_config *pcfg;
+	NRF_TDM_Type *p_reg;
+	void *mem_reg;
+	tdm_ctrl_t *control_data;
+	uint32_t mck_frequency;
+	uint32_t pclk_frequency;
+	enum clock_source {
+		PCLK,
+		ACLK
+	} clk_src;
+};
+
+struct tdm_drv_data {
+	struct onoff_client clk_cli;
+	struct stream_cfg tx;
+	struct k_msgq tx_queue;
+	struct stream_cfg rx;
+	struct k_msgq rx_queue;
+	const struct tdm_drv_cfg *drv_cfg;
+	const uint32_t *last_tx_buffer;
+	void *last_tx_mem_slab;
+	enum i2s_state state;
+	enum i2s_dir active_dir;
+	bool stop;       /* stop after the current (TX or RX) block */
+	bool discard_rx; /* discard further RX blocks */
+	volatile bool next_tx_buffer_needed;
+	bool tx_configured: 1;
+	bool rx_configured: 1;
+	bool request_clock: 1;
+};
+
+static int audio_clock_request(struct tdm_drv_data *drv_data)
+{
+#if DT_NODE_HAS_STATUS_OKAY(NODE_AUDIOPLL)
+	return nrf_clock_control_request(audiopll, &aclk_spec, &drv_data->clk_cli);
+#else
+	(void)drv_data;
+
+	return -ENOTSUP;
+#endif
+}
+
+static int audio_clock_release(void)
+{
+#if DT_NODE_HAS_STATUS_OKAY(NODE_AUDIOPLL)
+	return nrf_clock_control_release(audiopll, &aclk_spec);
+#else
+	return -ENOTSUP;
+#endif
+}
+
+void tdm_irq_handler(const struct device *dev)
+{
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	NRF_TDM_Type *p_reg = drv_cfg->p_reg;
+	tdm_ctrl_t *ctrl_data = drv_cfg->control_data;
+	uint32_t event_mask = 0;
+
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_MAXCNT)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_MAXCNT);
+	}
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_TXPTRUPD)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
+		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_TXPTRUPD);
+		ctrl_data->tx_ready = true;
+		if (ctrl_data->use_tx && ctrl_data->buffers_needed) {
+			ctrl_data->buffers_reused = true;
+		}
+	}
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_RXPTRUPD)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
+		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_RXPTRUPD);
+		ctrl_data->rx_ready = true;
+		if (ctrl_data->use_rx && ctrl_data->buffers_needed) {
+			ctrl_data->buffers_reused = true;
+		}
+	}
+	if (nrf_tdm_event_check(p_reg, NRF_TDM_EVENT_STOPPED)) {
+		nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_STOPPED);
+		event_mask |= NRFY_EVENT_TO_INT_BITMASK(NRF_TDM_EVENT_STOPPED);
+		nrf_tdm_int_disable(p_reg, NRF_TDM_INT_STOPPED_MASK_MASK);
+		nrf_tdm_disable(p_reg);
+		/* When stopped, release all buffers, including these scheduled for
+		 * the next part of the transfer, and signal that the transfer has
+		 * finished.
+		 */
+		ctrl_data->handler(&ctrl_data->current_buffers, 0);
+		ctrl_data->handler(&ctrl_data->next_buffers, NRFX_TDM_STATUS_TRANSFER_STOPPED);
+	} else {
+		/* Check if the requested transfer has been completed:
+		 * - full-duplex mode
+		 */
+		if ((ctrl_data->use_tx && ctrl_data->use_rx && ctrl_data->tx_ready &&
+		     ctrl_data->rx_ready) ||
+		    /* - TX only mode */
+		    (!ctrl_data->use_rx && ctrl_data->tx_ready) ||
+		    /* - RX only mode */
+		    (!ctrl_data->use_tx && ctrl_data->rx_ready)) {
+			ctrl_data->tx_ready = false;
+			ctrl_data->rx_ready = false;
+
+			/* If the application did not supply the buffers for the next
+			 * part of the transfer until this moment, the current buffers
+			 * cannot be released, since the I2S peripheral already started
+			 * using them. Signal this situation to the application by
+			 * passing NULL instead of the structure with released buffers.
+			 */
+			if (ctrl_data->buffers_reused) {
+				ctrl_data->buffers_reused = false;
+				/* This will most likely be set at this point. However, there is
+				 * a small time window between TXPTRUPD and RXPTRUPD events,
+				 * and it is theoretically possible that next buffers will be
+				 * set in this window, so to be sure this flag is set to true,
+				 * set it explicitly.
+				 */
+				ctrl_data->buffers_needed = true;
+				ctrl_data->handler(NULL, NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED);
+			} else {
+				/* Buffers that have been used by the I2S peripheral (current)
+				 * are now released and will be returned to the application,
+				 * and the ones scheduled to be used as next become the current
+				 * ones.
+				 */
+				tdm_buffers_t released_buffers = ctrl_data->current_buffers;
+
+				ctrl_data->current_buffers = ctrl_data->next_buffers;
+				ctrl_data->next_buffers.p_rx_buffer = NULL;
+				ctrl_data->next_buffers.p_tx_buffer = NULL;
+				ctrl_data->buffers_needed = true;
+				ctrl_data->handler(&released_buffers,
+						   NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED);
+			}
+		}
+	}
+}
+
+static uint32_t div_calculate(uint32_t src_freq, uint32_t requested_clk_freq)
+{
+	enum {
+		MCKCONST = 1048576
+	};
+	/* As specified in the PS:
+	 *
+	 * DIV = 4096 * floor(f_MCK * 1048576 /
+	 *                        (f_source + f_MCK / 2))
+	 * f_actual = f_source /
+	 *            floor(1048576 * 4096 / DIV)
+	 */
+
+	uint32_t ck_div = (uint32_t)(((uint64_t)requested_clk_freq * MCKCONST) /
+				     (src_freq + requested_clk_freq / 2));
+	return (ck_div * 4096);
+}
+
+static bool get_next_tx_buffer(struct tdm_drv_data *drv_data, tdm_buffers_t *buffers)
+{
+	struct tdm_buf buf;
+	int ret = k_msgq_get(&drv_data->tx_queue, &buf, K_NO_WAIT);
+
+	if (ret != 0) {
+		return false;
+	}
+	buffers->p_tx_buffer = buf.dmm_buf;
+	buffers->p_tx_mem_slab = buf.mem_block;
+	buffers->buffer_size = buf.size / sizeof(uint32_t);
+	return true;
+}
+
+static bool get_next_rx_buffer(struct tdm_drv_data *drv_data, tdm_buffers_t *buffers)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+	int ret = k_mem_slab_alloc(drv_data->rx.cfg.mem_slab, &buffers->p_rx_mem_slab, K_NO_WAIT);
+
+	if (ret < 0) {
+		LOG_ERR("Failed to allocate next RX buffer: %d", ret);
+		return false;
+	}
+	ret = dmm_buffer_in_prepare(drv_cfg->mem_reg, buffers->p_rx_mem_slab,
+				    buffers->buffer_size * sizeof(uint32_t),
+				    (void **)&buffers->p_rx_buffer);
+	if (ret < 0) {
+		LOG_ERR("Failed to prepare buffer: %d", ret);
+		return false;
+	}
+
+	return true;
+}
+
+static void free_tx_buffer(struct tdm_drv_data *drv_data, struct tdm_buf *buf)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+
+	(void)dmm_buffer_out_release(drv_cfg->mem_reg, buf->dmm_buf);
+	k_mem_slab_free(drv_data->tx.cfg.mem_slab, buf->mem_block);
+	LOG_DBG("Freed TX %p", buf->mem_block);
+}
+
+static void free_rx_buffer(struct tdm_drv_data *drv_data, struct tdm_buf *buf)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+
+	(void)dmm_buffer_in_release(drv_cfg->mem_reg, buf->mem_block, buf->size, buf->dmm_buf);
+	k_mem_slab_free(drv_data->rx.cfg.mem_slab, buf->mem_block);
+	LOG_DBG("Freed RX %p", buf->mem_block);
+}
+
+static void tdm_start(struct tdm_drv_data *drv_data, tdm_buffers_t const *p_initial_buffers)
+{
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
+
+	__ASSERT_NO_MSG(p_initial_buffers->p_rx_buffer != NULL ||
+			p_initial_buffers->p_tx_buffer != NULL);
+	ctrl_data->use_rx = (p_initial_buffers->p_rx_buffer != NULL);
+	ctrl_data->use_tx = (p_initial_buffers->p_tx_buffer != NULL);
+	ctrl_data->rx_ready = false;
+	ctrl_data->tx_ready = false;
+	ctrl_data->buffers_needed = false;
+	ctrl_data->buffers_reused = false;
+
+	ctrl_data->next_buffers = *p_initial_buffers;
+	ctrl_data->current_buffers.p_rx_buffer = NULL;
+	ctrl_data->current_buffers.p_tx_buffer = NULL;
+	nrf_tdm_enable(p_reg);
+
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
+
+	nrf_tdm_int_enable(
+		p_reg,
+		(p_initial_buffers->p_rx_buffer ? NRF_TDM_INT_RXPTRUPD_MASK_MASK : 0UL) |
+			(p_initial_buffers->p_tx_buffer ? NRF_TDM_INT_TXPTRUPD_MASK_MASK : 0UL) |
+			NRF_TDM_INT_STOPPED_MASK_MASK);
+
+	nrf_tdm_tx_count_set(p_reg, p_initial_buffers->buffer_size);
+	nrf_tdm_rx_count_set(p_reg, p_initial_buffers->buffer_size);
+	nrf_tdm_rx_buffer_set(p_reg, p_initial_buffers->p_rx_buffer);
+	nrf_tdm_tx_buffer_set(p_reg, p_initial_buffers->p_tx_buffer);
+	nrf_tdm_task_trigger(p_reg, NRF_TDM_TASK_START);
+}
+
+static void tdm_stop(NRF_TDM_Type *p_reg)
+{
+	nrf_tdm_int_disable(p_reg, NRF_TDM_INT_RXPTRUPD_MASK_MASK | NRF_TDM_INT_TXPTRUPD_MASK_MASK);
+
+	nrf_tdm_task_trigger(p_reg, NRF_TDM_TASK_STOP);
+}
+
+static bool next_buffers_set(struct tdm_drv_data *drv_data, tdm_buffers_t const *p_buffers)
+{
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
+	nrf_tdm_rxtxen_t dir = NRF_TDM_RXTXEN_DUPLEX;
+
+	__ASSERT_NO_MSG(p_buffers->p_rx_buffer != NULL || p_buffers->p_tx_buffer != NULL);
+
+	if (!ctrl_data->buffers_needed) {
+		return false;
+	}
+
+	nrf_tdm_tx_count_set(p_reg, p_buffers->buffer_size);
+	nrf_tdm_rx_count_set(p_reg, p_buffers->buffer_size);
+	nrf_tdm_rx_buffer_set(p_reg, p_buffers->p_rx_buffer);
+	nrf_tdm_tx_buffer_set(p_reg, p_buffers->p_tx_buffer);
+
+	if (p_buffers->p_rx_buffer == NULL) {
+		dir = NRF_TDM_RXTXEN_TX;
+	} else if (p_buffers->p_tx_buffer == NULL) {
+		dir = NRF_TDM_RXTXEN_RX;
+	}
+	nrf_tdm_transfer_direction_set(p_reg, dir);
+
+	ctrl_data->next_buffers = *p_buffers;
+	ctrl_data->buffers_needed = false;
+
+	return true;
+}
+
+static bool supply_next_buffers(struct tdm_drv_data *drv_data, tdm_buffers_t *next)
+{
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+
+	if (drv_data->active_dir != I2S_DIR_TX) { /* -> RX active */
+		if (!get_next_rx_buffer(drv_data, next)) {
+			drv_data->state = I2S_STATE_ERROR;
+			tdm_stop(drv_cfg->p_reg);
+			return false;
+		}
+		/* Set buffer size if there is no TX buffer (which effectively
+		 * controls how many bytes will be received).
+		 */
+		if (drv_data->active_dir == I2S_DIR_RX) {
+			next->buffer_size = drv_data->rx.cfg.block_size / sizeof(uint32_t);
+		}
+	}
+
+	drv_data->last_tx_buffer = next->p_tx_buffer;
+	drv_data->last_tx_mem_slab = next->p_tx_mem_slab;
+
+	LOG_DBG("Next buffers: %p/%p", next->p_tx_buffer, next->p_rx_buffer);
+	return next_buffers_set(drv_data, next);
+}
+
+static void purge_queue(const struct device *dev, enum i2s_dir dir)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	struct tdm_buf buf;
+
+	if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
+		while (k_msgq_get(&drv_data->tx_queue, &buf, K_NO_WAIT) == 0) {
+			free_tx_buffer(drv_data, &buf);
+		}
+	}
+
+	if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
+		while (k_msgq_get(&drv_data->rx_queue, &buf, K_NO_WAIT) == 0) {
+			free_rx_buffer(drv_data, &buf);
+		}
+	}
+}
+
+static void tdm_uninit(struct tdm_drv_data *drv_data)
+{
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+
+	tdm_stop(p_reg);
+	NRFX_IRQ_DISABLE(nrfx_get_irq_number(p_reg));
+}
+
+static int tdm_nrfx_configure(const struct device *dev, enum i2s_dir dir,
+			      const struct i2s_config *tdm_cfg)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	nrf_tdm_config_t nrfx_cfg;
+	uint32_t chan_mask = 0;
+
+	if (drv_data->state != I2S_STATE_READY) {
+		LOG_ERR("Cannot configure in state: %d", drv_data->state);
+		return -EINVAL;
+	}
+
+	if (tdm_cfg->frame_clk_freq == 0) { /* -> reset state */
+		purge_queue(dev, dir);
+		if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
+			drv_data->tx_configured = false;
+			memset(&drv_data->tx, 0, sizeof(drv_data->tx));
+		}
+		if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
+			drv_data->rx_configured = false;
+			memset(&drv_data->rx, 0, sizeof(drv_data->rx));
+		}
+		return 0;
+	}
+
+	__ASSERT_NO_MSG(tdm_cfg->mem_slab != NULL && tdm_cfg->block_size != 0);
+
+	if ((tdm_cfg->block_size % sizeof(uint32_t)) != 0) {
+		LOG_ERR("This device can transfer only full 32-bit words");
+		return -EINVAL;
+	}
+
+	switch (tdm_cfg->word_size) {
+	case 8:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_8BIT;
+		break;
+	case 16:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_16BIT;
+		break;
+	case 24:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_24BIT;
+		break;
+	case 32:
+		nrfx_cfg.sample_width = NRF_TDM_SWIDTH_32BIT;
+		break;
+	default:
+		LOG_ERR("Unsupported word size: %u", tdm_cfg->word_size);
+		return -EINVAL;
+	}
+
+	switch (tdm_cfg->format & I2S_FMT_DATA_FORMAT_MASK) {
+	case I2S_FMT_DATA_FORMAT_I2S:
+		nrfx_cfg.alignment = NRF_TDM_ALIGN_LEFT;
+		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_NEGEDGE;
+		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
+		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_1CK;
+		break;
+	case I2S_FMT_DATA_FORMAT_LEFT_JUSTIFIED:
+		nrfx_cfg.alignment = NRF_TDM_ALIGN_LEFT;
+		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
+		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_NONE;
+		break;
+	case I2S_FMT_DATA_FORMAT_RIGHT_JUSTIFIED:
+		nrfx_cfg.alignment = NRF_TDM_ALIGN_RIGHT;
+		nrfx_cfg.fsync_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.sck_polarity = NRF_TDM_POLARITY_POSEDGE;
+		nrfx_cfg.fsync_duration = NRF_TDM_FSYNC_DURATION_CHANNEL;
+		nrfx_cfg.channel_delay = NRF_TDM_CHANNEL_DELAY_NONE;
+		break;
+	default:
+		LOG_ERR("Unsupported data format: 0x%02x", tdm_cfg->format);
+		return -EINVAL;
+	}
+
+	if ((tdm_cfg->format & I2S_FMT_DATA_ORDER_LSB) || (tdm_cfg->format & I2S_FMT_BIT_CLK_INV) ||
+	    (tdm_cfg->format & I2S_FMT_FRAME_CLK_INV)) {
+		LOG_ERR("Unsupported stream format: 0x%02x", tdm_cfg->format);
+		return -EINVAL;
+	}
+
+	if (tdm_cfg->channels == 2) {
+		nrfx_cfg.num_of_channels = NRF_TDM_CHANNELS_COUNT_2;
+	} else if (tdm_cfg->channels == 1) {
+		nrfx_cfg.num_of_channels = NRF_TDM_CHANNELS_COUNT_1;
+	} else {
+		LOG_ERR("Unsupported number of channels: %u", tdm_cfg->channels);
+		return -EINVAL;
+	}
+	chan_mask = BIT_MASK(tdm_cfg->channels);
+
+	if ((tdm_cfg->options & I2S_OPT_BIT_CLK_SLAVE) &&
+	    (tdm_cfg->options & I2S_OPT_FRAME_CLK_SLAVE)) {
+		nrfx_cfg.mode = NRF_TDM_MODE_SLAVE;
+	} else if (!(tdm_cfg->options & I2S_OPT_BIT_CLK_SLAVE) &&
+		   !(tdm_cfg->options & I2S_OPT_FRAME_CLK_SLAVE)) {
+		nrfx_cfg.mode = NRF_TDM_MODE_MASTER;
+	} else {
+		LOG_ERR("Unsupported operation mode: 0x%02x", tdm_cfg->options);
+		return -EINVAL;
+	}
+
+	nrfx_cfg.mck_setup = 0;
+	if (nrfx_cfg.mode == NRF_TDM_MODE_MASTER) {
+		uint32_t sck = tdm_cfg->word_size * tdm_cfg->frame_clk_freq * tdm_cfg->channels;
+		const uint32_t src_freq = (drv_cfg->clk_src == ACLK)
+						  ? DT_PROP_OR(NODE_AUDIOPLL, frequency, 0)
+						  : drv_cfg->pclk_frequency;
+
+		/* Unless the PCLK source is used,
+		 * it is required to request the proper clock to be running
+		 * before starting the transfer itself.
+		 */
+		drv_data->request_clock = (drv_cfg->clk_src != PCLK);
+		nrfx_cfg.sck_setup = div_calculate(src_freq, sck);
+
+		if (((nrf_tdm_mck_pin_get(drv_cfg->p_reg) & TDM_PSEL_MCK_CONNECT_Msk) ==
+		     TDM_PSEL_MCK_CONNECT_Connected << TDM_PSEL_MCK_CONNECT_Pos) &&
+		    drv_cfg->mck_frequency != 0) {
+			nrfx_cfg.mck_setup = div_calculate(src_freq, drv_cfg->mck_frequency);
+		}
+	} else {
+		drv_data->request_clock = false;
+	}
+
+	if ((tdm_cfg->options & I2S_OPT_LOOPBACK) || (tdm_cfg->options & I2S_OPT_PINGPONG)) {
+		LOG_ERR("Unsupported options: 0x%02x", tdm_cfg->options);
+		return -EINVAL;
+	}
+
+	if (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {
+		nrfx_cfg.channels = (chan_mask << TDM_CONFIG_CHANNEL_MASK_Tx0Enable_Pos);
+		drv_data->tx.cfg = *tdm_cfg;
+		drv_data->tx.nrfx_cfg = nrfx_cfg;
+		drv_data->tx_configured = true;
+	}
+
+	if (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {
+		nrfx_cfg.channels = (chan_mask << TDM_CONFIG_CHANNEL_MASK_Rx0Enable_Pos);
+		drv_data->rx.cfg = *tdm_cfg;
+		drv_data->rx.nrfx_cfg = nrfx_cfg;
+		drv_data->rx_configured = true;
+	}
+	return 0;
+}
+
+static const struct i2s_config *tdm_nrfx_config_get(const struct device *dev, enum i2s_dir dir)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+
+	if (dir == I2S_DIR_TX && drv_data->tx_configured) {
+		return &drv_data->tx.cfg;
+	}
+	if (dir == I2S_DIR_RX && drv_data->rx_configured) {
+		return &drv_data->rx.cfg;
+	}
+
+	return NULL;
+}
+
+static int tdm_nrfx_read(const struct device *dev, void **mem_block, size_t *size)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = drv_data->drv_cfg;
+	struct tdm_buf buf;
+	int ret;
+
+	if (!drv_data->rx_configured) {
+		LOG_ERR("Device is not configured");
+		return -EIO;
+	}
+	ret = k_msgq_get(&drv_data->rx_queue, &buf,
+			 (drv_data->state == I2S_STATE_ERROR)
+				 ? K_NO_WAIT
+				 : SYS_TIMEOUT_MS(drv_data->rx.cfg.timeout));
+	if (ret == -ENOMSG) {
+		return -EIO;
+	}
+
+	LOG_DBG("Released RX %p", buf.mem_block);
+
+	if (ret == 0) {
+		(void)dmm_buffer_in_release(drv_cfg->mem_reg, buf.mem_block, buf.size, buf.dmm_buf);
+		*mem_block = buf.mem_block;
+		*size = buf.size;
+	}
+	return ret;
+}
+
+static int tdm_nrfx_write(const struct device *dev, void *mem_block, size_t size)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	struct tdm_buf buf = {.mem_block = mem_block, .size = size};
+	int ret;
+
+	if (!drv_data->tx_configured) {
+		LOG_ERR("Device is not configured");
+		return -EIO;
+	}
+
+	if (drv_data->state != I2S_STATE_RUNNING && drv_data->state != I2S_STATE_READY) {
+		LOG_ERR("Cannot write in state: %d", drv_data->state);
+		return -EIO;
+	}
+
+	if (size > drv_data->tx.cfg.block_size || size < sizeof(uint32_t)) {
+		LOG_ERR("This device can only write blocks up to %u bytes",
+			drv_data->tx.cfg.block_size);
+		return -EIO;
+	}
+	ret = dmm_buffer_out_prepare(drv_cfg->mem_reg, buf.mem_block, buf.size,
+				     (void **)&buf.dmm_buf);
+	ret = k_msgq_put(&drv_data->tx_queue, &buf, SYS_TIMEOUT_MS(drv_data->tx.cfg.timeout));
+	if (ret < 0) {
+		return ret;
+	}
+
+	/* Check if interrupt wanted to get next TX buffer before current buffer
+	 * was queued. Do not move this check before queuing because doing so
+	 * opens the possibility for a race condition between this function and
+	 * data_handler() that is called in interrupt context.
+	 */
+	if (drv_data->state == I2S_STATE_RUNNING && drv_data->next_tx_buffer_needed) {
+		tdm_buffers_t next = {0};
+
+		if (!get_next_tx_buffer(drv_data, &next)) {
+			/* Log error because this is definitely unexpected.
+			 * Do not return error because the caller is no longer
+			 * responsible for releasing the buffer.
+			 */
+			LOG_ERR("Cannot reacquire queued buffer");
+			return 0;
+		}
+
+		drv_data->next_tx_buffer_needed = false;
+
+		LOG_DBG("Next TX %p", next.p_tx_buffer);
+
+		if (!supply_next_buffers(drv_data, &next)) {
+			LOG_ERR("Cannot supply buffer");
+			return -EIO;
+		}
+	}
+	return 0;
+}
+
+static int start_transfer(struct tdm_drv_data *drv_data)
+{
+	tdm_buffers_t initial_buffers = {0};
+	int ret = 0;
+
+	if (drv_data->active_dir != I2S_DIR_RX && /* -> TX to be started */
+	    !get_next_tx_buffer(drv_data, &initial_buffers)) {
+		LOG_ERR("No TX buffer available");
+		ret = -ENOMEM;
+	} else if (drv_data->active_dir != I2S_DIR_TX && /* -> RX to be started */
+		   !get_next_rx_buffer(drv_data, &initial_buffers)) {
+		/* Failed to allocate next RX buffer */
+		ret = -ENOMEM;
+	} else {
+		/* It is necessary to set buffer size here only for I2S_DIR_RX,
+		 * because only then the get_next_tx_buffer() call in the if
+		 * condition above gets short-circuited.
+		 */
+		if (drv_data->active_dir == I2S_DIR_RX) {
+			initial_buffers.buffer_size =
+				drv_data->rx.cfg.block_size / sizeof(uint32_t);
+		}
+
+		drv_data->last_tx_buffer = initial_buffers.p_tx_buffer;
+		drv_data->last_tx_mem_slab = initial_buffers.p_tx_mem_slab;
+
+		tdm_start(drv_data, &initial_buffers);
+	}
+	if (ret < 0) {
+		tdm_uninit(drv_data);
+		if (drv_data->request_clock) {
+			(void)audio_clock_release();
+		}
+
+		if (initial_buffers.p_tx_buffer) {
+			struct tdm_buf buf = {.mem_block = (void *)initial_buffers.p_tx_mem_slab,
+					      .dmm_buf = (void *)initial_buffers.p_tx_buffer,
+					      .size = initial_buffers.buffer_size *
+						      sizeof(uint32_t)};
+			free_tx_buffer(drv_data, &buf);
+		}
+		if (initial_buffers.p_rx_buffer) {
+			struct tdm_buf buf = {.mem_block = initial_buffers.p_rx_mem_slab,
+					      .dmm_buf = (void *)initial_buffers.p_rx_buffer,
+					      .size = initial_buffers.buffer_size *
+						      sizeof(uint32_t)};
+			free_rx_buffer(drv_data, &buf);
+		}
+
+		drv_data->state = I2S_STATE_ERROR;
+	}
+	return ret;
+}
+
+static void tdm_init(struct tdm_drv_data *drv_data, nrf_tdm_config_t const *p_config,
+		     tdm_data_handler_t handler)
+{
+	tdm_ctrl_t *ctrl_data = drv_data->drv_cfg->control_data;
+	NRF_TDM_Type *p_reg = drv_data->drv_cfg->p_reg;
+
+	nrf_tdm_configure(p_reg, p_config);
+	nrf_tdm_mck_set(p_reg, p_config->mck_setup != 0);
+
+	ctrl_data->handler = handler;
+
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_RXPTRUPD);
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_TXPTRUPD);
+	nrf_tdm_event_clear(p_reg, NRF_TDM_EVENT_STOPPED);
+	NRFX_IRQ_ENABLE(nrfx_get_irq_number(p_reg));
+}
+
+static void clock_started_callback(struct onoff_manager *mgr, struct onoff_client *cli,
+				   uint32_t state, int res)
+{
+	struct tdm_drv_data *drv_data = CONTAINER_OF(cli, struct tdm_drv_data, clk_cli);
+
+	/* The driver state can be set back to READY at this point if the DROP
+	 * command was triggered before the clock has started. Do not start
+	 * the actual transfer in such case.
+	 */
+	if (drv_data->state == I2S_STATE_READY) {
+		tdm_uninit(drv_data);
+		(void)audio_clock_release();
+	} else {
+		(void)start_transfer(drv_data);
+	}
+}
+
+static int trigger_start(const struct device *dev)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	int ret;
+	const nrf_tdm_config_t *nrfx_cfg = (drv_data->active_dir == I2S_DIR_TX)
+						   ? &drv_data->tx.nrfx_cfg
+						   : &drv_data->rx.nrfx_cfg;
+
+	tdm_init(drv_data, nrfx_cfg, drv_cfg->data_handler);
+
+	drv_data->state = I2S_STATE_RUNNING;
+
+	nrf_tdm_sck_configure(drv_cfg->p_reg,
+			      drv_cfg->clk_src == ACLK ? NRF_TDM_SRC_ACLK : NRF_TDM_SRC_PCLK32M,
+			      false);
+
+	nrf_tdm_mck_configure(drv_cfg->p_reg,
+			      drv_cfg->clk_src == ACLK ? NRF_TDM_SRC_ACLK : NRF_TDM_SRC_PCLK32M,
+			      false);
+	/* If it is required to use certain HF clock, request it to be running
+	 * first. If not, start the transfer directly.
+	 */
+	if (drv_data->request_clock) {
+		sys_notify_init_callback(&drv_data->clk_cli.notify, clock_started_callback);
+		ret = audio_clock_request(drv_data);
+		if (ret < 0) {
+			tdm_uninit(drv_data);
+			drv_data->state = I2S_STATE_READY;
+
+			LOG_ERR("Failed to request clock: %d", ret);
+			return -EIO;
+		}
+	} else {
+		ret = start_transfer(drv_data);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+
+	return 0;
+}
+
+static int tdm_nrfx_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	bool configured = false;
+	bool cmd_allowed;
+
+	/* This driver does not use the I2S_STATE_NOT_READY value.
+	 * Instead, if a given stream is not configured, the respective
+	 * flag (tx_configured or rx_configured) is cleared.
+	 */
+	drv_data->tx.nrfx_cfg.channels |= drv_data->rx.nrfx_cfg.channels;
+	drv_data->rx.nrfx_cfg.channels |= drv_data->tx.nrfx_cfg.channels;
+	if (dir == I2S_DIR_BOTH) {
+
+		configured = drv_data->tx_configured && drv_data->rx_configured;
+	} else if (dir == I2S_DIR_TX) {
+		configured = drv_data->tx_configured;
+	} else if (dir == I2S_DIR_RX) {
+		configured = drv_data->rx_configured;
+	}
+
+	if (!configured) {
+		LOG_ERR("Device is not configured");
+		return -EIO;
+	}
+
+	if (dir == I2S_DIR_BOTH && (memcmp(&drv_data->tx.nrfx_cfg, &drv_data->rx.nrfx_cfg,
+					   sizeof(drv_data->rx.nrfx_cfg)) != 0 ||
+				    (drv_data->tx.cfg.block_size != drv_data->rx.cfg.block_size))) {
+		LOG_ERR("TX and RX configurations are different");
+		return -EIO;
+	}
+
+	switch (cmd) {
+	case I2S_TRIGGER_START:
+		cmd_allowed = (drv_data->state == I2S_STATE_READY);
+		break;
+	case I2S_TRIGGER_STOP:
+	case I2S_TRIGGER_DRAIN:
+		cmd_allowed = (drv_data->state == I2S_STATE_RUNNING);
+		break;
+	case I2S_TRIGGER_DROP:
+		cmd_allowed = configured;
+		break;
+	case I2S_TRIGGER_PREPARE:
+		cmd_allowed = (drv_data->state == I2S_STATE_ERROR);
+		break;
+	default:
+		LOG_ERR("Invalid trigger: %d", cmd);
+		return -EINVAL;
+	}
+
+	if (!cmd_allowed) {
+		LOG_ERR("Not allowed");
+		return -EIO;
+	}
+
+	/* For triggers applicable to the RUNNING state (i.e. STOP, DRAIN,
+	 * and DROP), ensure that the command is applied to the streams
+	 * that are currently active (this device cannot e.g. stop only TX
+	 * without stopping RX).
+	 */
+	if (drv_data->state == I2S_STATE_RUNNING && drv_data->active_dir != dir) {
+		LOG_ERR("Inappropriate trigger (%d/%d), active stream(s): %d", cmd, dir,
+			drv_data->active_dir);
+		return -EINVAL;
+	}
+
+	switch (cmd) {
+	case I2S_TRIGGER_START:
+		drv_data->stop = false;
+		drv_data->discard_rx = false;
+		drv_data->active_dir = dir;
+		drv_data->next_tx_buffer_needed = false;
+		return trigger_start(dev);
+
+	case I2S_TRIGGER_STOP:
+		drv_data->state = I2S_STATE_STOPPING;
+		drv_data->stop = true;
+		return 0;
+
+	case I2S_TRIGGER_DRAIN:
+		drv_data->state = I2S_STATE_STOPPING;
+		/* If only RX is active, DRAIN is equivalent to STOP. */
+		drv_data->stop = (drv_data->active_dir == I2S_DIR_RX);
+		return 0;
+
+	case I2S_TRIGGER_DROP:
+		if (drv_data->state != I2S_STATE_READY) {
+			drv_data->discard_rx = true;
+			tdm_stop(drv_cfg->p_reg);
+		}
+		purge_queue(dev, dir);
+		drv_data->state = I2S_STATE_READY;
+		return 0;
+
+	case I2S_TRIGGER_PREPARE:
+		purge_queue(dev, dir);
+		drv_data->state = I2S_STATE_READY;
+		return 0;
+
+	default:
+		LOG_ERR("Invalid trigger: %d", cmd);
+		return -EINVAL;
+	}
+}
+
+static void data_handler(const struct device *dev, const tdm_buffers_t *released, uint32_t status)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+	bool stop_transfer = false;
+	struct tdm_buf buf = {.mem_block = NULL, .dmm_buf = NULL, .size = 0};
+
+	if (released != NULL) {
+		buf.size = released->buffer_size * sizeof(uint32_t);
+	}
+
+	if (status & NRFX_TDM_STATUS_TRANSFER_STOPPED) {
+		if (drv_data->state == I2S_STATE_STOPPING) {
+			drv_data->state = I2S_STATE_READY;
+		}
+		if (drv_data->last_tx_buffer) {
+			/* Usually, these pointers are equal, i.e. the last TX
+			 * buffer that were to be transferred is released by the
+			 * driver after it stops. The last TX buffer pointer is
+			 * then set to NULL here so that the buffer can be freed
+			 * below, just as any other TX buffer released by the
+			 * driver. However, it may happen that the buffer is not
+			 * released this way, for example, when the transfer
+			 * ends with an error because an RX buffer allocation
+			 * fails. In such case, the last TX buffer needs to be
+			 * freed here.
+			 */
+
+			if ((released != NULL) != 0 &&
+			    (drv_data->last_tx_buffer != released->p_tx_buffer)) {
+				buf.dmm_buf = (void *)drv_data->last_tx_buffer;
+				buf.mem_block = (void *)drv_data->last_tx_mem_slab;
+				free_tx_buffer(drv_data, &buf);
+			}
+			drv_data->last_tx_buffer = NULL;
+		}
+		tdm_uninit(drv_data);
+		if (drv_data->request_clock) {
+			(void)audio_clock_release();
+		}
+	}
+
+	if (released == NULL) {
+		/* This means that buffers for the next part of the transfer
+		 * were not supplied and the previous ones cannot be released
+		 * yet, as pointers to them were latched in the I2S registers.
+		 * It is not an error when the transfer is to be stopped (those
+		 * buffers will be released after the transfer actually stops).
+		 */
+		if (drv_data->state != I2S_STATE_STOPPING) {
+			drv_data->state = I2S_STATE_ERROR;
+		}
+		tdm_stop(drv_cfg->p_reg);
+		return;
+	}
+	if (released->p_rx_buffer) {
+		buf.mem_block = (void *)released->p_rx_mem_slab;
+		buf.dmm_buf = (void *)released->p_rx_buffer;
+		if (drv_data->discard_rx) {
+			free_rx_buffer(drv_data, &buf);
+		} else {
+			int ret = k_msgq_put(&drv_data->rx_queue, &buf, K_NO_WAIT);
+
+			if (ret < 0) {
+				LOG_ERR("No room in RX queue");
+				drv_data->state = I2S_STATE_ERROR;
+				stop_transfer = true;
+
+				free_rx_buffer(drv_data, &buf);
+			} else {
+
+				/* If the TX direction is not active and
+				 * the transfer should be stopped after
+				 * the current block, stop the reception.
+				 */
+				if (drv_data->active_dir == I2S_DIR_RX && drv_data->stop) {
+					drv_data->discard_rx = true;
+					stop_transfer = true;
+				}
+			}
+		}
+	}
+
+	if (released->p_tx_buffer) {
+		buf.mem_block = (void *)released->p_tx_mem_slab;
+		buf.dmm_buf = (void *)released->p_tx_buffer;
+		/* If the last buffer that was to be transferred has just been
+		 * released, it is time to stop the transfer.
+		 */
+		if (released->p_tx_buffer == drv_data->last_tx_buffer) {
+			drv_data->discard_rx = true;
+			stop_transfer = true;
+		} else {
+			free_tx_buffer(drv_data, &buf);
+		}
+	}
+
+	if (stop_transfer) {
+		tdm_stop(drv_cfg->p_reg);
+	} else if (status & NRFX_TDM_STATUS_NEXT_BUFFERS_NEEDED) {
+		tdm_buffers_t next = {0};
+
+		if (drv_data->active_dir != I2S_DIR_RX) { /* -> TX active */
+			if (drv_data->stop) {
+				/* If the stream is to be stopped, don't get
+				 * the next TX buffer from the queue, instead
+				 * supply the one used last time (it won't be
+				 * transferred, the stream will stop right
+				 * before this buffer would be started again).
+				 */
+				next.p_tx_buffer = drv_data->last_tx_buffer;
+				next.p_tx_mem_slab = drv_data->last_tx_mem_slab;
+				next.buffer_size = 1;
+			} else if (get_next_tx_buffer(drv_data, &next)) {
+				/* Next TX buffer successfully retrieved from
+				 * the queue, nothing more to do here.
+				 */
+			} else if (drv_data->state == I2S_STATE_STOPPING) {
+				/* If there are no more TX blocks queued and
+				 * the current state is STOPPING (so the DRAIN
+				 * command was triggered) it is time to finish
+				 * the transfer.
+				 */
+				drv_data->stop = true;
+				/* Supply the same buffer as last time; it will
+				 * not be transferred anyway, as the transfer
+				 * will be stopped earlier.
+				 */
+				next.p_tx_buffer = drv_data->last_tx_buffer;
+				next.p_tx_mem_slab = drv_data->last_tx_mem_slab;
+				next.buffer_size = 1;
+			} else {
+				/* Next TX buffer cannot be supplied now.
+				 * Defer it to when the user writes more data.
+				 */
+				drv_data->next_tx_buffer_needed = true;
+				return;
+			}
+		}
+		(void)supply_next_buffers(drv_data, &next);
+	}
+}
+
+static int data_init(const struct device *dev)
+{
+	struct tdm_drv_data *drv_data = dev->data;
+	const struct tdm_drv_cfg *drv_cfg = dev->config;
+
+	drv_data->state = I2S_STATE_READY;
+	int err = pinctrl_apply_state(drv_cfg->pcfg, PINCTRL_STATE_DEFAULT);
+
+	if (err < 0) {
+		return err;
+	}
+	drv_data->drv_cfg = drv_cfg;
+	return err;
+}
+
+static const struct i2s_driver_api tdm_nrf_drv_api = {
+	.configure = tdm_nrfx_configure,
+	.config_get = tdm_nrfx_config_get,
+	.read = tdm_nrfx_read,
+	.write = tdm_nrfx_write,
+	.trigger = tdm_nrfx_trigger,
+};
+
+#define TDM(idx)         DT_NODELABEL(tdm##idx)
+#define TDM_CLK_SRC(idx) DT_STRING_TOKEN(TDM(idx), clock_source)
+#define PCLK_NODE(idx)   DT_CLOCKS_CTLR(TDM(idx))
+
+#define TDM_NRFX_DEVICE(idx)                                                                       \
+	static tdm_ctrl_t tdm##idx##data;                                                          \
+	static struct tdm_buf tx_msgs##idx[CONFIG_TDM_NRFX_TX_BLOCK_COUNT];                        \
+	static struct tdm_buf rx_msgs##idx[CONFIG_TDM_NRFX_RX_BLOCK_COUNT];                        \
+	static void tdm_##idx##_irq_handler(const struct device *dev)                              \
+	{                                                                                          \
+		tdm_irq_handler(dev);                                                              \
+	}                                                                                          \
+	static void tdm_##idx##data_handler(tdm_buffers_t const *p_released, uint32_t status)      \
+	{                                                                                          \
+		data_handler(DEVICE_DT_GET(TDM(idx)), p_released, status);                         \
+	}                                                                                          \
+	PINCTRL_DT_DEFINE(TDM(idx));                                                               \
+	static const struct tdm_drv_cfg tdm_nrfx_cfg##idx = {                                      \
+		.data_handler = tdm_##idx##data_handler,                                           \
+		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(TDM(idx)),                                       \
+		.clk_src = TDM_CLK_SRC(idx),                                                       \
+		.mck_frequency = DT_PROP_OR(TDM(idx), mck_frequency, 0),                           \
+		.pclk_frequency = DT_PROP(PCLK_NODE(idx), clock_frequency),                        \
+		.p_reg = NRF_TDM##idx,                                                             \
+		.control_data = &tdm##idx##data,                                                   \
+		.mem_reg = DMM_DEV_TO_REG(TDM(idx)),                                               \
+	};                                                                                         \
+	static struct tdm_drv_data tdm_nrfx_data##idx;                                             \
+	static int tdm_nrfx_init##idx(const struct device *dev)                                    \
+	{                                                                                          \
+		IRQ_CONNECT(DT_IRQN(TDM(idx)), DT_IRQ(TDM(idx), priority),                         \
+			    tdm_##idx##_irq_handler, DEVICE_DT_GET(TDM(idx)), 0);                  \
+                                                                                                   \
+		int err = data_init(dev);                                                          \
+		if (err < 0) {                                                                     \
+			return err;                                                                \
+		}                                                                                  \
+		k_msgq_init(&tdm_nrfx_data##idx.tx_queue, (char *)tx_msgs##idx,                    \
+			    sizeof(struct tdm_buf), ARRAY_SIZE(tx_msgs##idx));                     \
+		k_msgq_init(&tdm_nrfx_data##idx.rx_queue, (char *)rx_msgs##idx,                    \
+			    sizeof(struct tdm_buf), ARRAY_SIZE(rx_msgs##idx));                     \
+		return 0;                                                                          \
+	}                                                                                          \
+	BUILD_ASSERT(TDM_CLK_SRC(idx) != ACLK || DT_NODE_HAS_STATUS_OKAY(NODE_AUDIOPLL),	   \
+		     "Clock source ACLK requires the audiopll node.");                             \
+	DEVICE_DT_DEFINE(TDM(idx), tdm_nrfx_init##idx, NULL, &tdm_nrfx_data##idx,                  \
+			 &tdm_nrfx_cfg##idx, POST_KERNEL, CONFIG_I2S_INIT_PRIORITY,                \
+			 &tdm_nrf_drv_api);
+
+/* Execute macro f(x) for all instances. */
+#define TDM_FOR_EACH_INSTANCE(f, sep, off_code, ...)                                               \
+	NRFX_FOREACH_PRESENT(TDM, f, sep, off_code, __VA_ARGS__)
+
+#define COND_TDM_NRFX_DEVICE(unused, prefix, i, _)                                                 \
+	IF_ENABLED(CONFIG_HAS_HW_NRF_TDM##prefix##i, (TDM_NRFX_DEVICE(prefix##i);))
+
+TDM_FOR_EACH_INSTANCE(COND_TDM_NRFX_DEVICE, (), ())
diff --git a/drivers/mbox/mbox_nrf_vevif_task_tx.c b/drivers/mbox/mbox_nrf_vevif_task_tx.c
index 3d553d4b484..76da4aa357f 100644
--- a/drivers/mbox/mbox_nrf_vevif_task_tx.c
+++ b/drivers/mbox/mbox_nrf_vevif_task_tx.c
@@ -5,12 +5,14 @@
 
 #define DT_DRV_COMPAT nordic_nrf_vevif_task_tx
 
+#include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/mbox.h>
 
 #include <haly/nrfy_vpr.h>
 
 #define TASKS_IDX_MAX NRF_VPR_TASKS_TRIGGER_MAX
+#define VEVIF_RETRIGGER_DELAY_USEC 12
 
 struct mbox_vevif_task_tx_conf {
 	NRF_VPR_Type *vpr;
@@ -39,6 +41,12 @@ static int vevif_task_tx_send(const struct device *dev, uint32_t id, const struc
 
 	nrfy_vpr_task_trigger(config->vpr, nrfy_vpr_trigger_task_get(id));
 
+#ifdef CONFIG_SOC_NRF54H20
+	k_busy_wait(VEVIF_RETRIGGER_DELAY_USEC);
+
+	nrfy_vpr_task_trigger(config->vpr, nrfy_vpr_trigger_task_get(id));
+#endif /* CONFIG_SOC_NRF54H20 */
+
 	return 0;
 }
 
diff --git a/drivers/modem/Kconfig.cellular b/drivers/modem/Kconfig.cellular
index adc66f574b7..1d15350b48e 100644
--- a/drivers/modem/Kconfig.cellular
+++ b/drivers/modem/Kconfig.cellular
@@ -13,6 +13,7 @@ config MODEM_CELLULAR
 	select RING_BUFFER
 	select NET_L2_PPP_OPTION_MRU
 	select NET_L2_PPP_PAP
+	select NET_L2_PPP_MGMT
 	depends on (DT_HAS_QUECTEL_BG95_ENABLED || \
 		    DT_HAS_SIMCOM_SIM7080_ENABLED || DT_HAS_U_BLOX_SARA_R4_ENABLED || \
 		    DT_HAS_U_BLOX_SARA_R5_ENABLED || DT_HAS_SWIR_HL7800_ENABLED || \
diff --git a/drivers/modem/modem_cellular.c b/drivers/modem/modem_cellular.c
index 2af67a01c7a..7ca2001697f 100644
--- a/drivers/modem/modem_cellular.c
+++ b/drivers/modem/modem_cellular.c
@@ -60,6 +60,7 @@ enum modem_cellular_state {
 	MODEM_CELLULAR_STATE_RUN_DIAL_SCRIPT,
 	MODEM_CELLULAR_STATE_AWAIT_REGISTERED,
 	MODEM_CELLULAR_STATE_CARRIER_ON,
+	MODEM_CELLULAR_STATE_DORMANT,
 	MODEM_CELLULAR_STATE_INIT_POWER_OFF,
 	MODEM_CELLULAR_STATE_RUN_SHUTDOWN_SCRIPT,
 	MODEM_CELLULAR_STATE_POWER_OFF_PULSE,
@@ -79,6 +80,7 @@ enum modem_cellular_event {
 	MODEM_CELLULAR_EVENT_DEREGISTERED,
 	MODEM_CELLULAR_EVENT_BUS_OPENED,
 	MODEM_CELLULAR_EVENT_BUS_CLOSED,
+	MODEM_CELLULAR_EVENT_PPP_DEAD,
 };
 
 struct modem_cellular_data {
@@ -126,6 +128,7 @@ struct modem_cellular_data {
 
 	/* PPP */
 	struct modem_ppp *ppp;
+	struct net_mgmt_event_callback net_mgmt_event_callback;
 
 	enum modem_cellular_state state;
 	const struct device *dev;
@@ -196,6 +199,8 @@ static const char *modem_cellular_state_str(enum modem_cellular_state state)
 		return "run dial script";
 	case MODEM_CELLULAR_STATE_CARRIER_ON:
 		return "carrier on";
+	case MODEM_CELLULAR_STATE_DORMANT:
+		return "dormant";
 	case MODEM_CELLULAR_STATE_INIT_POWER_OFF:
 		return "init power off";
 	case MODEM_CELLULAR_STATE_RUN_SHUTDOWN_SCRIPT:
@@ -236,6 +241,8 @@ static const char *modem_cellular_event_str(enum modem_cellular_event event)
 		return "bus opened";
 	case MODEM_CELLULAR_EVENT_BUS_CLOSED:
 		return "bus closed";
+	case MODEM_CELLULAR_EVENT_PPP_DEAD:
+		return "ppp dead";
 	}
 
 	return "";
@@ -1021,7 +1028,9 @@ static void modem_cellular_run_dial_script_event_handler(struct modem_cellular_d
 		modem_chat_attach(&data->chat, data->dlci1_pipe);
 		modem_chat_run_script_async(&data->chat, config->dial_chat_script);
 		break;
-
+	case MODEM_CELLULAR_EVENT_SCRIPT_FAILED:
+		modem_cellular_start_timer(data, MODEM_CELLULAR_PERIODIC_SCRIPT_TIMEOUT);
+		break;
 	case MODEM_CELLULAR_EVENT_SCRIPT_SUCCESS:
 		modem_cellular_enter_state(data, MODEM_CELLULAR_STATE_AWAIT_REGISTERED);
 		break;
@@ -1110,7 +1119,7 @@ static void modem_cellular_carrier_on_event_handler(struct modem_cellular_data *
 		break;
 
 	case MODEM_CELLULAR_EVENT_DEREGISTERED:
-		modem_cellular_enter_state(data, MODEM_CELLULAR_STATE_RUN_DIAL_SCRIPT);
+		modem_cellular_enter_state(data, MODEM_CELLULAR_STATE_DORMANT);
 		break;
 
 	case MODEM_CELLULAR_EVENT_SUSPEND:
@@ -1125,9 +1134,37 @@ static void modem_cellular_carrier_on_event_handler(struct modem_cellular_data *
 static int modem_cellular_on_carrier_on_state_leave(struct modem_cellular_data *data)
 {
 	modem_cellular_stop_timer(data);
+
+	return 0;
+}
+
+static int modem_cellular_on_dormant_state_enter(struct modem_cellular_data *data)
+{
+	net_if_dormant_on(modem_ppp_get_iface(data->ppp));
+
+	return 0;
+}
+
+static void modem_cellular_dormant_event_handler(struct modem_cellular_data *data,
+						 enum modem_cellular_event evt)
+{
+	switch (evt) {
+	case MODEM_CELLULAR_EVENT_PPP_DEAD:
+		modem_cellular_enter_state(data, MODEM_CELLULAR_STATE_RUN_DIAL_SCRIPT);
+		break;
+
+	default:
+		break;
+	}
+}
+
+static int modem_cellular_on_dormant_state_leave(struct modem_cellular_data *data)
+{
 	net_if_carrier_off(modem_ppp_get_iface(data->ppp));
 	modem_chat_release(&data->chat);
 	modem_ppp_release(data->ppp);
+	net_if_dormant_off(modem_ppp_get_iface(data->ppp));
+
 	return 0;
 }
 
@@ -1316,6 +1353,10 @@ static int modem_cellular_on_state_enter(struct modem_cellular_data *data)
 		ret = modem_cellular_on_carrier_on_state_enter(data);
 		break;
 
+	case MODEM_CELLULAR_STATE_DORMANT:
+		ret = modem_cellular_on_dormant_state_enter(data);
+		break;
+
 	case MODEM_CELLULAR_STATE_INIT_POWER_OFF:
 		ret = modem_cellular_on_init_power_off_state_enter(data);
 		break;
@@ -1377,6 +1418,10 @@ static int modem_cellular_on_state_leave(struct modem_cellular_data *data)
 		ret = modem_cellular_on_carrier_on_state_leave(data);
 		break;
 
+	case MODEM_CELLULAR_STATE_DORMANT:
+		ret = modem_cellular_on_dormant_state_leave(data);
+		break;
+
 	case MODEM_CELLULAR_STATE_INIT_POWER_OFF:
 		ret = modem_cellular_on_init_power_off_state_leave(data);
 		break;
@@ -1476,6 +1521,10 @@ static void modem_cellular_event_handler(struct modem_cellular_data *data,
 		modem_cellular_carrier_on_event_handler(data, evt);
 		break;
 
+	case MODEM_CELLULAR_STATE_DORMANT:
+		modem_cellular_dormant_event_handler(data, evt);
+		break;
+
 	case MODEM_CELLULAR_STATE_INIT_POWER_OFF:
 		modem_cellular_init_power_off_event_handler(data, evt);
 		break;
@@ -1719,6 +1768,22 @@ static int modem_cellular_pm_action(const struct device *dev, enum pm_device_act
 }
 #endif /* CONFIG_PM_DEVICE */
 
+static void net_mgmt_event_handler(struct net_mgmt_event_callback *cb, uint32_t mgmt_event,
+				   struct net_if *iface)
+{
+	struct modem_cellular_data *data =
+		CONTAINER_OF(cb, struct modem_cellular_data, net_mgmt_event_callback);
+
+	switch (mgmt_event) {
+	case NET_EVENT_PPP_PHASE_DEAD:
+		modem_cellular_delegate_event(data, MODEM_CELLULAR_EVENT_PPP_DEAD);
+		break;
+
+	default:
+		break;
+	}
+}
+
 static int modem_cellular_init(const struct device *dev)
 {
 	struct modem_cellular_data *data = (struct modem_cellular_data *)dev->data;
@@ -1827,6 +1892,13 @@ static int modem_cellular_init(const struct device *dev)
 		modem_chat_init(&data->chat, &chat_config);
 	}
 
+	{
+		net_mgmt_init_event_callback(&data->net_mgmt_event_callback, net_mgmt_event_handler,
+					     NET_EVENT_PPP_PHASE_DEAD);
+		net_mgmt_add_event_callback(&data->net_mgmt_event_callback);
+	}
+
+
 #ifndef CONFIG_PM_DEVICE
 	modem_cellular_delegate_event(data, MODEM_CELLULAR_EVENT_RESUME);
 #else
diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 77387e48806..05c0ed9ac0b 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -108,6 +108,22 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #endif
 #endif
 
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_tdm)
+#define NRF_PSEL_TDM(reg, line) ((NRF_TDM_Type *)reg)->PSEL.line
+#endif
+
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_hpf_mspi_controller) || \
+	defined(CONFIG_MSPI_HPF) || \
+	DT_ANY_COMPAT_HAS_PROP_STATUS_OKAY(nordic_nrf_vpr_coprocessor, pinctrl_0)
+#if defined(CONFIG_SOC_SERIES_NRF54LX)
+#define NRF_PSEL_SDP_MSPI(psel) \
+	nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_VPR);
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
+/* On nRF54H, pin routing is controlled by secure domain, via UICR. */
+#define NRF_PSEL_SDP_MSPI(psel)
+#endif
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_hpf_mspi_controller) || ... */
+
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
 {
@@ -354,6 +370,47 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
 			break;
 #endif /* defined(NRF_PSEL_QSPI) */
+#if defined(NRF_PSEL_TDM)
+		case NRF_FUN_TDM_SCK_M:
+			NRF_PSEL_TDM(reg, SCK) = psel;
+			write = 0U;
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+		case NRF_FUN_TDM_SCK_S:
+			NRF_PSEL_TDM(reg, SCK) = psel;
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+		case NRF_FUN_TDM_FSYNC_M:
+			NRF_PSEL_TDM(reg, FSYNC) = psel;
+			write = 0U;
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+		case NRF_FUN_TDM_FSYNC_S:
+			NRF_PSEL_TDM(reg, FSYNC) = psel;
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+		case NRF_FUN_TDM_SDIN:
+			NRF_PSEL_TDM(reg, SDIN) = psel;
+			dir = NRF_GPIO_PIN_DIR_INPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+		case NRF_FUN_TDM_SDOUT:
+			NRF_PSEL_TDM(reg, SDOUT) = psel;
+			write = 0U;
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+		case NRF_FUN_TDM_MCK:
+			NRF_PSEL_TDM(reg, MCK) = psel;
+			write = 0U;
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_DISCONNECT;
+			break;
+#endif /* defined(NRF_PSEL_TDM) */
 #if defined(NRF_GRTC_CLKOUT_FAST)
 		case NRF_FUN_GRTC_CLKOUT_FAST:
 #if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
@@ -383,7 +440,8 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_can) */
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif) || \
+	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif_spi)
 		/* Pin routing is controlled by secure domain, via UICR */
 		case NRF_FUN_EXMIF_CK:
 		case NRF_FUN_EXMIF_DQ0:
@@ -419,6 +477,26 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* defined(NRF_PSEL_TWIS) */
+#if defined(NRF_PSEL_SDP_MSPI)
+		case NRF_FUN_SDP_MSPI_CS0:
+		case NRF_FUN_SDP_MSPI_CS1:
+		case NRF_FUN_SDP_MSPI_CS2:
+		case NRF_FUN_SDP_MSPI_CS3:
+		case NRF_FUN_SDP_MSPI_CS4:
+		case NRF_FUN_SDP_MSPI_SCK:
+		case NRF_FUN_SDP_MSPI_DQ0:
+		case NRF_FUN_SDP_MSPI_DQ1:
+		case NRF_FUN_SDP_MSPI_DQ2:
+		case NRF_FUN_SDP_MSPI_DQ3:
+		case NRF_FUN_SDP_MSPI_DQ4:
+		case NRF_FUN_SDP_MSPI_DQ5:
+		case NRF_FUN_SDP_MSPI_DQ6:
+		case NRF_FUN_SDP_MSPI_DQ7:
+			NRF_PSEL_SDP_MSPI(psel);
+			dir = NRF_GPIO_PIN_DIR_OUTPUT;
+			input = NRF_GPIO_PIN_INPUT_CONNECT;
+			break;
+#endif /* defined(NRF_PSEL_SDP_MSPI) */
 		default:
 			return -ENOTSUP;
 		}
diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index 278540ce382..292c993fe22 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -63,6 +63,11 @@ config UART_ASYNC_TX_CACHE_SIZE
 	  in RAM, because EasyDMA in UARTE peripherals can only transfer data
 	  from RAM.
 
+config UART_NRFX_UARTE_SPURIOUS_RXTO_WORKAROUND
+	bool
+	help
+	  Apply workaround for spurious RXTO during restart.
+
 if HAS_HW_NRF_UART0 || HAS_HW_NRF_UARTE0
 nrfx_uart_num = 0
 rsource "Kconfig.nrfx_uart_instance"
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index d2136acf883..4cae1e1886b 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -266,6 +266,9 @@ struct uarte_nrfx_data {
 /* If enabled then UARTE peripheral is using memory which is cacheable. */
 #define UARTE_CFG_FLAG_CACHEABLE BIT(3)
 
+/* Indicates that workaround for spurious RXTO during restart shall be applied. */
+#define UARTE_CFG_FLAG_SPURIOUS_RXTO BIT(3)
+
 /* Formula for getting the baudrate settings is following:
  * 2^12 * (2^20 / (f_PCLK / desired_baudrate)) where f_PCLK is a frequency that
  * drives the UARTE.
@@ -1546,6 +1549,17 @@ static void endrx_isr(const struct device *dev)
 		unsigned int key = irq_lock();
 
 		if (async_rx->buf) {
+
+#if CONFIG_UART_NRFX_UARTE_SPURIOUS_RXTO_WORKAROUND
+			/* Check for spurious RXTO event. */
+			const struct uarte_nrfx_config *config = dev->config;
+
+			if ((config->flags & UARTE_CFG_FLAG_SPURIOUS_RXTO) &&
+			    nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXTO)) {
+				nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXTO);
+			}
+#endif
+
 			/* Check is based on assumption that ISR handler handles
 			 * ENDRX before RXSTARTED so if short was set on time, RXSTARTED
 			 * event will be set.
@@ -2567,6 +2581,9 @@ static int uarte_instance_init(const struct device *dev,
 			(!IS_ENABLED(CONFIG_HAS_NORDIC_DMM) ? 0 :	       \
 			  (UARTE_IS_CACHEABLE(idx) ?			       \
 				UARTE_CFG_FLAG_CACHEABLE : 0)) |	       \
+			(IS_ENABLED(CONFIG_UART_NRFX_UARTE_SPURIOUS_RXTO_WORKAROUND) && \
+			 INSTANCE_IS_HIGH_SPEED(_, /*empty*/, idx, _) ?	       \
+			 UARTE_CFG_FLAG_SPURIOUS_RXTO : 0) |		       \
 			USE_LOW_POWER(idx),				       \
 		UARTE_DISABLE_RX_INIT(UARTE(idx)),			       \
 		.poll_out_byte = &uarte##idx##_poll_out_byte,		       \
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index bd10447e442..6941bfdaaa7 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -41,6 +41,14 @@ LOG_MODULE_REGISTER(spi_dw);
 #include <zephyr/drivers/pinctrl.h>
 #endif
 
+#ifdef CONFIG_HAS_NRFX
+#include <nrfx.h>
+#endif
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+#include <nrf/gpd.h>
+#endif
+
 static inline bool spi_dw_is_slave(struct spi_dw_data *spi)
 {
 	return (IS_ENABLED(CONFIG_SPI_SLAVE) &&
@@ -258,6 +266,7 @@ static int spi_dw_configure(const struct device *dev,
 		/* Baud rate and Slave select, for master only */
 		write_baudr(dev, SPI_DW_CLK_DIVIDER(info->clock_frequency,
 						    config->frequency));
+		write_ser(dev, BIT(config->slave));
 	}
 
 	if (spi_dw_is_slave(spi)) {
@@ -512,6 +521,10 @@ void spi_dw_isr(const struct device *dev)
 	uint32_t int_status;
 	int error;
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->EVENTS_CORE = 0;
+#endif
+
 	int_status = read_isr(dev);
 
 	LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev, int_status,
@@ -560,6 +573,18 @@ int spi_dw_init(const struct device *dev)
 
 	DEVICE_MMIO_MAP(dev, K_MEM_CACHE_NONE);
 
+#ifdef CONFIG_HAS_NRFX
+	NRF_EXMIF->INTENSET = BIT(0);
+	NRF_EXMIF->TASKS_START = 1;
+
+#ifdef CONFIG_SOC_NRF54H20_GPD
+	err = nrf_gpd_request(NRF_GPD_FAST_ACTIVE1);
+	if (err < 0) {
+		return err;
+	}
+#endif
+#endif
+
 	info->config_func();
 
 	/* Masking interrupt and making sure controller is disabled */
@@ -584,6 +609,11 @@ int spi_dw_init(const struct device *dev)
 	return 0;
 }
 
+#define REG_ADDR(inst) \
+	COND_CODE_1(DT_NODE_HAS_COMPAT(DT_DRV_INST(inst), nordic_nrf_exmif_spi), \
+		    (Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(core, DT_DRV_INST(inst))), \
+		    (DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst))))
+
 #define SPI_CFG_IRQS_SINGLE_ERR_LINE(inst)					\
 		IRQ_CONNECT(DT_INST_IRQ_BY_NAME(inst, rx_avail, irq),		\
 			    DT_INST_IRQ_BY_NAME(inst, rx_avail, priority),	\
@@ -656,7 +686,7 @@ COND_CODE_1(IS_EQ(DT_NUM_IRQS(DT_DRV_INST(inst)), 1),              \
 		SPI_CONTEXT_CS_GPIOS_INITIALIZE(DT_DRV_INST(inst), ctx)                     \
 	};                                                                                  \
 	static const struct spi_dw_config spi_dw_config_##inst = {                          \
-		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(inst)),                                    \
+		REG_ADDR(inst),                                                             \
 		.clock_frequency = COND_CODE_1(                                             \
 			DT_NODE_HAS_PROP(DT_INST_PHANDLE(inst, clocks), clock_frequency),   \
 			(DT_INST_PROP_BY_PHANDLE(inst, clocks, clock_frequency)),           \
diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
index 0a102188139..1f450c430c2 100644
--- a/drivers/usb/udc/udc_dwc2_vendor_quirks.h
+++ b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -315,6 +315,191 @@ DT_INST_FOREACH_STATUS_OKAY(QUIRK_NRF_USBHS_DEFINE)
 
 #endif /*DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_usbhs) */
 
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_usbhs_nrf54l)
+
+#define DT_DRV_COMPAT snps_dwc2
+
+#define USBHS_DT_WRAPPER_REG_ADDR(n) UINT_TO_POINTER(DT_INST_REG_ADDR_BY_NAME(n, wrapper))
+
+#include <nrf.h>
+
+#define NRF_DEFAULT_IRQ_PRIORITY 1
+
+/*
+ * On USBHS, we cannot access the DWC2 register until VBUS is detected and
+ * valid. If the user tries to force usbd_enable() and the corresponding
+ * udc_enable() without a "VBUS ready" notification, the event wait will block
+ * until a valid VBUS signal is detected or until the
+ * CONFIG_UDC_DWC2_USBHS_VBUS_READY_TIMEOUT timeout expires.
+ */
+static K_EVENT_DEFINE(usbhs_events);
+#define USBHS_VBUS_READY	BIT(0)
+
+static void vregusb_isr(const void *arg)
+{
+	const struct device *dev = arg;
+
+	if (NRF_VREGUSB->EVENTS_VBUSDETECTED) {
+		NRF_VREGUSB->EVENTS_VBUSDETECTED = 0;
+		k_event_post(&usbhs_events, USBHS_VBUS_READY);
+		udc_submit_event(dev, UDC_EVT_VBUS_READY, 0);
+	}
+
+	if (NRF_VREGUSB->EVENTS_VBUSREMOVED) {
+		NRF_VREGUSB->EVENTS_VBUSREMOVED = 0;
+		k_event_set_masked(&usbhs_events, 0, USBHS_VBUS_READY);
+		udc_submit_event(dev, UDC_EVT_VBUS_REMOVED, 0);
+	}
+}
+
+static inline int usbhs_enable_vreg(const struct device *dev)
+{
+	IRQ_CONNECT(VREGUSB_IRQn, NRF_DEFAULT_IRQ_PRIORITY,
+		    vregusb_isr, DEVICE_DT_INST_GET(0), 0);
+
+	NRF_VREGUSB->INTEN = VREGUSB_INTEN_VBUSDETECTED_Msk |
+			     VREGUSB_INTEN_VBUSREMOVED_Msk;
+	NRF_VREGUSB->TASKS_START = 1;
+
+	/* TODO: Determine conditions when VBUSDETECTED is not generated */
+	if (sys_read32((mem_addr_t)NRF_VREGUSB + 0x400) & BIT(2)) {
+		k_event_post(&usbhs_events, USBHS_VBUS_READY);
+		udc_submit_event(dev, UDC_EVT_VBUS_READY, 0);
+	}
+
+	irq_enable(VREGUSB_IRQn);
+
+	return 0;
+}
+
+static inline int usbhs_enable_core(const struct device *dev)
+{
+	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
+	k_timeout_t timeout = K_FOREVER;
+
+	if (!k_event_wait(&usbhs_events, USBHS_VBUS_READY, false, K_NO_WAIT)) {
+		LOG_WRN("VBUS is not ready, block udc_enable()");
+		if (!k_event_wait(&usbhs_events, USBHS_VBUS_READY, false, timeout)) {
+			return -ETIMEDOUT;
+		}
+	}
+
+	/* TODO: Request PCLK24M using clock control driver */
+	NRF_CLOCK->TASKS_XO24MSTART = 1;
+	while (NRF_CLOCK->EVENTS_XO24MSTARTED == 0) {
+	}
+
+	/* Power up peripheral */
+	wrapper->ENABLE = USBHS_ENABLE_CORE_Msk;
+
+	/* Set ID to Device and force D+ pull-up off for now */
+	wrapper->PHY.OVERRIDEVALUES = (1 << 31);
+	wrapper->PHY.INPUTOVERRIDE = (1 << 31) | USBHS_PHY_INPUTOVERRIDE_VBUSVALID_Msk;
+
+	/* Release PHY power-on reset */
+	wrapper->ENABLE = USBHS_ENABLE_PHY_Msk | USBHS_ENABLE_CORE_Msk;
+
+	/* Wait for PHY clock to start */
+	k_busy_wait(45);
+
+	/* Release DWC2 reset */
+	wrapper->TASKS_START = 1UL;
+
+	/* Wait for clock to start to avoid hang on too early register read */
+	k_busy_wait(1);
+
+	/* DWC2 opmode is now guaranteed to be Non-Driving, allow D+ pull-up to
+	 * become active once driver clears DCTL SftDiscon bit.
+	 */
+	wrapper->PHY.INPUTOVERRIDE = (1 << 31);
+
+	return 0;
+}
+
+static inline int usbhs_disable_core(const struct device *dev)
+{
+	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
+
+	/* Set ID to Device and forcefully disable D+ pull-up */
+	wrapper->PHY.OVERRIDEVALUES = (1 << 31);
+	wrapper->PHY.INPUTOVERRIDE = (1 << 31) | USBHS_PHY_INPUTOVERRIDE_VBUSVALID_Msk;
+
+	wrapper->ENABLE = 0UL;
+
+	/* TODO: Release PCLK24M using clock control driver */
+	NRF_CLOCK->EVENTS_XO24MSTARTED = 0;
+	NRF_CLOCK->TASKS_XO24MSTOP = 1;
+
+	return 0;
+}
+
+static inline int usbhs_disable_vreg(const struct device *dev)
+{
+	NRF_VREGUSB->INTEN = 0;
+	NRF_VREGUSB->TASKS_STOP = 1;
+
+	return 0;
+}
+
+static inline int usbhs_init_caps(const struct device *dev)
+{
+	struct udc_data *data = dev->data;
+
+	data->caps.can_detect_vbus = true;
+	data->caps.hs = true;
+
+	return 0;
+}
+
+static inline int usbhs_is_phy_clk_off(const struct device *dev)
+{
+	return !k_event_test(&usbhs_events, USBHS_VBUS_READY);
+}
+
+static inline int usbhs_post_hibernation_entry(const struct device *dev)
+{
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
+
+	sys_set_bits((mem_addr_t)&base->pcgcctl, USB_DWC2_PCGCCTL_GATEHCLK);
+
+	wrapper->TASKS_STOP = 1;
+
+	return 0;
+}
+
+static inline int usbhs_pre_hibernation_exit(const struct device *dev)
+{
+	const struct udc_dwc2_config *const config = dev->config;
+	struct usb_dwc2_reg *const base = config->base;
+	NRF_USBHS_Type *wrapper = USBHS_DT_WRAPPER_REG_ADDR(0);
+
+	sys_clear_bits((mem_addr_t)&base->pcgcctl, USB_DWC2_PCGCCTL_GATEHCLK);
+
+	wrapper->TASKS_START = 1;
+
+	return 0;
+}
+
+#define QUIRK_NRF_USBHS_DEFINE(n)						\
+	struct dwc2_vendor_quirks dwc2_vendor_quirks_##n = {			\
+		.init = usbhs_enable_vreg,					\
+		.pre_enable = usbhs_enable_core,				\
+		.disable = usbhs_disable_core,					\
+		.shutdown = usbhs_disable_vreg,					\
+		.caps = usbhs_init_caps,					\
+		.is_phy_clk_off = usbhs_is_phy_clk_off,				\
+		.post_hibernation_entry = usbhs_post_hibernation_entry,		\
+		.pre_hibernation_exit = usbhs_pre_hibernation_exit,		\
+	};
+
+DT_INST_FOREACH_STATUS_OKAY(QUIRK_NRF_USBHS_DEFINE)
+
+#undef DT_DRV_COMPAT
+
+#endif /*DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_usbhs_nrf54l) */
+
 /* Add next vendor quirks definition above this line */
 
 #endif /* ZEPHYR_DRIVERS_USB_UDC_DWC2_VENDOR_QUIRKS_H */
diff --git a/drivers/wifi/nrf_wifi/CMakeLists.txt b/drivers/wifi/nrf_wifi/CMakeLists.txt
index d59a6ef6e9f..383d58490c5 100644
--- a/drivers/wifi/nrf_wifi/CMakeLists.txt
+++ b/drivers/wifi/nrf_wifi/CMakeLists.txt
@@ -27,9 +27,11 @@ zephyr_library_sources_ifndef(CONFIG_NRF70_OFFLOADED_RAW_TX
   src/fmac_main.c
 )
 
-zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
-  src/fw_load.c
-)
+if(NOT CONFIG_NRF71_ON_IPC)
+  zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
+    src/fw_load.c
+  )
+endif()
 
 if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
   zephyr_library_sources(
diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index a8bd7e83fa8..130e49d0901 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -5,6 +5,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+# TODO: Use DTS generated Kconfig once the board support is added
+DT_COMPAT_NORDIC_WIFI71 := nordic,wifi71
+
 menuconfig WIFI_NRF70
 	bool "nRF70 driver"
 	select NET_L2_WIFI_MGMT if NETWORKING
@@ -16,7 +19,8 @@ menuconfig WIFI_NRF70
 	depends on \
 		DT_HAS_NORDIC_NRF7002_SPI_ENABLED || DT_HAS_NORDIC_NRF7002_QSPI_ENABLED || \
 		DT_HAS_NORDIC_NRF7001_SPI_ENABLED || DT_HAS_NORDIC_NRF7001_QSPI_ENABLED || \
-		DT_HAS_NORDIC_NRF7000_SPI_ENABLED || DT_HAS_NORDIC_NRF7000_QSPI_ENABLED
+		DT_HAS_NORDIC_NRF7000_SPI_ENABLED || DT_HAS_NORDIC_NRF7000_QSPI_ENABLED || \
+		$(dt_compat_enabled,$(DT_COMPAT_NORDIC_WIFI71))
 	help
 	  Nordic Wi-Fi Driver
 
@@ -24,7 +28,7 @@ if WIFI_NRF70
 # Hidden symbols for internal use
 config WIFI_NRF7002
 	bool
-	default y if DT_HAS_NORDIC_NRF7002_SPI_ENABLED || DT_HAS_NORDIC_NRF7002_QSPI_ENABLED
+	default y if DT_HAS_NORDIC_NRF7002_SPI_ENABLED || DT_HAS_NORDIC_NRF7002_QSPI_ENABLED || $(dt_compat_enabled,$(DT_COMPAT_NORDIC_WIFI71))
 
 config WIFI_NRF7001
 	bool
@@ -151,6 +155,7 @@ endchoice
 config NRF_WIFI_LOW_POWER
 	bool "Low power mode in nRF Wi-Fi chipsets"
 	depends on !NRF70_RADIO_TEST && !NRF70_AP_MODE
+	depends on !NRF71_ON_IPC
 	default y
 
 config NRF70_TCP_IP_CHECKSUM_OFFLOAD
@@ -202,6 +207,7 @@ config NRF70_SR_COEX_RF_SWITCH
 
 config NRF70_SR_COEX_SLEEP_CTRL_GPIO_CTRL
 	bool "Configuration of GPIO control for coexistence"
+	depends on !NRF71_ON_IPC
 	default y
 
 config NRF70_SR_COEX_SWCTRL1_OUTPUT
diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
index 0559ca48f7c..b218bc13add 100644
--- a/drivers/wifi/nrf_wifi/src/fmac_main.c
+++ b/drivers/wifi/nrf_wifi/src/fmac_main.c
@@ -485,8 +485,12 @@ void reg_change_callbk_fn(void *vif_ctx,
 }
 #endif /* !CONFIG_NRF70_RADIO_TEST */
 
+#ifdef CONFIG_NRF71_ON_IPC
+#define MAX_TX_PWR(label) DT_PROP(DT_NODELABEL(wifi), label) * 4
+#else
 /* DTS uses 1dBm as the unit for TX power, while the RPU uses 0.25dBm */
 #define MAX_TX_PWR(label) DT_PROP(DT_NODELABEL(nrf70), label) * 4
+#endif /* CONFIG_NRF71_ON_IPC */
 
 void configure_tx_pwr_settings(struct nrf_wifi_tx_pwr_ctrl_params *tx_pwr_ctrl_params,
 				struct nrf_wifi_tx_pwr_ceil_params *tx_pwr_ceil_params)
diff --git a/drivers/wifi/nrf_wifi/src/fw_load.c b/drivers/wifi/nrf_wifi/src/fw_load.c
index 9204d295d30..f09643a585a 100644
--- a/drivers/wifi/nrf_wifi/src/fw_load.c
+++ b/drivers/wifi/nrf_wifi/src/fw_load.c
@@ -31,12 +31,13 @@ enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 		LOG_ERR("%s: nrf_wifi_fmac_fw_parse failed", __func__);
 		return status;
 	}
+#ifndef CONFIG_NRF71_ON_IPC
 	/* Load the FW patches to the RPU */
 	status = nrf_wifi_fmac_fw_load(rpu_ctx, &fw_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_fw_load failed", __func__);
 	}
-
+#endif /* !CONFIG_NRF71_ON_IPC */
 	return status;
 }
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c
index 633ee48f901..cc1c080a25a 100644
--- a/drivers/wifi/nrf_wifi/src/net_if.c
+++ b/drivers/wifi/nrf_wifi/src/net_if.c
@@ -575,6 +575,7 @@ enum nrf_wifi_status nrf_wifi_get_mac_addr(struct nrf_wifi_vif_ctx_zep *vif_ctx_
 		random_mac_addr,
 		WIFI_MAC_ADDR_LEN);
 #elif CONFIG_WIFI_OTP_MAC_ADDRESS
+#ifndef CONFIG_NRF71_ON_IPC
 	status = nrf_wifi_fmac_otp_mac_addr_get(fmac_dev_ctx,
 				vif_ctx_zep->vif_idx,
 				vif_ctx_zep->mac_addr.addr);
@@ -583,6 +584,15 @@ enum nrf_wifi_status nrf_wifi_get_mac_addr(struct nrf_wifi_vif_ctx_zep *vif_ctx_
 			__func__);
 		goto unlock;
 	}
+#else
+	/* Set dummy MAC address */
+	vif_ctx_zep->mac_addr.addr[0] = 0x00;
+	vif_ctx_zep->mac_addr.addr[1] = 0x00;
+	vif_ctx_zep->mac_addr.addr[2] = 0x5E;
+	vif_ctx_zep->mac_addr.addr[3] = 0x00;
+	vif_ctx_zep->mac_addr.addr[4] = 0x10;
+	vif_ctx_zep->mac_addr.addr[5] = 0x00;
+#endif /* !CONFIG_NRF71_ON_IPC */
 #endif
 
 	if (!nrf_wifi_utils_is_mac_addr_valid(vif_ctx_zep->mac_addr.addr)) {
diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
index ef47f4e5273..238876e4255 100644
--- a/dts/arm/nordic/nrf52805.dtsi
+++ b/dts/arm/nordic/nrf52805.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -97,12 +97,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index 0da4d7ccf94..0155485509e 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,12 +101,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 8e65445cf5f..e22ce7b0742 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -113,12 +113,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
index 82bdcb58934..f7ec2b926f6 100644
--- a/dts/arm/nordic/nrf52820.dtsi
+++ b/dts/arm/nordic/nrf52820.dtsi
@@ -11,7 +11,7 @@
 / {
 
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,12 +115,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK another Bluetooth controller
-			 * is added and set as the default.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index 7e2dae5faff..693116c2ffd 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -101,12 +101,13 @@
 			status = "okay";
 			ble-2mbps-supported;
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index 93fac4a04b8..2a240db0a44 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -11,7 +11,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -115,12 +115,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index 9624ae12dfb..eab9c8454ee 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -7,8 +7,8 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
-		zephyr,entropy = &rng;
+		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -103,12 +103,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
@@ -563,7 +564,7 @@
 			reg = <0x5002a000 0x1000>, <0x5002b000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "disabled";
+			status = "okay";
 		};
 	};
 };
diff --git a/dts/arm/nordic/nrf5340_cpuapp.dtsi b/dts/arm/nordic/nrf5340_cpuapp.dtsi
index c02f939a7fa..ec59f40ab9c 100644
--- a/dts/arm/nordic/nrf5340_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf5340_cpuapp.dtsi
@@ -34,7 +34,7 @@
 	};
 
 	chosen {
-		zephyr,entropy = &rng_hci;
+		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -103,7 +103,7 @@
 			reg = <0x50844000 0x1000>, <0x50845000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <68 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "disabled";
+			status = "okay";
 		};
 	};
 
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index acf95077669..d33b4080deb 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -9,7 +9,7 @@
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -102,12 +102,13 @@
 				status = "disabled";
 			};
 
-			/* Note: In the nRF Connect SDK the SoftDevice Controller
-			 * is added and set as the default Bluetooth Controller.
-			 */
+			bt_hci_sdc: bt_hci_sdc {
+				compatible = "nordic,bt-hci-sdc";
+				status = "okay";
+			};
 			bt_hci_controller: bt_hci_controller {
 				compatible = "zephyr,bt-hci-ll-sw-split";
-				status = "okay";
+				status = "disabled";
 			};
 		};
 
diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index 2d2fdee8d27..e8ff2dac3a4 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -23,6 +23,10 @@ wdt011: &cpurad_wdt011 {};
 /delete-node/ &cpuflpr;
 
 / {
+	chosen {
+		zephyr,bt-hci = &bt_hci_sdc;
+	};
+
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpurad_nvic>;
@@ -99,3 +103,7 @@ wdt011: &cpurad_wdt011 {};
 &dppic020 {
 	status = "okay";
 };
+
+&bt_hci_sdc {
+	status = "okay";
+};
diff --git a/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi
index fc359cdb0ac..6c7f34d3b21 100644
--- a/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l09_enga_cpuapp.dtsi
@@ -17,7 +17,8 @@ nvic: &cpuapp_nvic {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
+		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,entropy = &prng;
 	};
 
 	soc {
@@ -30,9 +31,14 @@ nvic: &cpuapp_nvic {};
 		compatible = "zephyr,psa-crypto-rng";
 		status = "disabled";
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
index 2df3fc59676..5c7e5db3001 100644
--- a/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l20_enga_cpuapp.dtsi
@@ -16,6 +16,10 @@ nvic: &cpuapp_nvic {};
 /delete-node/ &cpuflpr_clic;
 
 / {
+	chosen {
+		zephyr,entropy = &prng;
+	};
+
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpuapp_nvic>;
@@ -26,6 +30,11 @@ nvic: &cpuapp_nvic {};
 		compatible = "zephyr,psa-crypto-rng";
 		status = "disabled";
 	};
+
+	prng: prng {
+		compatible = "nordic,entropy-prng";
+		status = "okay";
+	};
 };
 
 &cpuflpr_vpr {
diff --git a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
index 3f1fe655b6e..80875058f5f 100644
--- a/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
+++ b/dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi
@@ -15,8 +15,8 @@ nvic: &cpuapp_nvic {};
 
 / {
 	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
-		zephyr,entropy = &rng;
+		zephyr,bt-hci = &bt_hci_sdc;
+		zephyr,entropy = &psa_rng;
 	};
 
 	soc {
@@ -32,11 +32,11 @@ nvic: &cpuapp_nvic {};
 
 	psa_rng: psa-rng {
 		compatible = "zephyr,psa-crypto-rng";
-		status = "disabled";
+		status = "okay";
 	};
 };
 
-&bt_hci_controller {
+&bt_hci_sdc {
 	status = "okay";
 };
 
diff --git a/dts/arm/nordic/nrf91.dtsi b/dts/arm/nordic/nrf91.dtsi
index 9a64ed92229..5e65519929e 100644
--- a/dts/arm/nordic/nrf91.dtsi
+++ b/dts/arm/nordic/nrf91.dtsi
@@ -28,6 +28,7 @@
 	};
 
 	chosen {
+		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -51,7 +52,7 @@
 			reg = <0x50840000 0x1000>, <0x50841000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <64 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "disabled";
+			status = "okay";
 		};
 
 		ctrlap: ctrlap@50006000 {
diff --git a/dts/bindings/clock/nordic,nrf-fll16m.yaml b/dts/bindings/clock/nordic,nrf-fll16m.yaml
index eca813fbdbc..8c7187965ae 100644
--- a/dts/bindings/clock/nordic,nrf-fll16m.yaml
+++ b/dts/bindings/clock/nordic,nrf-fll16m.yaml
@@ -18,7 +18,6 @@ description: |
 
     fll16m {
             open-loop-accuracy-ppm = <20000>;
-            closed-loop-base-accuracy-ppm = <5000>;
             clocks = <&hfxo>, <&lfxo>;
             clock-names = "hfxo", "lfxo";
     };
@@ -34,9 +33,3 @@ properties:
   open-loop-accuracy-ppm:
     type: int
     description: Clock accuracy in parts per million if open-loop clock source is used.
-
-  closed-loop-base-accuracy-ppm:
-    type: int
-    description: |
-      Base clock accuracy in parts per million if closed-loop clock source is used.
-      The actual accuracy is this property plus the accuracy of the HFXO or LFXO.
diff --git a/dts/bindings/firmware/nordic,ironside-call.yaml b/dts/bindings/firmware/nordic,ironside-call.yaml
new file mode 100644
index 00000000000..14f39cb0b74
--- /dev/null
+++ b/dts/bindings/firmware/nordic,ironside-call.yaml
@@ -0,0 +1,22 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: IPC configuration for Nordic IRONside calls
+
+compatible: "nordic,ironside-call"
+
+include: base.yaml
+
+properties:
+  memory-region:
+    type: phandle
+    required: true
+    description: phandle to shared memory region
+
+  mboxes:
+    required: true
+    description: MBOX channel specifiers (TX and RX are required)
+
+  mbox-names:
+    required: true
+    description: MBOX channel names (must be called "tx" and "rx")
diff --git a/dts/bindings/i2s/nordic,nrf-tdm.yaml b/dts/bindings/i2s/nordic,nrf-tdm.yaml
new file mode 100644
index 00000000000..82f51147848
--- /dev/null
+++ b/dts/bindings/i2s/nordic,nrf-tdm.yaml
@@ -0,0 +1,48 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic TDM (Time division multiplexed audio interface)
+
+compatible: "nordic,nrf-tdm"
+
+include: [i2s-controller.yaml, pinctrl-device.yaml, nordic-clockpin.yaml, "memory-region.yaml"]
+
+properties:
+  reg:
+    required: true
+
+  interrupts:
+    required: true
+
+  mck-frequency:
+    type: int
+    description: |
+      Frequency of the MCK clock. Configured independently of SCK.
+
+  pinctrl-0:
+    required: true
+
+  pinctrl-names:
+    required: true
+
+  easydma-maxcnt-bits:
+    type: int
+    required: true
+    description: |
+      Maximum number of bits available in the EasyDMA MAXCNT register. This
+      property must be set at SoC level DTS files.
+
+  clock-source:
+    type: string
+    default: "PCLK"
+    description: |
+      Clock source to be used by the TDM peripheral. The following options
+      are available:
+      - "PCLK": Peripheral clock
+      - "ACLK": Audio PLL clock with configurable frequency (frequency for
+        this clock must be set via the "hfclkaudio-frequency" property
+        in the "nordic,nrf-clock" node); this clock source is only available
+        in the nRF53 Series SoCs and it requires the use of HFXO
+    enum:
+      - "PCLK"
+      - "ACLK"
diff --git a/dts/bindings/misc/nordic,nrf-dppic-local.yaml b/dts/bindings/misc/nordic,nrf-dppic-local.yaml
index 41029bb3062..a96b5a994c9 100644
--- a/dts/bindings/misc/nordic,nrf-dppic-local.yaml
+++ b/dts/bindings/misc/nordic,nrf-dppic-local.yaml
@@ -11,3 +11,9 @@ description: |
 compatible: "nordic,nrf-dppic-local"
 
 include: ["nordic,nrf-dppic.yaml", "nordic,nrf-dppic-links.yaml"]
+
+properties:
+  channels:
+    type: int
+    required: true
+    description: Number of channels implemented by the DPPIC instance.
diff --git a/dts/bindings/net/wireless/nordic,nrf21540-fem.yaml b/dts/bindings/net/wireless/nordic,nrf21540-fem.yaml
index aedd22bcf79..98e798e7d53 100644
--- a/dts/bindings/net/wireless/nordic,nrf21540-fem.yaml
+++ b/dts/bindings/net/wireless/nordic,nrf21540-fem.yaml
@@ -95,13 +95,16 @@ properties:
         This must be present to support SPI control of the FEM.
   tx-en-settle-time-us:
     type: int
-    default: 11
+    default: 26
     description: |
         Settling time in microseconds from state PG to TX.
 
-        Default value is based on Table 6 of the nRF21540 Product
-        Specification (v1.0), and can be overridden for tuned
-        configurations.
+        Default value of 11 microseconds is based on Table 6 of the nRF21540
+        Product Specification (v1.0). However the FEM must be ready when
+        the RF power starts to rise at the output of the SoC. That's why
+        the default value is increased by the time needed by the RF power
+        to rise at the output of the nRF5 SoCs.
+        This time can be overridden for tuned configurations.
   rx-en-settle-time-us:
     type: int
     default: 11
diff --git a/dts/bindings/rng/nordic,nrf-prng.yaml b/dts/bindings/rng/nordic,nrf-prng.yaml
new file mode 100644
index 00000000000..8936393a0b6
--- /dev/null
+++ b/dts/bindings/rng/nordic,nrf-prng.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+description: This is a super simple PRNG
+
+compatible: "nordic,entropy-prng"
+
+include: base.yaml
diff --git a/dts/bindings/spi/nordic,nrf-exmif-spi.yaml b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
new file mode 100644
index 00000000000..d988b414687
--- /dev/null
+++ b/dts/bindings/spi/nordic,nrf-exmif-spi.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+description: Nordic External Memory Interface (EXMIF) used in SPI mode only
+
+compatible: "nordic,nrf-exmif-spi"
+
+include: snps,designware-spi.yaml
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 8339a67229c..8b7762f07e6 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -177,7 +177,6 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(16)>;
 			open-loop-accuracy-ppm = <20000>;
-			closed-loop-base-accuracy-ppm = <5000>;
 			clocks = <&hfxo>, <&lfxo>;
 			clock-names = "hfxo", "lfxo";
 		};
@@ -367,6 +366,7 @@
 			dppic020: dppic@22000 {
 				compatible = "nordic,nrf-dppic-local";
 				reg = <0x22000 0x1000>;
+				channels = <32>;
 				status = "disabled";
 			};
 
@@ -446,6 +446,15 @@
 					compatible = "nordic,nrf-ieee802154";
 					status = "disabled";
 				};
+
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
+				bt_hci_controller: bt_hci_controller {
+					compatible = "zephyr,bt-hci-ll-sw-split";
+					status = "disabled";
+				};
 			};
 
 			ccm030: ccm@3a000 {
@@ -1498,6 +1507,34 @@
 				endtx-stoptx-supported;
 				frame-timeout-supported;
 			};
+
+			tdm130: tdm@992000 {
+				compatible = "nordic,nrf-tdm";
+				easydma-maxcnt-bits = <15>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x992000 0x1000>;
+				interrupts = <402 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
+				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
+							 <NRF_FUN_TDM_MCK>;
+			};
+
+			tdm131: tdm@997000 {
+				compatible = "nordic,nrf-tdm";
+				easydma-maxcnt-bits = <15>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x997000 0x1000>;
+				interrupts = <407 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				clocks = <&fll16m>;
+				power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>;
+				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
+							 <NRF_FUN_TDM_MCK>;
+			};
 		};
 	};
 
diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/common/nordic/nrf54l09.dtsi
index 56ca96dad5f..ac780378837 100644
--- a/dts/common/nordic/nrf54l09.dtsi
+++ b/dts/common/nordic/nrf54l09.dtsi
@@ -219,9 +219,11 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
+
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
index 8b0dbb8d253..0d83025bf7b 100644
--- a/dts/common/nordic/nrf54l20.dtsi
+++ b/dts/common/nordic/nrf54l20.dtsi
@@ -54,6 +54,12 @@
 			clock-frequency = <DT_FREQ_M(16)>;
 		};
 
+		pclk32m: pclk32m {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(32)>;
+		};
+
 		lfxo: lfxo {
 			compatible = "nordic,nrf-lfxo";
 			#clock-cells = <0>;
@@ -71,6 +77,12 @@
 			#clock-cells = <0>;
 			clock-frequency = <DT_FREQ_M(128)>;
 		};
+
+		aclk: aclk {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <DT_FREQ_M(24)>;
+		};
 	};
 
 	soc {
@@ -247,9 +259,10 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
@@ -556,6 +569,19 @@
 				status = "disabled";
 			};
 
+			tdm: tdm@e8000 {
+				compatible = "nordic,nrf-tdm";
+				easydma-maxcnt-bits = <15>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xe8000 0x1000>;
+				interrupts = <232 NRF_DEFAULT_IRQ_PRIORITY>;
+				status = "disabled";
+				clocks = <&pclk32m>;
+				nordic,clockpin-enable = <NRF_FUN_TDM_SCK_M>,
+							 <NRF_FUN_TDM_MCK>;
+			};
+
 			i2c23: i2c@ed000 {
 				compatible = "nordic,nrf-twim";
 				#address-cells = <1>;
diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
index f59f49f326a..6ea1a1f2976 100644
--- a/dts/common/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -248,9 +248,11 @@
 					status = "disabled";
 				};
 
-				/* Note: In the nRF Connect SDK the SoftDevice Controller
-				 * is added and set as the default Bluetooth Controller.
-				 */
+				bt_hci_sdc: bt_hci_sdc {
+					compatible = "nordic,bt-hci-sdc";
+					status = "disabled";
+				};
+
 				bt_hci_controller: bt_hci_controller {
 					compatible = "zephyr,bt-hci-ll-sw-split";
 					status = "disabled";
diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi
index d7c20e855c1..06e0a3a1514 100644
--- a/dts/common/nordic/nrf9280.dtsi
+++ b/dts/common/nordic/nrf9280.dtsi
@@ -250,6 +250,7 @@
 			dppic020: dppic@22000 {
 				compatible = "nordic,nrf-dppic-local";
 				reg = <0x22000 0x1000>;
+				channels = <32>;
 				status = "disabled";
 			};
 
diff --git a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
index ff11d499bd0..7edfc1b7e41 100644
--- a/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
+++ b/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
@@ -34,6 +34,39 @@
 #define ROMSTART_REGION ROMABLE_REGION
 #endif
 
+#if USE_PARTITION_MANAGER
+
+#include <pm_config.h>
+
+#if CONFIG_NCS_IS_VARIANT_IMAGE && defined(PM_S0_ID)
+/* We are linking against S1, create symbol containing the flash ID of S0.
+ * This is used when writing code operating on the "other" slot.
+ */
+_image_1_primary_slot_id = PM_S0_ID;
+
+#else /* ! CONFIG_NCS_IS_VARIANT_IMAGE */
+
+#ifdef PM_S1_ID
+/* We are linking against S0, create symbol containing the flash ID of S1.
+ * This is used when writing code operating on the "other" slot.
+ */
+_image_1_primary_slot_id = PM_S1_ID;
+#endif /* PM_S1_ID */
+
+#endif /* CONFIG_NCS_IS_VARIANT_IMAGE */
+
+#define ROM_ADDR PM_ADDRESS
+#define ROM_SIZE PM_SIZE
+
+#if defined(CONFIG_PM_USE_CONFIG_SRAM_SIZE)
+#define RAM_SIZE CONFIG_PM_SRAM_SIZE
+#else
+#define RAM_SIZE PM_SRAM_SIZE
+#endif
+#define RAM_ADDR PM_SRAM_ADDRESS
+
+#else /* ! USE_PARTITION_MANAGER */
+
 #if !defined(CONFIG_XIP) && (CONFIG_FLASH_SIZE == 0)
 #define ROM_ADDR RAM_ADDR
 #else
@@ -55,6 +88,23 @@
 #define RAM_SIZE (CONFIG_SRAM_SIZE * 1K)
 #define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
 
+#endif /* USE_PARTITION_MANAGER */
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay)
+#define CCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_ccm))
+#define CCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_ccm))
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay)
+#define ITCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_itcm))
+#define ITCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_itcm))
+#endif
+
+#if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
+#define DTCM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_dtcm))
+#define DTCM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_dtcm))
+#endif
+
 #if defined(CONFIG_CUSTOM_SECTION_ALIGN)
 _region_min_align = CONFIG_CUSTOM_SECTION_MIN_ALIGN_SIZE;
 #else
diff --git a/include/zephyr/arch/common/sys_bitops.h b/include/zephyr/arch/common/sys_bitops.h
index 22bcfd56ca8..76f1fd88071 100644
--- a/include/zephyr/arch/common/sys_bitops.h
+++ b/include/zephyr/arch/common/sys_bitops.h
@@ -25,21 +25,21 @@ static ALWAYS_INLINE void sys_set_bit(mem_addr_t addr, unsigned int bit)
 {
 	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile uint32_t *)addr = temp | (1 << bit);
+	*(volatile uint32_t *)addr = temp | (1U << bit);
 }
 
 static ALWAYS_INLINE void sys_clear_bit(mem_addr_t addr, unsigned int bit)
 {
 	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile uint32_t *)addr = temp & ~(1 << bit);
+	*(volatile uint32_t *)addr = temp & ~(1U << bit);
 }
 
 static ALWAYS_INLINE int sys_test_bit(mem_addr_t addr, unsigned int bit)
 {
 	uint32_t temp = *(volatile uint32_t *)addr;
 
-	return temp & (1 << bit);
+	return temp & (1U << bit);
 }
 
 static ALWAYS_INLINE void sys_set_bits(mem_addr_t addr, unsigned int mask)
@@ -62,19 +62,19 @@ static ALWAYS_INLINE
 	/* Doing memory offsets in terms of 32-bit values to prevent
 	 * alignment issues
 	 */
-	sys_set_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
+	sys_set_bit(addr + ((bit >> 5) << 2U), bit & 0x1F);
 }
 
 static ALWAYS_INLINE
 	void sys_bitfield_clear_bit(mem_addr_t addr, unsigned int bit)
 {
-	sys_clear_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
+	sys_clear_bit(addr + ((bit >> 5U) << 2U), bit & 0x1F);
 }
 
 static ALWAYS_INLINE
 	int sys_bitfield_test_bit(mem_addr_t addr, unsigned int bit)
 {
-	return sys_test_bit(addr + ((bit >> 5) << 2), bit & 0x1F);
+	return sys_test_bit(addr + ((bit >> 5U) << 2U), bit & 0x1F);
 }
 
 static ALWAYS_INLINE
diff --git a/include/zephyr/drivers/firmware/nrf_ironside/call.h b/include/zephyr/drivers/firmware/nrf_ironside/call.h
new file mode 100644
index 00000000000..178b9371cdb
--- /dev/null
+++ b/include/zephyr/drivers/firmware/nrf_ironside/call.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CALL_H_
+#define ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CALL_H_
+
+#include <stdint.h>
+
+/** @brief Maximum number of arguments to an IRONside call.
+ *
+ * This is chosen so that the containing message buffer size is minimal but
+ * cache line aligned.
+ */
+#define NRF_IRONSIDE_CALL_NUM_ARGS 7
+
+/** @brief Message buffer. */
+struct ironside_call_buf {
+	/** Status code. This is set by the API. */
+	uint16_t status;
+	/** Operation identifier. This is set by the user. */
+	uint16_t id;
+	/** Operation arguments. These are set by the user. */
+	uint32_t args[NRF_IRONSIDE_CALL_NUM_ARGS];
+};
+
+/**
+ * @name Message buffer status codes.
+ * @{
+ */
+
+/** Buffer is idle and available for allocation. */
+#define IRONSIDE_CALL_STATUS_IDLE                   0
+/** Request was processed successfully by the server. */
+#define IRONSIDE_CALL_STATUS_RSP_SUCCESS            1
+/** Request status code is unknown. */
+#define IRONSIDE_CALL_STATUS_RSP_ERR_UNKNOWN_STATUS 2
+/** Request status code is no longer supported. */
+#define IRONSIDE_CALL_STATUS_RSP_ERR_EXPIRED_STATUS 3
+/** Operation identifier is unknown. */
+#define IRONSIDE_CALL_STATUS_RSP_ERR_UNKNOWN_ID     4
+/** Operation identifier is no longer supported. */
+#define IRONSIDE_CALL_STATUS_RSP_ERR_EXPIRED_ID     5
+/** Buffer contains a request from the client. */
+#define IRONSIDE_CALL_STATUS_REQ                    6
+
+/**
+ * @}
+ */
+
+/**
+ * @brief Allocate memory for an IRONside call.
+ *
+ * This function will block when no buffers are available, until one is
+ * released by another thread on the client side.
+ *
+ * @return Pointer to the allocated buffer.
+ */
+struct ironside_call_buf *ironside_call_alloc(void);
+
+/**
+ * @brief Dispatch an IRONside call.
+ *
+ * This function will block until a response is received from the server.
+ *
+ * @param buf Buffer returned by ironside_call_alloc(). It should be populated
+ *            with request data before calling this function. Upon returning,
+ *            this data will have been replaced by response data.
+ */
+void ironside_call_dispatch(struct ironside_call_buf *buf);
+
+/**
+ * @brief Release an IRONside call buffer.
+ *
+ * This function must be called after processing the response.
+ *
+ * @param buf Buffer used to perform the call.
+ */
+void ironside_call_release(struct ironside_call_buf *buf);
+
+#endif /* ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CALL_H_ */
diff --git a/include/zephyr/drivers/firmware/nrf_ironside/cpuconf.h b/include/zephyr/drivers/firmware/nrf_ironside/cpuconf.h
new file mode 100644
index 00000000000..c0b19e1d3f4
--- /dev/null
+++ b/include/zephyr/drivers/firmware/nrf_ironside/cpuconf.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CPUCONF_H_
+#define ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CPUCONF_H_
+
+#include <zephyr/drivers/firmware/nrf_ironside/call.h>
+
+#include <zephyr/toolchain/common.h>
+
+/**
+ * @name CPUCONF service error codes.
+ * @{
+ */
+
+#define IRONSIDE_CPUCONF_ERROR_WRONG_CPU                0x5eb2
+#define IRONSIDE_CPUCONF_ERROR_MEM_ACCESS_NOT_PERMITTED 0x5eb1
+
+/**
+ * @}
+ */
+
+#define IRONSIDE_CALL_ID_CPUCONF_V0 2
+
+enum {
+	IRONSIDE_CPUCONF_SERVICE_CPU_IDX,
+	IRONSIDE_CPUCONF_SERVICE_VECTOR_TABLE_IDX,
+	IRONSIDE_CPUCONF_SERVICE_CPU_WAIT_IDX,
+	IRONSIDE_CPUCONF_SERVICE_MSG_IDX,
+	IRONSIDE_CPUCONF_SERVICE_MSG_SIZE_IDX,
+	/* The last enum value is reserved for the number of arguments */
+	IRONSIDE_CPUCONF_NUM_ARGS
+};
+
+/* IDX 0 is re-used by the error return code and the 'cpu' parameter. */
+#define IRONSIDE_CPUCONF_SERVICE_RETCODE_IDX 0
+
+BUILD_ASSERT(IRONSIDE_CPUCONF_NUM_ARGS <= NRF_IRONSIDE_CALL_NUM_ARGS);
+
+/**
+ * @brief Boot a local domain CPU
+ *
+ * @param cpu The CPU to be booted
+ * @param vector_table Pointer to the vector table used to boot the CPU.
+ * @param cpu_wait When this is true, the CPU will WAIT even if the CPU has clock.
+ * @param msg A message that can be placed in radiocore's boot report.
+ * @param msg_size Size of the message in bytes.
+ *
+ * @note cpu_wait is only intended to be enabled for debug purposes
+ * and it is only supported that a debugger resumes the CPU.
+ *
+ * @retval 0 on success or if the CPU has already booted.
+ * @retval Positive non-0 error status if reported by IRONside call.
+ * @retval -IRONSIDE_CPUCONF_ERROR_WRONG_CPU if cpu is unrecognized
+ * @retval -IRONSIDE_CPUCONF_ERROR_MEM_ACCESS_NOT_PERMITTED
+ * if the CPU does not have read access configured for the vector_table address
+ */
+int ironside_cpuconf(NRF_PROCESSORID_Type cpu, void *vector_table, bool cpu_wait, uint8_t *msg,
+		     size_t msg_size);
+
+#endif /* ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CPUCONF_H_ */
diff --git a/include/zephyr/drivers/firmware/nrf_ironside/update.h b/include/zephyr/drivers/firmware/nrf_ironside/update.h
new file mode 100644
index 00000000000..62191b3285b
--- /dev/null
+++ b/include/zephyr/drivers/firmware/nrf_ironside/update.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_UPDATE_H_
+#define ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_UPDATE_H_
+
+#include <stdint.h>
+#include <stddef.h>
+
+/**
+ * @name Update service error codes.
+ * @{
+ */
+
+/** Caller does not have access to the provided update candidate buffer. */
+#define IRONSIDE_UPDATE_ERROR_NOT_PERMITTED     (1)
+/** Failed to write the update metadata to SICR. */
+#define IRONSIDE_UPDATE_ERROR_SICR_WRITE_FAILED (2)
+
+/**
+ * @}
+ */
+
+/** Length of the update manifest in bytes */
+#define IRONSIDE_UPDATE_MANIFEST_LENGTH  (256)
+/** Length of the update public key in bytes. */
+#define IRONSIDE_UPDATE_PUBKEY_LENGTH    (32)
+/** Length of the update signature in bytes. */
+#define IRONSIDE_UPDATE_SIGNATURE_LENGTH (64)
+
+/* IRONside call identifiers with implicit versions.
+ *
+ * With the initial "version 0", the service ABI is allowed to break until the
+ * first production release of IRONside SE.
+ */
+#define IRONSIDE_CALL_ID_UPDATE_SERVICE_V0 1
+
+/* Index of the update blob pointer within the service buffer. */
+#define IRONSIDE_UPDATE_SERVICE_UPDATE_PTR_IDX (0)
+/* Index of the return code within the service buffer. */
+#define IRONSIDE_UPDATE_SERVICE_RETCODE_IDX (0)
+
+/**
+ * @brief IRONside update blob.
+ */
+struct ironside_update_blob {
+	uint8_t manifest[IRONSIDE_UPDATE_MANIFEST_LENGTH];
+	uint8_t pubkey[IRONSIDE_UPDATE_PUBKEY_LENGTH];
+	uint8_t signature[IRONSIDE_UPDATE_SIGNATURE_LENGTH];
+	uint32_t firmware[];
+};
+
+/**
+ * @brief Request a firmware upgrade of the IRONside SE.
+ *
+ * This invokes the IRONside SE update service. The device must be restarted for the update
+ * to be installed. Check the update status in the application boot report to see if the update
+ * was successfully installed.
+ *
+ * @param update Pointer to update blob
+ *
+ * @retval -IRONSIDE_UPDATE_ERROR_NOT_PERMITTED if missing access to the update candidate.
+ * @retval -IRONSIDE_UPDATE_ERROR_SICR_WRITE_FAILED if writing update parameters to SICR failed.
+ * @returns Positive non-0 error status if reported by IRONside call.
+ * @returns 0 on a successful request (although the update itself may still fail).
+ *
+ */
+int ironside_update(const struct ironside_update_blob *update);
+
+#endif /* ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_UPDATE_H_ */
diff --git a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
index 7d75f0d7109..088cfce648b 100644
--- a/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
+++ b/include/zephyr/dt-bindings/pinctrl/nrf-pinctrl.h
@@ -172,6 +172,76 @@
 #define NRF_FUN_GRTC_CLKOUT_FAST 55U
 /** GRTC slow clock output */
 #define NRF_FUN_GRTC_CLKOUT_32K  56U
+/** SDP_MSPI clock pin */
+#define NRF_FUN_SDP_MSPI_SCK 57U
+/** SDP_MSPI data pin 0 */
+#define NRF_FUN_SDP_MSPI_DQ0 58U
+/** SDP_MSPI data pin 1 */
+#define NRF_FUN_SDP_MSPI_DQ1 59U
+/** SDP_MSPI data pin 2 */
+#define NRF_FUN_SDP_MSPI_DQ2 60U
+/** SDP_MSPI data pin 3 */
+#define NRF_FUN_SDP_MSPI_DQ3 61U
+/** SDP_MSPI data pin 4 */
+#define NRF_FUN_SDP_MSPI_DQ4 62U
+/** SDP_MSPI data pin 5 */
+#define NRF_FUN_SDP_MSPI_DQ5 63U
+/** SDP_MSPI data pin 6 */
+#define NRF_FUN_SDP_MSPI_DQ6 64U
+/** SDP_MSPI data pin 7 */
+#define NRF_FUN_SDP_MSPI_DQ7 65U
+/** SDP_MSPI chip select 0 */
+#define NRF_FUN_SDP_MSPI_CS0 66U
+/** SDP_MSPI chip select 1 */
+#define NRF_FUN_SDP_MSPI_CS1 67U
+/** SDP_MSPI chip select 2 */
+#define NRF_FUN_SDP_MSPI_CS2 68U
+/** SDP_MSPI chip select 3 */
+#define NRF_FUN_SDP_MSPI_CS3 69U
+/** SDP_MSPI chip select 4 */
+#define NRF_FUN_SDP_MSPI_CS4 70U
+/** High-Performance Framework MSPI clock pin */
+#define NRF_FUN_HPF_MSPI_SCK NRF_FUN_SDP_MSPI_SCK
+/** High-Performance Framework MSPI data pin 0 */
+#define NRF_FUN_HPF_MSPI_DQ0 NRF_FUN_SDP_MSPI_DQ0
+/** High-Performance Framework MSPI data pin 1 */
+#define NRF_FUN_HPF_MSPI_DQ1 NRF_FUN_SDP_MSPI_DQ1
+/** High-Performance Framework MSPI data pin 2 */
+#define NRF_FUN_HPF_MSPI_DQ2 NRF_FUN_SDP_MSPI_DQ2
+/** High-Performance Framework MSPI data pin 3 */
+#define NRF_FUN_HPF_MSPI_DQ3 NRF_FUN_SDP_MSPI_DQ3
+/** High-Performance Framework MSPI data pin 4 */
+#define NRF_FUN_HPF_MSPI_DQ4 NRF_FUN_SDP_MSPI_DQ4
+/** High-Performance Framework MSPI data pin 5 */
+#define NRF_FUN_HPF_MSPI_DQ5 NRF_FUN_SDP_MSPI_DQ5
+/** High-Performance Framework MSPI data pin 6 */
+#define NRF_FUN_HPF_MSPI_DQ6 NRF_FUN_SDP_MSPI_DQ6
+/** High-Performance Framework MSPI data pin 7 */
+#define NRF_FUN_HPF_MSPI_DQ7 NRF_FUN_SDP_MSPI_DQ7
+/** High-Performance Framework MSPI chip select pin 0 */
+#define NRF_FUN_HPF_MSPI_CS0 NRF_FUN_SDP_MSPI_CS0
+/** High-Performance Framework MSPI chip select pin 1 */
+#define NRF_FUN_HPF_MSPI_CS1 NRF_FUN_SDP_MSPI_CS1
+/** High-Performance Framework MSPI chip select pin 2 */
+#define NRF_FUN_HPF_MSPI_CS2 NRF_FUN_SDP_MSPI_CS2
+/** High-Performance Framework MSPI chip select pin 3 */
+#define NRF_FUN_HPF_MSPI_CS3 NRF_FUN_SDP_MSPI_CS3
+/** High-Performance Framework MSPI chip select pin 4 */
+#define NRF_FUN_HPF_MSPI_CS4 NRF_FUN_SDP_MSPI_CS4
+/** TDM SCK in master mode */
+#define NRF_FUN_TDM_SCK_M        71U
+/** TDM SCK in slave mode */
+#define NRF_FUN_TDM_SCK_S        72U
+/** TDM LRCK in master mode */
+#define NRF_FUN_TDM_FSYNC_M      73U
+/** TDM LRCK in slave mode */
+#define NRF_FUN_TDM_FSYNC_S      74U
+/** TDM SDIN */
+#define NRF_FUN_TDM_SDIN         75U
+/** TDM SDOUT */
+#define NRF_FUN_TDM_SDOUT        76U
+/** TDM MCK */
+#define NRF_FUN_TDM_MCK          77U
 
 /** @} */
 
diff --git a/include/zephyr/net/ethernet.h b/include/zephyr/net/ethernet.h
index f245fa94a38..08e4d4d8265 100644
--- a/include/zephyr/net/ethernet.h
+++ b/include/zephyr/net/ethernet.h
@@ -954,7 +954,7 @@ enum ethernet_hw_caps net_eth_get_hw_capabilities(struct net_if *iface)
 {
 	const struct device *dev = net_if_get_device(iface);
 	const struct ethernet_api *api = (struct ethernet_api *)dev->api;
-	enum ethernet_hw_caps caps = 0;
+	enum ethernet_hw_caps caps = (enum ethernet_hw_caps)0;
 #if defined(CONFIG_NET_DSA) && !defined(CONFIG_NET_DSA_DEPRECATED)
 	struct ethernet_context *eth_ctx = net_if_l2_data(iface);
 
diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index d5dce240230..b06c743201b 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -763,6 +763,9 @@ struct mqtt_sec_config {
 	uint32_t alpn_protocol_name_count;
 #endif
 
+	/** Indicates the preference for enabling TLS session caching. */
+	int session_cache;
+
 	/** Peer hostname for ceritificate verification.
 	 *  May be NULL to skip hostname verification.
 	 */
@@ -770,6 +773,9 @@ struct mqtt_sec_config {
 
 	/** Indicates the preference for copying certificates to the heap. */
 	int cert_nocopy;
+
+	/** Set socket to native TLS */
+	bool set_native_tls;
 };
 
 /** @brief MQTT transport type. */
diff --git a/include/zephyr/net/net_linkaddr.h b/include/zephyr/net/net_linkaddr.h
index 1f5825e045f..134c2057430 100644
--- a/include/zephyr/net/net_linkaddr.h
+++ b/include/zephyr/net/net_linkaddr.h
@@ -30,15 +30,11 @@ extern "C" {
  */
 
 /** Maximum length of the link address */
-#ifdef CONFIG_NET_L2_IEEE802154
-#define NET_LINK_ADDR_MAX_LENGTH 8
-#else
-#ifdef CONFIG_NET_L2_PPP
+#if defined(CONFIG_NET_L2_PHY_IEEE802154) || defined(CONFIG_NET_L2_PPP)
 #define NET_LINK_ADDR_MAX_LENGTH 8
 #else
 #define NET_LINK_ADDR_MAX_LENGTH 6
 #endif
-#endif
 
 /**
  * Type of the link address. This indicates the network technology that this
diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h
index 52ef479580d..273b2bfabaf 100644
--- a/include/zephyr/net/socket.h
+++ b/include/zephyr/net/socket.h
@@ -35,6 +35,7 @@
 #include <zephyr/sys/iterable_sections.h>
 #include <zephyr/sys/fdtable.h>
 #include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/socket_ncs.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff --git a/include/zephyr/net/socket_ncs.h b/include/zephyr/net/socket_ncs.h
new file mode 100644
index 00000000000..92a8447c47f
--- /dev/null
+++ b/include/zephyr/net/socket_ncs.h
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_
+#define ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_
+
+/**
+ * @file
+ * @brief NCS specific additions to the BSD sockets API definitions
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* When CONFIG_NET_SOCKETS_OFFLOAD is enabled, offloaded sockets take precedence
+ * when creating a new socket. Combine this flag with a socket type when
+ * creating a socket, to enforce native socket creation (e. g. SOCK_STREAM | SOCK_NATIVE).
+ * If it's desired to create a native TLS socket, but still offload the
+ * underlying TCP/UDP socket, use e. g. SOCK_STREAM | SOCK_NATIVE_TLS.
+ */
+#define SOCK_NATIVE 0x80000000
+#define SOCK_NATIVE_TLS 0x40000000
+
+/** Define a base for NCS specific socket options to prevent overlaps with Zephyr's socket options.
+ */
+#define NET_SOCKET_NCS_BASE 1000
+
+/* NCS specific TLS level socket options */
+
+/** Socket option to set DTLS handshake timeout, specifically for nRF sockets.
+ *  The option accepts an integer, indicating the total handshake timeout,
+ *  including retransmissions, in seconds.
+ *  Accepted values for the option are: 1, 3, 7, 15, 31, 63, 123.
+ */
+#define TLS_DTLS_HANDSHAKE_TIMEO (NET_SOCKET_NCS_BASE + 18)
+
+/** Socket option to save DTLS connection, specifically for nRF sockets.
+ */
+#define TLS_DTLS_CONN_SAVE (NET_SOCKET_NCS_BASE + 19)
+
+/** Socket option to load DTLS connection, specifically for nRF sockets.
+ */
+#define TLS_DTLS_CONN_LOAD (NET_SOCKET_NCS_BASE + 20)
+
+/** Socket option to get result of latest TLS/DTLS completed handshakes end status,
+ *  specifically for nRF sockets.
+ *  The option accepts an integer, indicating the setting.
+ *  Accepted vaules for the option are: 0 and 1.
+ */
+#define TLS_DTLS_HANDSHAKE_STATUS (NET_SOCKET_NCS_BASE + 21)
+
+/* Valid values for TLS_DTLS_HANDSHAKE_TIMEO option */
+#define TLS_DTLS_HANDSHAKE_TIMEO_NONE 0 /**< No timeout */
+#define TLS_DTLS_HANDSHAKE_TIMEO_1S 1 /**< 1 second */
+#define TLS_DTLS_HANDSHAKE_TIMEO_3S 3 /**< 1s + 2s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_7S 7 /**< 1s + 2s + 4s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_15S 15 /**< 1s + 2s + 4s + 8s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_31S 31 /**< 1s + 2s + 4s + 8s + 16s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_63S 63 /**< 1s + 2s + 4s + 8s + 16s + 32s */
+#define TLS_DTLS_HANDSHAKE_TIMEO_123S 123 /**< 1s + 2s + 4s + 8s + 16s + 32s + 60s */
+
+/* Valid values for TLS_DTLS_HANDSHAKE_STATUS option */
+#define TLS_DTLS_HANDSHAKE_STATUS_FULL		0
+#define TLS_DTLS_HANDSHAKE_STATUS_CACHED	1
+
+/* NCS specific socket options */
+
+/** sockopt: enable sending data as part of exceptional events */
+#define SO_EXCEPTIONAL_DATA (NET_SOCKET_NCS_BASE + 33)
+/** sockopt: Keep socket open when its PDN connection is lost
+ *           or the device is put into flight mode.
+ */
+#define SO_KEEPOPEN (NET_SOCKET_NCS_BASE + 34)
+/** sockopt: bind to PDN */
+#define SO_BINDTOPDN (NET_SOCKET_NCS_BASE + 40)
+
+/** sockopt: Release assistance indication (RAI).
+ *  The option accepts an integer, indicating the type of RAI.
+ *  Accepted values for the option are: @ref RAI_NO_DATA, @ref RAI_LAST, @ref RAI_ONE_RESP,
+ *  @ref RAI_ONGOING, @ref RAI_WAIT_MORE.
+ */
+#define SO_RAI (NET_SOCKET_NCS_BASE + 61)
+
+/** Release assistance indication (RAI).
+ *  Indicate that the application does not intend to send more data.
+ *  This applies immediately and lets the modem exit connected mode more
+ *  quickly.
+ *
+ *  @note This requires the socket to be connected.
+ */
+#define RAI_NO_DATA 1
+/** Release assistance indication (RAI).
+ *  Indicate that the application does not intend to send more data
+ *  after the next call to send() or sendto().
+ *  This lets the modem exit connected mode more quickly after sending the data.
+ */
+#define RAI_LAST 2
+/** Release assistance indication (RAI).
+ *  Indicate that the application is expecting to receive just one data packet
+ *  after the next call to send() or sendto().
+ *  This lets the modem exit connected mode more quickly after having received the data.
+ */
+#define RAI_ONE_RESP 3
+/** Release assistance indication (RAI).
+ *  Indicate that the socket is in active use by a client application.
+ *  This lets the modem stay in connected mode longer.
+ */
+#define RAI_ONGOING 4
+/** Release assistance indication (RAI).
+ *  Indicate that the socket is in active use by a server application.
+ *  This lets the modem stay in connected mode longer.
+ */
+#define RAI_WAIT_MORE 5
+
+/* NCS specific IPPROTO_ALL level socket options */
+
+/** IPv4 and IPv6 protocol level (pseudo-val) for nRF sockets. */
+#define IPPROTO_ALL 512
+/** sockopt: disable all replies to unexpected traffics */
+#define SO_SILENCE_ALL (NET_SOCKET_NCS_BASE + 30)
+
+/* NCS specific IPPROTO_IP level socket options */
+
+/** sockopt: enable IPv4 ICMP replies */
+#define SO_IP_ECHO_REPLY (NET_SOCKET_NCS_BASE + 31)
+
+/* NCS specific IPPROTO_IPV6 level socket options */
+
+/** sockopt: enable IPv6 ICMP replies */
+#define SO_IPV6_ECHO_REPLY (NET_SOCKET_NCS_BASE + 32)
+
+/** sockopt: Delay IPv6 address refresh during power saving mode  */
+#define SO_IPV6_DELAYED_ADDR_REFRESH (NET_SOCKET_NCS_BASE + 62)
+
+/* NCS specific TCP level socket options */
+
+/** sockopt: Configurable TCP server session timeout in minutes.
+ * Range is 0 to 135. 0 is no timeout and 135 is 2 h 15 min. Default is 0 (no timeout).
+ */
+#define SO_TCP_SRV_SESSTIMEO (NET_SOCKET_NCS_BASE + 55)
+
+/* NCS specific gettaddrinfo() flags */
+
+/** Assume `service` contains a Packet Data Network (PDN) ID.
+ *  When specified together with the AI_NUMERICSERV flag,
+ *  `service` shall be formatted as follows: "port:pdn_id"
+ *  where "port" is the port number and "pdn_id" is the PDN ID.
+ *  Example: "8080:1", port 8080 PDN ID 1.
+ *  Example: "42:0", port 42 PDN ID 0.
+ */
+#define AI_PDNSERV 0x1000
+
+/* NCS specific send() and sendto() flags */
+
+/** Request a blocking send operation until the request is acknowledged.
+ *  When used in send() or sendto(), the request will not return until the
+ *  send operation is completed by lower layers, or until the timeout, given by the SO_SNDTIMEO
+ *  socket option, is reached. Valid timeout values are 1 to 600 seconds.
+ */
+#define MSG_WAITACK 0x200
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_NET_SOCKET_NCS_H_ */
diff --git a/include/zephyr/settings/settings.h b/include/zephyr/settings/settings.h
index f22f1aba118..b5b89fbe199 100644
--- a/include/zephyr/settings/settings.h
+++ b/include/zephyr/settings/settings.h
@@ -45,6 +45,9 @@ extern "C" {
  */
 #define SETTINGS_EXTRA_LEN ((SETTINGS_MAX_DIR_DEPTH - 1) + 2)
 
+/* Maximum Settings name length including separators */
+#define SETTINGS_FULL_NAME_LEN SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1
+
 /**
  * Function used to read the data from the settings storage in
  * h_set handler implementations.
@@ -278,6 +281,25 @@ int settings_load(void);
  */
 int settings_load_subtree(const char *subtree);
 
+/**
+ * Load one serialized item from registered persistence sources.
+ *
+ * @param[in]  name    Name/key of the settings item.
+ * @param[out] buf     Pointer to the buffer where the data is going to be loaded
+ * @param[in]  buf_len Length of the allocated buffer.
+ * @return     actual size of value that corresponds to name on success, negative
+ *             value on failure.
+ */
+ssize_t settings_load_one(const char *name, void *buf, size_t buf_len);
+
+/**
+ * Get the data length of the value relative to the key
+ *
+ * @param[in] key Name/key of the settings item.
+ * @return length of value if item exists, 0 if not and negative value on failure.
+ */
+ssize_t settings_get_val_len(const char *key);
+
 /**
  * Callback function used for direct loading.
  * Used by @ref settings_load_subtree_direct function.
@@ -457,6 +479,26 @@ struct settings_store_itf {
 	 * load callback only on the final entity.
 	 */
 
+	ssize_t (*csi_load_one)(struct settings_store *cs, const char *name,
+				char *buf, size_t buf_len);
+	/**< Loads one value from storage that corresponds to the key defined by name.
+	 *
+	 * Parameters:
+	 *  - cs - Corresponding backend handler node.
+	 *  - name - Key in string format.
+	 *  - buf - Buffer where data should be copied.
+	 *  - buf_len - Length of buf.
+	 */
+
+	ssize_t (*csi_get_val_len)(struct settings_store *cs, const char *name);
+	/**< Gets the value's length associated to the Key defined by name.
+	 * It returns 0 if the Key/Value doesn't exist.
+	 *
+	 * Parameters:
+	 *  - cs - Corresponding backend handler node.
+	 *  - name - Key in string format.
+	 */
+
 	int (*csi_save_start)(struct settings_store *cs);
 	/**< Handler called before an export operation.
 	 *
diff --git a/include/zephyr/storage/flash_map.h b/include/zephyr/storage/flash_map.h
index d8ba414abd3..f62f1c21718 100644
--- a/include/zephyr/storage/flash_map.h
+++ b/include/zephyr/storage/flash_map.h
@@ -348,6 +348,10 @@ const char *flash_area_label(const struct flash_area *fa);
  */
 uint8_t flash_area_erased_val(const struct flash_area *fa);
 
+#if USE_PARTITION_MANAGER
+#include <flash_map_pm.h>
+#else
+
 /**
  * Returns non-0 value if fixed-partition of given DTS node label exists.
  *
@@ -469,6 +473,8 @@ DT_FOREACH_STATUS_OKAY(fixed_partitions, FOR_EACH_PARTITION_TABLE)
 #undef FOR_EACH_PARTITION_TABLE
 /** @endcond */
 
+#endif /* USE_PARTITION_MANAGER */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/kernel/Kconfig b/kernel/Kconfig
index 08ada92f866..f3f83a9e93e 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -457,6 +457,7 @@ config SKIP_BSS_CLEAR
 config BOOT_BANNER
 	bool "Boot banner"
 	default y
+	depends on !NCS_BOOT_BANNER
 	select PRINTK
 	select EARLY_CONSOLE
 	help
diff --git a/kernel/banner.c b/kernel/banner.c
index 5cadda0a5e9..a16784cb975 100644
--- a/kernel/banner.c
+++ b/kernel/banner.c
@@ -24,7 +24,7 @@
 #endif /* BUILD_VERSION */
 #endif /* !BANNER_VERSION */
 
-void boot_banner(void)
+__weak void boot_banner(void)
 {
 #if defined(CONFIG_BOOT_DELAY) && (CONFIG_BOOT_DELAY > 0)
 #ifdef CONFIG_BOOT_BANNER
diff --git a/lib/heap/Kconfig b/lib/heap/Kconfig
index 0d97da3e340..9a39ab8ad73 100644
--- a/lib/heap/Kconfig
+++ b/lib/heap/Kconfig
@@ -81,7 +81,7 @@ config HEAP_LISTENER
 choice
 	prompt "Supported heap sizes"
 	depends on !64BIT
-	default SYS_HEAP_SMALL_ONLY if (SRAM_SIZE <= 256)
+	default SYS_HEAP_SMALL_ONLY if (SRAM_SIZE <= 256) && !PARTITION_MANAGER_ENABLED
 	default SYS_HEAP_AUTO
 	help
 	  Heaps using reduced-size chunk headers can accommodate so called
diff --git a/lib/libc/common/source/stdlib/malloc.c b/lib/libc/common/source/stdlib/malloc.c
index 2b01e152f00..2821ae8173a 100644
--- a/lib/libc/common/source/stdlib/malloc.c
+++ b/lib/libc/common/source/stdlib/malloc.c
@@ -25,6 +25,20 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
+#if USE_PARTITION_MANAGER
+
+#include <pm_config.h>
+
+#define RAM_SIZE PM_SRAM_SIZE
+#define RAM_ADDR PM_SRAM_ADDRESS
+
+#else /* ! USE_PARTITION_MANAGER */
+
+#define RAM_SIZE (KB((size_t) CONFIG_SRAM_SIZE))
+#define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
+
+#endif /* USE_PARTITION_MANAGER */
+
 #ifdef CONFIG_COMMON_LIBC_MALLOC
 
 #if (CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE != 0)
@@ -106,8 +120,8 @@ static POOL_SECTION unsigned char __aligned(HEAP_ALIGN) malloc_arena[HEAP_SIZE];
 extern char _heap_sentry[];
 #    define HEAP_SIZE  ROUND_DOWN((POINTER_TO_UINT(_heap_sentry) - HEAP_BASE), HEAP_ALIGN)
 #   else
-#    define HEAP_SIZE	ROUND_DOWN((KB((size_t) CONFIG_SRAM_SIZE) -	\
-		((size_t) HEAP_BASE - (size_t) CONFIG_SRAM_BASE_ADDRESS)), HEAP_ALIGN)
+#    define HEAP_SIZE	ROUND_DOWN((RAM_SIZE -	\
+		((size_t) HEAP_BASE - (size_t) RAM_ADDR)), HEAP_ALIGN)
 #   endif /* else CONFIG_XTENSA */
 
 #  endif /* else CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE > 0 */
diff --git a/lib/os/zvfs/Kconfig b/lib/os/zvfs/Kconfig
index 101e2cce086..b22d2b1f172 100644
--- a/lib/os/zvfs/Kconfig
+++ b/lib/os/zvfs/Kconfig
@@ -6,7 +6,6 @@
 menuconfig ZVFS
 	bool "Zephyr virtual filesystem (ZVFS) support [EXPERIMENTAL]"
 	select FDTABLE
-	select EXPERIMENTAL
 	help
 	  ZVFS is a central, Zephyr-native library that provides a common interoperable API for all
 	  types of file descriptors such as those from the non-virtual FS, sockets, eventfds, FILE *'s
diff --git a/lib/posix/options/cond.c b/lib/posix/options/cond.c
index d1fc231c94c..c93386ab539 100644
--- a/lib/posix/options/cond.c
+++ b/lib/posix/options/cond.c
@@ -186,7 +186,7 @@ int pthread_cond_timedwait(pthread_cond_t *cv, pthread_mutex_t *mut, const struc
 int pthread_cond_init(pthread_cond_t *cvar, const pthread_condattr_t *att)
 {
 	struct posix_cond *cv;
-	struct posix_condattr *attr = (struct posix_condattr *)attr;
+	struct posix_condattr *attr = (struct posix_condattr *)att;
 
 	*cvar = PTHREAD_COND_INITIALIZER;
 	cv = to_posix_cond(cvar);
diff --git a/modules/Kconfig.mcuboot b/modules/Kconfig.mcuboot
index 2c4dbfa930d..c7afb9a0123 100644
--- a/modules/Kconfig.mcuboot
+++ b/modules/Kconfig.mcuboot
@@ -287,6 +287,11 @@ config MCUBOOT_BOOTLOADER_NO_DOWNGRADE
 	  MCUBOOT_DOWNGRADE_PREVENTION option enabled.
 endif
 
+config MCUBOOT_BOOTLOADER_USES_SHA512
+	bool "MCUboot uses SHA512 for image hash"
+	help
+	  MCUboot has been compiled to verify images using SHA512.
+
 config MCUBOOT_APPLICATION_FIRMWARE_UPDATER
 	bool "Application is firmware updater image"
 	depends on MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER
diff --git a/modules/hal_nordic/CMakeLists.txt b/modules/hal_nordic/CMakeLists.txt
index 11c28246828..f4242b2d67b 100644
--- a/modules/hal_nordic/CMakeLists.txt
+++ b/modules/hal_nordic/CMakeLists.txt
@@ -13,6 +13,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_UICR)
 endif()
 if(DEFINED nrf_regtool_components)
   find_package(nrf-regtool 9.1.0
+    REQUIRED
     COMPONENTS ${nrf_regtool_components}
     PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
     NO_CMAKE_PATH
diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
index 1d9fa103de2..25fb1e2c038 100644
--- a/modules/hal_nordic/nrfx/Kconfig
+++ b/modules/hal_nordic/nrfx/Kconfig
@@ -694,6 +694,19 @@ config NRFX_TBM
 	bool "TBM driver"
 	depends on $(dt_nodelabel_exists,tbm)
 
+config NRFX_TDM
+	bool
+
+config NRFX_TDM130
+	bool "TDM130 driver instance"
+	depends on $(dt_nodelabel_has_compat,tdm130,$(DT_COMPAT_NORDIC_NRF_TDM))
+	select NRFX_TDM
+
+config NRFX_TDM131
+	bool "TDM131 driver instance"
+	depends on $(dt_nodelabel_has_compat,tdm131,$(DT_COMPAT_NORDIC_NRF_TDM))
+	select NRFX_TDM
+
 config NRFX_TEMP
 	bool "TEMP driver"
 	depends on $(dt_nodelabel_exists,temp)
@@ -1212,6 +1225,6 @@ endmenu
 
 config NRFX_RESERVED_RESOURCES_HEADER
 	string
-	default "nrfx_reserved_resources.h"
+	default "nrfx_config_reserved_resources_ncs.h"
 
 endmenu # "nrfx drivers"
diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
new file mode 100644
index 00000000000..28ac995c03a
--- /dev/null
+++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
@@ -0,0 +1,946 @@
+/*
+ * Copyright (c) 2024, Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef NRFX_CONFIG_RESERVED_RESOURCES_H__
+#define NRFX_CONFIG_RESERVED_RESOURCES_H__
+
+/** @brief Bitmask that defines GPIOTE130 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE130_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote130), child_owned_channels))
+
+/** @brief Bitmask that defines GPIOTE131 channels reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_GPIOTE131_CHANNELS_USED                                                               \
+	(~NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), owned_channels) |                           \
+	 NRFX_CONFIG_MASK_DT(DT_NODELABEL(gpiote131), child_owned_channels))
+
+/** @brief Bitmask that defines EGU instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_EGUS_USED 0
+
+/** @brief Bitmask that defines TIMER instances that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_TIMERS_USED 0
+
+/* If the GRTC system timer driver is to be used, prepare definitions required
+ * by the nrfx_grtc driver (NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK and
+ * NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS) based on information from devicetree.
+ */
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc)
+#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \
+	(NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \
+	 ~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels))
+#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \
+	(DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
+	 DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), child_owned_channels, 0))
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) */
+
+/*
+ * The enabled Bluetooth controller subsystem is responsible for providing
+ * definitions of the BT_CTLR_USED_* symbols used below in a file named
+ * bt_ctlr_used_resources.h and for adding its location to global include
+ * paths so that the file can be included here for all Zephyr libraries that
+ * are to be built.
+ */
+#if defined(CONFIG_BT_LL_SW_SPLIT)
+#include <bt_ctlr_used_resources.h>
+#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR   BT_CTLR_USED_PPI_GROUPS
+#endif
+#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
+
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+/* Define auxiliary symbols needed for SDC device dispatch. */
+#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
+#define NRF52_SERIES
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
+#define NRF53_SERIES
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+#define NRF54L_SERIES
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
+#define NRF54H_SERIES
+#endif
+#include <sdc_soc.h>
+#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR SDC_PPI_CHANNELS_USED_MASK
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR SDC_DPPI_CHANNELS_USED_MASK
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC10_CHANNELS_USED_MASK
+#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC00_CHANNELS_USED_MASK
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR                                                   \
+	(SDC_PPIB00_CHANNELS_USED_MASK | SDC_PPIB10_CHANNELS_USED_MASK)
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
+#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC020_CHANNELS_USED_MASK
+#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC030_CHANNELS_USED_MASK
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR                                                 \
+	(SDC_PPIB020_CHANNELS_USED_MASK | SDC_PPIB030_CHANNELS_USED_MASK)
+#else
+#error Unsupported chip family
+#endif
+#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
+
+#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
+#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
+#include <../src/nrf_802154_peripherals_nrf52.h>
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV   NRF_802154_PPI_GROUPS_USED_MASK
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
+#include <../src/nrf_802154_peripherals_nrf53.h>
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+#include <../src/nrf_802154_peripherals_nrf54l.h>
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
+#include <../src/nrf_802154_peripherals_nrf54h.h>
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV   NRF_802154_DPPI_GROUPS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#endif /* CONFIG_NRF_802154_RADIO_DRIVER */
+
+#if defined(CONFIG_MPSL)
+#include <mpsl.h>
+#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_PPI_CHANNELS_USED_MASK
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
+#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL MPSL_DPPIC_CHANNELS_USED_MASK
+#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
+#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL MPSL_DPPIC10_CHANNELS_USED_MASK
+#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL MPSL_DPPIC20_CHANNELS_USED_MASK
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL                                                      \
+	(MPSL_PPIB11_CHANNELS_USED_MASK | MPSL_PPIB21_CHANNELS_USED_MASK)
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
+#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL MPSL_DPPIC020_CHANNELS_USED_MASK
+#else
+#error Unsupported chip family
+#endif
+#endif
+
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI0_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI0_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI0_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI00_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI00_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI00_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI00_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI00_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI10_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI10_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI10_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI20_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI20_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI20_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI20_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI30_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI30_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI30_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI30_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI30_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI020_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI020_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI020_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI030_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI030_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI030_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI030_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI030_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI120_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI120_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI120_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI120_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI120_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI130_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI130_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI130_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI130_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI130_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI131_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI131_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI131_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI131_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI131_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI132_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI132_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI132_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI132_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI132_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI133_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI133_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI133_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI133_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI133_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI134_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI134_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI134_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI134_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI134_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI135_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI135_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI135_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI135_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI135_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR
+#define NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV
+#define NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_802154_DRV
+#define NRFX_DPPI136_GROUPS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_DPPI136_CHANNELS_USED_BY_MPSL
+#define NRFX_DPPI136_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_DPPI136_GROUPS_USED_BY_MPSL
+#define NRFX_DPPI136_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_BT_CTLR
+#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_802154_DRV
+#define NRFX_PPI_GROUPS_USED_BY_802154_DRV 0
+#endif
+
+#ifndef NRFX_PPI_CHANNELS_USED_BY_MPSL
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL 0
+#endif
+#ifndef NRFX_PPI_GROUPS_USED_BY_MPSL
+#define NRFX_PPI_GROUPS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV 0
+#endif
+#ifndef NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL
+#define NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL 0
+#endif
+
+#if defined(NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL)
+
+BUILD_ASSERT((NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI0_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI0_GROUPS_USED_BY_802154_DRV & NRFX_DPPI0_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI00_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI00_GROUPS_USED_BY_802154_DRV & NRFX_DPPI00_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI10_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI10_GROUPS_USED_BY_802154_DRV & NRFX_DPPI10_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI20_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI20_GROUPS_USED_BY_802154_DRV & NRFX_DPPI20_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI30_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI30_GROUPS_USED_BY_802154_DRV & NRFX_DPPI30_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI020_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI020_GROUPS_USED_BY_802154_DRV & NRFX_DPPI020_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI030_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI030_GROUPS_USED_BY_802154_DRV & NRFX_DPPI030_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI120_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI120_GROUPS_USED_BY_802154_DRV & NRFX_DPPI120_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI130_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI130_GROUPS_USED_BY_802154_DRV & NRFX_DPPI130_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI131_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI131_GROUPS_USED_BY_802154_DRV & NRFX_DPPI131_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI132_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI132_GROUPS_USED_BY_802154_DRV & NRFX_DPPI132_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI133_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI133_GROUPS_USED_BY_802154_DRV & NRFX_DPPI133_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI134_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI134_GROUPS_USED_BY_802154_DRV & NRFX_DPPI134_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI135_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI135_GROUPS_USED_BY_802154_DRV & NRFX_DPPI135_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV & NRFX_DPPI136_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_DPPI136_GROUPS_USED_BY_802154_DRV & NRFX_DPPI136_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPI_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPI_GROUPS_USED_BY_802154_DRV & NRFX_PPI_GROUPS_USED_BY_MPSL) == 0,
+	     "PPI groups used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV &
+	      NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL) == 0,
+	     "PPI channels used by the IEEE802.15.4 radio driver overlap with those "
+	     "assigned to the MPSL.");
+
+#endif /* NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL */
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_CHANNELS_USED                                                                   \
+	(NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI0_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI0_GROUPS_USED                                                                     \
+	(NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI0_GROUPS_USED_BY_802154_DRV |                \
+	 NRFX_DPPI0_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_CHANNELS_USED                                                                  \
+	(NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI00_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI00_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI00_GROUPS_USED                                                                    \
+	(NRFX_DPPI00_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI00_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI00_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_CHANNELS_USED                                                                  \
+	(NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI10_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI10_GROUPS_USED                                                                    \
+	(NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI10_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI10_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_CHANNELS_USED                                                                  \
+	(NRFX_DPPI20_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI20_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI20_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI20_GROUPS_USED                                                                    \
+	(NRFX_DPPI20_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI20_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI20_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_CHANNELS_USED                                                                  \
+	(NRFX_DPPI30_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI30_CHANNELS_USED_BY_802154_DRV |          \
+	 NRFX_DPPI30_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI30_GROUPS_USED                                                                    \
+	(NRFX_DPPI30_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI30_GROUPS_USED_BY_802154_DRV |              \
+	 NRFX_DPPI30_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_CHANNELS_USED                                                                 \
+	(NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI020_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI020_GROUPS_USED                                                                   \
+	(NRFX_DPPI020_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI020_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI020_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_CHANNELS_USED                                                                 \
+	(NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI030_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI030_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI030_GROUPS_USED                                                                   \
+	(NRFX_DPPI030_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI030_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI030_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_CHANNELS_USED                                                                 \
+	(NRFX_DPPI120_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI120_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI120_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI120_GROUPS_USED                                                                   \
+	(NRFX_DPPI120_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI120_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI120_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_CHANNELS_USED                                                                 \
+	(NRFX_DPPI130_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI130_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI130_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI130_GROUPS_USED                                                                   \
+	(NRFX_DPPI130_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI130_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI130_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_CHANNELS_USED                                                                 \
+	(NRFX_DPPI131_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI131_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI131_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI131_GROUPS_USED                                                                   \
+	(NRFX_DPPI131_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI131_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI131_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_CHANNELS_USED                                                                 \
+	(NRFX_DPPI132_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI132_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI132_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI132_GROUPS_USED                                                                   \
+	(NRFX_DPPI132_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI132_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI132_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_CHANNELS_USED                                                                 \
+	(NRFX_DPPI133_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI133_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI133_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI133_GROUPS_USED                                                                   \
+	(NRFX_DPPI133_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI133_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI133_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_CHANNELS_USED                                                                 \
+	(NRFX_DPPI134_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI134_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI134_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI134_GROUPS_USED                                                                   \
+	(NRFX_DPPI134_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI134_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI134_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_CHANNELS_USED                                                                 \
+	(NRFX_DPPI135_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI135_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI135_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI135_GROUPS_USED                                                                   \
+	(NRFX_DPPI135_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI135_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI135_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_CHANNELS_USED                                                                 \
+	(NRFX_DPPI136_CHANNELS_USED_BY_BT_CTLR | NRFX_DPPI136_CHANNELS_USED_BY_802154_DRV |        \
+	 NRFX_DPPI136_CHANNELS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines DPPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_DPPI136_GROUPS_USED                                                                   \
+	(NRFX_DPPI136_GROUPS_USED_BY_BT_CTLR | NRFX_DPPI136_GROUPS_USED_BY_802154_DRV |            \
+	 NRFX_DPPI136_GROUPS_USED_BY_MPSL)
+
+/** @brief Bitmask that defines PPI channels that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_CHANNELS_USED                                                                     \
+	(NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV |                \
+	 NRFX_PPI_CHANNELS_USED_BY_MPSL | NRFX_PPI_CHANNELS_USED_BY_SD)
+
+#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED
+#define NRFX_DPPI_GROUPS_USED   NRFX_DPPI0_GROUPS_USED
+
+/** @brief Bitmask that defines PPI groups that are reserved for use outside
+ *         of the nrfx library.
+ */
+#define NRFX_PPI_GROUPS_USED                                                                       \
+	(NRFX_PPI_GROUPS_USED_BY_BT_CTLR | NRFX_PPI_GROUPS_USED_BY_802154_DRV |                    \
+	 NRFX_PPI_GROUPS_USED_BY_MPSL | NRFX_PPI_GROUPS_USED_BY_SD)
+
+#define NRFX_PPIB_INTERCONNECT_00_10_CHANNELS_USED                                                 \
+	(NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_00_10_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_01_20_CHANNELS_USED                                                 \
+	(NRFX_PPIB_01_20_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_01_20_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_01_20_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_11_21_CHANNELS_USED                                                 \
+	(NRFX_PPIB_11_21_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_11_21_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_22_30_CHANNELS_USED                                                 \
+	(NRFX_PPIB_22_30_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_22_30_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_22_30_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_02_03_CHANNELS_USED                                                 \
+	(NRFX_PPIB_02_03_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_02_03_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_02_03_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_04_12_CHANNELS_USED                                                 \
+	(NRFX_PPIB_04_12_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_04_12_CHANNELS_USED_BY_802154_DRV |  \
+	 NRFX_PPIB_04_12_CHANNELS_USED_BY_MPSL)
+
+#define NRFX_PPIB_INTERCONNECT_020_030_CHANNELS_USED                                               \
+	(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR |                                              \
+	 NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
+
+#if defined(CONFIG_SOFTDEVICE)
+#include <nrf_sd_def.h>
+#define NRFX_PPI_CHANNELS_USED_BY_SD   SD_PPI_CHANNELS_USED
+#define NRFX_PPI_GROUPS_USED_BY_SD     SD_PPI_GROUPS_USED
+#else
+#define NRFX_PPI_CHANNELS_USED_BY_SD   0
+#define NRFX_PPI_GROUPS_USED_BY_SD     0
+#endif
+
+#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */
diff --git a/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h b/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
index e1fa4d4c321..a7f05ca372d 100644
--- a/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
+++ b/modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
@@ -34,7 +34,7 @@
  * definitions required by the interconnect/apb layer:
  * - NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
  * - NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
- * - NRFX_DPPI_PUB_OR_SUB_MASK(inst_num)
+ * - NRFX_DPPI_OWNED_MASK(inst_num)
  * - NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
  * - NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE
  * - NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE
@@ -42,6 +42,14 @@
  */
 #if	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
 	DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
+
+/* Channels masks generation. */
+#define NRFX_CONFIG_DPPI_MASK_DT(node_id) \
+	COND_CODE_1(DT_NODE_HAS_PROP(node_id, owned_channels), \
+		(NRFX_CONFIG_MASK_DT(node_id, owned_channels)), \
+		(COND_CODE_1(DT_NODE_HAS_COMPAT(node_id, nordic_nrf_dppic_local), \
+			(BIT64_MASK(DT_PROP(node_id, channels))), (0))))
+
 /* Source (publish) channels masks generation. */
 #define NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
 	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels)
@@ -50,9 +58,9 @@
 #define NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
 	NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels)
 
-#define NRFX_DPPI_PUB_OR_SUB_MASK(inst_num) \
-	UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels), \
-		DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels))
+#define NRFX_DPPI_OWNED_MASK(inst_num) \
+	UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), owned_channels), \
+		DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), channels))
 
 /* Variables names generation. */
 #define NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
@@ -62,9 +70,7 @@
 /* Variables entries generation. */
 #define NRFX_CONFIG_DPPI_CHANNELS_ENTRY(node_id) \
 	static nrfx_atomic_t NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) \
-		__attribute__((used)) = \
-		NRFX_CONFIG_MASK_DT(node_id, source_channels) | \
-		NRFX_CONFIG_MASK_DT(node_id, sink_channels);
+		__attribute__((used)) = (uint32_t)NRFX_CONFIG_DPPI_MASK_DT(node_id);
 #define NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE \
 	DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_global, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
 #define NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE \
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index a835ebad9c0..b59657dc53e 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -24,7 +24,7 @@ if WIFI_NM_WPA_SUPPLICANT
 
 config HEAP_MEM_POOL_ADD_SIZE_HOSTAP
 	def_int 66560 if WIFI_NM_HOSTAPD_AP
-	def_int 48000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	def_int 55000 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	def_int 41808 if WIFI_NM_WPA_SUPPLICANT_AP
 	# 30K is mandatory, but might need more for long duration use cases
 	def_int 30000
@@ -34,7 +34,7 @@ config WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE
 	# TODO: Providing higher stack size for Enterprise mode to fix stack
 	# overflow issues. Need to identify the cause for higher stack usage.
 	default 8192 if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-	default 5600
+	default 5800
 
 config WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE
 	int "Stack size for wpa_supplicant iface workqueue"
@@ -145,6 +145,9 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT
 	select MBEDTLS_ECDH_C
 	select MBEDTLS_ECDSA_C
 	select MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+	select MBEDTLS_RSA_C
+	select MBEDTLS_PKCS1_V15
+	select MBEDTLS_PKCS1_V21
 	select MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
 	select MBEDTLS_NIST_KW_C
 	select MBEDTLS_DHM_C
diff --git a/modules/mbedtls/CMakeLists.txt b/modules/mbedtls/CMakeLists.txt
index 61c7400017d..8801e1ecdf1 100644
--- a/modules/mbedtls/CMakeLists.txt
+++ b/modules/mbedtls/CMakeLists.txt
@@ -40,6 +40,8 @@ zephyr_interface_library_named(mbedTLS)
     # Add regular includes
     target_include_directories(mbedTLS INTERFACE
         ${ZEPHYR_CURRENT_MODULE_DIR}/include
+        ${ZEPHYR_CURRENT_MODULE_DIR}/include/library
+        ${ZEPHYR_CURRENT_MODULE_DIR}/library
         configs
         include
     )
diff --git a/modules/mbedtls/Kconfig b/modules/mbedtls/Kconfig
index bf165473f17..aa8c479e89f 100644
--- a/modules/mbedtls/Kconfig
+++ b/modules/mbedtls/Kconfig
@@ -29,6 +29,7 @@ choice MBEDTLS_IMPLEMENTATION
 
 config MBEDTLS_BUILTIN
 	bool "Use Zephyr in-tree mbedTLS version"
+	depends on ! DISABLE_MBEDTLS_BUILTIN
 	help
 	  Link with mbedTLS sources included with Zephyr distribution.
 	  Included mbedTLS version is well integrated with and supported
@@ -42,6 +43,12 @@ config MBEDTLS_LIBRARY
 
 endchoice
 
+config DISABLE_MBEDTLS_BUILTIN
+	bool
+	help
+	  Subsystems cannot deselect MBEDTLS_BUILTIN, but they can select
+	  DISABLE_MBEDTLS_BUILTIN.
+
 config CUSTOM_MBEDTLS_CFG_FILE
 	bool "Custom mbed TLS configuration file"
 	help
diff --git a/modules/mbedtls/Kconfig.mbedtls b/modules/mbedtls/Kconfig.mbedtls
index f81f91b62cc..7c08df10538 100644
--- a/modules/mbedtls/Kconfig.mbedtls
+++ b/modules/mbedtls/Kconfig.mbedtls
@@ -7,6 +7,8 @@
 menu "Mbed TLS configuration"
 	depends on MBEDTLS_BUILTIN && MBEDTLS_CFG_FILE = "config-mbedtls.h"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 menu "TLS"
 
 config MBEDTLS_TLS_VERSION_1_2
@@ -40,20 +42,25 @@ endif # MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
 
 endmenu # TLS
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 menu "Ciphersuite configuration"
 
 comment "Supported key exchange modes"
 
 config MBEDTLS_RSA_C
 	bool "RSA base support"
+	default y if UOSCORE || UEDHOC
 
 if MBEDTLS_RSA_C
 
 config MBEDTLS_PKCS1_V15
 	bool "RSA PKCS1 v1.5"
+	default y if UOSCORE || UEDHOC
 
 config MBEDTLS_PKCS1_V21
 	bool "RSA PKCS1 v2.1"
+	default y if UOSCORE || UEDHOC
 
 config MBEDTLS_GENPRIME_ENABLED
 	bool "Prime number generation code"
@@ -61,13 +68,17 @@ config MBEDTLS_GENPRIME_ENABLED
 endif # MBEDTLS_RSA_C
 
 config MBEDTLS_RSA_FULL
-	bool
-	select MBEDTLS_RSA_C
-	select MBEDTLS_PKCS1_V15
-	select MBEDTLS_PKCS1_V21
+	def_bool y
+	depends on MBEDTLS_RSA_C && MBEDTLS_PKCS1_V15 && MBEDTLS_PKCS1_V21
+
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
 
 config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
 	bool "All available ciphersuite modes"
+	select MBEDTLS_MD
+	select MBEDTLS_RSA_C
+	select MBEDTLS_PKCS1_V15
+	select MBEDTLS_PKCS1_V21
 	select MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
 	select MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
 	select MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
@@ -92,7 +103,9 @@ config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
 
 config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
 	bool "RSA-PSK based ciphersuite modes"
-	select MBEDTLS_RSA_FULL
+	depends on MBEDTLS_RSA_FULL
+
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
 
 config MBEDTLS_PSK_MAX_LEN
 	int "Max size of TLS pre-shared keys"
@@ -101,28 +114,31 @@ config MBEDTLS_PSK_MAX_LEN
 	  Max size of TLS pre-shared keys, in bytes. It has no effect if no
 	  PSK key exchange is used.
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 	bool "RSA-only based ciphersuite modes"
 	default y if UOSCORE || UEDHOC
-	select MBEDTLS_MD
-	select MBEDTLS_RSA_FULL
+	depends on MBEDTLS_MD
+	depends on MBEDTLS_RSA_FULL
 	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY if PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT if PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT if PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE if PSA_CRYPTO_CLIENT
+	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE if PSA_CRYPTO_CLIENT
 
 config MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
 	bool "DHE-RSA based ciphersuite modes"
-	select MBEDTLS_RSA_FULL
+	depends on MBEDTLS_RSA_FULL
 
 config MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
 	bool "ECDHE-RSA based ciphersuite modes"
-	select MBEDTLS_RSA_FULL
+	depends on MBEDTLS_RSA_FULL
 	depends on MBEDTLS_ECDH_C
 
 config MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
 	bool "ECDHE-ECDSA based ciphersuite modes"
-	depends on MBEDTLS_ECDH_C && MBEDTLS_ECDSA_C || (PSA_WANT_ALG_ECDH && PSA_WANT_ALG_ECDSA)
+	depends on (MBEDTLS_ECDH_C && MBEDTLS_ECDSA_C) || (PSA_WANT_ALG_ECDH && PSA_WANT_ALG_ECDSA)
 
 config MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
 	bool "ECDH-ECDSA based ciphersuite modes"
@@ -241,8 +257,12 @@ config MBEDTLS_ECP_NIST_OPTIM
 
 endif
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 comment "Supported ciphers and cipher modes"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_CIPHER_ALL_ENABLED
 	bool "All available ciphers and modes"
 	select MBEDTLS_CIPHER_AES_ENABLED
@@ -257,15 +277,13 @@ config MBEDTLS_CIPHER_ALL_ENABLED
 	select MBEDTLS_CHACHAPOLY_AEAD_ENABLED
 
 config MBEDTLS_SOME_AEAD_CIPHER_ENABLED
-	bool
-	default y
+	def_bool y
 	depends on \
 		MBEDTLS_CIPHER_AES_ENABLED || \
 		MBEDTLS_CIPHER_CAMELLIA_ENABLED
 
 config MBEDTLS_SOME_CIPHER_ENABLED
-	bool
-	default y
+	def_bool y
 	depends on \
 		MBEDTLS_SOME_AEAD_CIPHER_ENABLED || \
 		MBEDTLS_CIPHER_DES_ENABLED || \
@@ -273,7 +291,6 @@ config MBEDTLS_SOME_CIPHER_ENABLED
 
 config MBEDTLS_CIPHER_AES_ENABLED
 	bool "AES block cipher"
-	default y if PSA_WANT_KEY_TYPE_AES && MBEDTLS_PSA_CRYPTO_C
 
 if MBEDTLS_CIPHER_AES_ENABLED
 
@@ -334,8 +351,12 @@ config MBEDTLS_CMAC
 	bool "CMAC (Cipher-based Message Authentication Code) mode for block ciphers."
 	depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_DES_ENABLED
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 comment "Supported hash algorithms"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_HASH_ALL_ENABLED
 	bool "All available MAC methods"
 	select MBEDTLS_MD5
@@ -376,10 +397,14 @@ config MBEDTLS_SHA512
 config MBEDTLS_POLY1305
 	bool "Poly1305 hash family"
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 endmenu
 
 comment "Random number generators"
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_CTR_DRBG_ENABLED
 	bool "CTR_DRBG AES-256-based random generator"
 	depends on MBEDTLS_CIPHER_AES_ENABLED
@@ -389,14 +414,21 @@ config MBEDTLS_HMAC_DRBG_ENABLED
 	bool "HMAC_DRBG random generator"
 	select MBEDTLS_MD
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 comment "Other configurations"
 
 config MBEDTLS_CIPHER
 	bool "generic cipher layer."
 	default y if PSA_WANT_ALG_CMAC
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_MD
 	bool "generic message digest layer."
+	default y if UOSCORE || UEDHOC
+
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
 
 config MBEDTLS_ASN1_PARSE_C
 	bool "Support for ASN1 parser functions"
@@ -437,6 +469,8 @@ config MBEDTLS_HAVE_ASM
 	  of asymmetric cryptography, however this might have an impact on the
 	  code size.
 
+if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_ENTROPY_C
 	bool "Mbed TLS entropy accumulator"
 	depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512
@@ -445,6 +479,8 @@ config MBEDTLS_ENTROPY_C
 	  mostly used in conjunction with CTR_DRBG or HMAC_DRBG to create
 	  a deterministic random number generator.
 
+endif # !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)
+
 config MBEDTLS_ENTROPY_POLL_ZEPHYR
 	bool "Provide entropy data to Mbed TLS through entropy driver or random generator"
 	default y
@@ -602,8 +638,7 @@ config MBEDTLS_USE_PSA_CRYPTO
 	  "intermediate" modules such as PK, MD and Cipher.
 
 config MBEDTLS_PSA_CRYPTO_CLIENT
-	bool
-	default y
+	def_bool y
 	depends on BUILD_WITH_TFM || MBEDTLS_PSA_CRYPTO_C
 	select PSA_CRYPTO_CLIENT
 
diff --git a/modules/mbedtls/Kconfig.psa.auto b/modules/mbedtls/Kconfig.psa.auto
index 08b1bbc0241..b235c30380f 100644
--- a/modules/mbedtls/Kconfig.psa.auto
+++ b/modules/mbedtls/Kconfig.psa.auto
@@ -36,10 +36,6 @@ config PSA_WANT_ALG_CMAC
 	bool "PSA_WANT_ALG_CMAC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_CFB
-	bool "PSA_WANT_ALG_CFB" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_ALG_CHACHA20_POLY1305
 	bool "PSA_WANT_ALG_CHACHA20_POLY1305" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -60,10 +56,6 @@ config PSA_WANT_ALG_ECDH
 	bool "PSA_WANT_ALG_ECDH" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ALG_FFDH
-	bool "PSA_WANT_ALG_FFDH" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_ALG_ECDSA
 	bool "PSA_WANT_ALG_ECDSA" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -79,6 +71,7 @@ config PSA_WANT_ALG_GCM
 config PSA_WANT_ALG_HKDF
 	bool "PSA_WANT_ALG_HKDF" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_HKDF_EXTRACT
 	bool "PSA_WANT_ALG_HKDF_EXTRACT" if !MBEDTLS_PROMPTLESS
@@ -95,22 +88,19 @@ config PSA_WANT_ALG_HMAC
 config PSA_WANT_ALG_MD5
 	bool "PSA_WANT_ALG_MD5" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_ALG_OFB
-	bool "PSA_WANT_ALG_OFB" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
+	help
+	  Warning: The MD5 hash is weak and deprecated and is only recommended
+	  for use in legacy protocols.
 
 config PSA_WANT_ALG_PBKDF2_HMAC
 	bool "PSA_WANT_ALG_PBKDF2_HMAC" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 	bool "PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_ALG_RIPEMD160
-	bool "PSA_WANT_ALG_RIPEMD160" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_CMAC
 
 config PSA_WANT_ALG_RSA_OAEP
 	bool "PSA_WANT_ALG_RSA_OAEP" if !MBEDTLS_PROMPTLESS
@@ -131,6 +121,9 @@ config PSA_WANT_ALG_RSA_PSS
 config PSA_WANT_ALG_SHA_1
 	bool "PSA_WANT_ALG_SHA_1" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	help
+	  Warning: The SHA-1 hash is weak and deprecated and is only recommended
+	  for use in legacy protocols.
 
 config PSA_WANT_ALG_SHA_224
 	bool "PSA_WANT_ALG_SHA_224" if !MBEDTLS_PROMPTLESS
@@ -167,18 +160,22 @@ config PSA_WANT_ALG_SHA3_512
 config PSA_WANT_ALG_STREAM_CIPHER
 	bool "PSA_WANT_ALG_STREAM_CIPHER" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	select PSA_WANT_KEY_TYPE_CHACHA20
 
 config PSA_WANT_ALG_TLS12_PRF
 	bool "PSA_WANT_ALG_TLS12_PRF" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_TLS12_PSK_TO_MS
 	bool "PSA_WANT_ALG_TLS12_PSK_TO_MS" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_HMAC
 
 config PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS
 	bool "PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_SHA_256
 
 config PSA_WANT_ECC_BRAINPOOL_P_R1_256
 	bool "PSA_WANT_ECC_BRAINPOOL_P_R1_256" if !MBEDTLS_PROMPTLESS
@@ -228,26 +225,6 @@ config PSA_WANT_ECC_SECP_R1_521
 	bool "PSA_WANT_ECC_SECP_R1_521" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_DH_RFC7919_2048
-	bool "PSA_WANT_DH_RFC7919_2048" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_3072
-	bool "PSA_WANT_DH_RFC7919_3072" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_4096
-	bool "PSA_WANT_DH_RFC7919_4096" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_6144
-	bool "PSA_WANT_DH_RFC7919_6144" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_DH_RFC7919_8192
-	bool "PSA_WANT_DH_RFC7919_8192" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_DERIVE
 	bool "PSA_WANT_KEY_TYPE_DERIVE" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -268,30 +245,16 @@ config PSA_WANT_KEY_TYPE_AES
 	bool "PSA_WANT_KEY_TYPE_AES" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_ARIA
-	bool "PSA_WANT_KEY_TYPE_ARIA" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_CAMELLIA
-	bool "PSA_WANT_KEY_TYPE_CAMELLIA" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_CHACHA20
 	bool "PSA_WANT_KEY_TYPE_CHACHA20" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_DES
-	bool "PSA_WANT_KEY_TYPE_DES" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
+	depends on PSA_WANT_ALG_CHACHA20_POLY1305 || \
+		   PSA_WANT_ALG_STREAM_CIPHER
 
 config PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	bool "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY
-	bool "PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_RAW_DATA
 	bool "PSA_WANT_KEY_TYPE_RAW_DATA" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -302,42 +265,42 @@ config PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
 	bool "PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
 	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE
-	bool "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE" if !MBEDTLS_PROMPTLESS
+config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
+	bool "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE" if !MBEDTLS_PROMPTLESS
+	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	default y if PSA_CRYPTO_ENABLE_ALL
 
 endif # PSA_CRYPTO_CLIENT
diff --git a/modules/mbedtls/Kconfig.psa.logic b/modules/mbedtls/Kconfig.psa.logic
index dcea9e35405..2de81163dc1 100644
--- a/modules/mbedtls/Kconfig.psa.logic
+++ b/modules/mbedtls/Kconfig.psa.logic
@@ -18,10 +18,3 @@ config PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 	depends on PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT || \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT || \
 		   PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
-
-config PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC
-	bool
-	default y
-	depends on PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT || \
-		   PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT || \
-		   PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE
diff --git a/modules/nrf_wifi/bus/CMakeLists.txt b/modules/nrf_wifi/bus/CMakeLists.txt
index c36fec9d737..829b48d1aab 100644
--- a/modules/nrf_wifi/bus/CMakeLists.txt
+++ b/modules/nrf_wifi/bus/CMakeLists.txt
@@ -26,8 +26,18 @@ if (CONFIG_NRF70_BUSLIB)
     inc
     ${NRF_WIFI_DIR}/os_if/inc
   )
+  zephyr_library_include_directories_ifdef(CONFIG_NRF71_ON_IPC
+    ${NRF_WIFI_DIR}/bus_if/bal/inc
+    # QSPI is common to (Q)SPI and IPC
+    ${NRF_WIFI_DIR}/bus_if/bus/qspi/inc
+    ${NRF_WIFI_DIR}/fw_if/umac_if/inc/fw
+    ${NRF_WIFI_DIR}/hw_if/hal/inc
+  )
+
+  zephyr_library_compile_definitions_ifdef(CONFIG_NRF71_ON_IPC
+    NRF71_ON_IPC
+  )
   zephyr_library_sources(
-    rpu_hw_if.c
     device.c
   )
   if(NOT CONFIG_WIFI_NRF70)
@@ -36,9 +46,16 @@ if (CONFIG_NRF70_BUSLIB)
     )
   endif()
   zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
+    rpu_hw_if.c
     qspi_if.c
   )
   zephyr_library_sources_ifdef(CONFIG_NRF70_ON_SPI
+    rpu_hw_if.c
     spi_if.c
   )
+  zephyr_library_sources_ifdef(CONFIG_NRF71_ON_IPC
+    ipc_if.c
+    ipc_service.c
+    spsc_qm.c
+  )
 endif()
diff --git a/modules/nrf_wifi/bus/Kconfig b/modules/nrf_wifi/bus/Kconfig
index 152904e86b7..fe6b0f34553 100644
--- a/modules/nrf_wifi/bus/Kconfig
+++ b/modules/nrf_wifi/bus/Kconfig
@@ -10,6 +10,7 @@ DT_COMPAT_NORDIC_NRF7001_QSPI := nordic,nrf7001-qspi
 DT_COMPAT_NORDIC_NRF7001_SPI := nordic,nrf7001-spi
 DT_COMPAT_NORDIC_NRF7000_QSPI := nordic,nrf7000-qspi
 DT_COMPAT_NORDIC_NRF7000_SPI := nordic,nrf7000-spi
+DT_COMPAT_NORDIC_WIFI71 := nordic,wifi71
 
 menuconfig NRF70_BUSLIB
 	bool "NRF70 Bus Library"
@@ -30,6 +31,15 @@ config NRF70_ON_SPI
 			 $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF7000_SPI))
 	select SPI
 
+config NRF71_ON_IPC
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_WIFI71))
+	select MBOX
+	select IPC_SERVICE
+	select SPSC_PBUF
+	help
+	  nRF71 is a Wi-Fi and BLE combo SoC and uses IPC as a communication
+	  between APP and Wi-Fi cores.
+
 module = WIFI_NRF70_BUSLIB
 module-dep = LOG
 module-str = Log level for Wi-Fi nRF70 bus library
diff --git a/modules/nrf_wifi/bus/device.c b/modules/nrf_wifi/bus/device.c
index 8cf0b77cd67..611af2489c8 100644
--- a/modules/nrf_wifi/bus/device.c
+++ b/modules/nrf_wifi/bus/device.c
@@ -12,15 +12,26 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 #include <stdio.h>
 #include <string.h>
 
+#if defined(CONFIG_NRF71_ON_IPC)
+#include "ipc_if.h"
+#else
+#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 #include "spi_if.h"
-
 static struct qspi_config config;
+#endif
 
-#if defined(CONFIG_NRF70_ON_QSPI)
+#if defined(CONFIG_NRF71_ON_IPC)
+static struct rpu_dev ipc = {
+	.init = ipc_init,
+	.deinit = ipc_deinit,
+	.send = ipc_send,
+	.recv = ipc_recv,
+	.register_rx_cb = ipc_register_rx_cb,
+};
+#elif defined(CONFIG_NRF70_ON_QSPI)
 static struct qspi_dev qspi = {.init = qspi_init,
 			       .deinit = qspi_deinit,
 			       .read = qspi_read,
@@ -34,6 +45,7 @@ static struct qspi_dev spim = {.init = spim_init,
 			       .hl_read = spim_hl_read};
 #endif
 
+#ifndef CONFIG_NRF71_ON_IPC
 struct qspi_config *qspi_defconfig(void)
 {
 	memset(&config, 0, sizeof(struct qspi_config));
@@ -71,12 +83,20 @@ struct qspi_config *qspi_get_config(void)
 {
 	return &config;
 }
+#endif
 
+#ifndef CONFIG_NRF71_ON_IPC
 struct qspi_dev *qspi_dev(void)
 {
-#if CONFIG_NRF70_ON_QSPI
+#if defined(CONFIG_NRF70_ON_QSPI)
 	return &qspi;
 #else
 	return &spim;
 #endif
 }
+#else
+struct rpu_dev *rpu_dev(void)
+{
+	return &ipc;
+}
+#endif /*! CONFIG_NRF71_ON_IPC */
diff --git a/modules/nrf_wifi/bus/ipc_if.c b/modules/nrf_wifi/bus/ipc_if.c
new file mode 100644
index 00000000000..cd2365a9af0
--- /dev/null
+++ b/modules/nrf_wifi/bus/ipc_if.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief File containing API definitions for the
+ * IPC bus layer of the nRF71 Wi-Fi driver.
+ */
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
+
+#include "ipc_if.h"
+#include "bal_structs.h"
+#include "qspi.h"
+#include "common/hal_structs_common.h"
+
+/* Define addresses to use for the free queues */
+#define EVENT_FREEQ_ADDR 0x200C2000
+#define CMD_FREEQ_ADDR   0x200C3000
+
+#define NUM_INSTANCES 3
+#define NUM_ENDPOINTS 1
+
+struct device *ipc_instances[NUM_INSTANCES];
+struct ipc_ept ept[NUM_ENDPOINTS];
+struct ipc_ept_cfg ept_cfg[NUM_ENDPOINTS];
+
+static wifi_ipc_t wifi_event;
+static wifi_ipc_t wifi_cmd;
+static wifi_ipc_t wifi_tx;
+
+static int (*callback_func)(void *data);
+
+static void event_recv(void *data, void *priv)
+{
+	struct nrf_wifi_bus_qspi_dev_ctx *dev_ctx = NULL;
+	struct nrf_wifi_bal_dev_ctx *bal_dev_ctx = NULL;
+	struct nrf_wifi_hal_dev_ctx *hal_dev_ctx = NULL;
+
+	dev_ctx = (struct nrf_wifi_bus_qspi_dev_ctx *)priv;
+	bal_dev_ctx = (struct nrf_wifi_bal_dev_ctx *)dev_ctx->bal_dev_ctx;
+	hal_dev_ctx = (struct nrf_wifi_hal_dev_ctx *)bal_dev_ctx->hal_dev_ctx;
+	LOG_DBG("Event IPC received");
+
+	hal_dev_ctx->ipc_msg = data;
+	callback_func(priv);
+	LOG_DBG("Event IPC callback completed");
+}
+
+int ipc_init(void)
+{
+	wifi_ipc_host_event_init(&wifi_event, EVENT_FREEQ_ADDR);
+	LOG_DBG("Event IPC initialized");
+	wifi_ipc_host_cmd_init(&wifi_cmd, CMD_FREEQ_ADDR);
+	LOG_DBG("Command IPC initialized");
+	return 0;
+}
+
+int ipc_deinit(void)
+{
+	return 0;
+}
+
+int ipc_recv(ipc_ctx_t ctx, void *data, int len)
+{
+	return 0;
+}
+
+int ipc_send(ipc_ctx_t ctx, const void *data, int len)
+{
+
+	int ret = 0;
+
+	switch (ctx.inst) {
+	case IPC_INSTANCE_CMD_CTRL:
+		/* IPC service on RPU may not have been established. Keep trying. */
+		do {
+			ret = wifi_ipc_host_cmd_send_memcpy(&wifi_cmd, data, len);
+		} while (ret == WIFI_IPC_STATUS_BUSYQ_NOTREADY);
+
+		/* Critical error during IPC service transfer. Should never happen. */
+		if (ret == WIFI_IPC_STATUS_BUSYQ_CRITICAL_ERR) {
+			LOG_ERR("Critical error during IPC CMD busyq transfer");
+			return -1;
+		}
+		break;
+	case IPC_INSTANCE_CMD_TX:
+		/* IPC service on RPU may not have been established. Keep trying. */
+		do {
+			ret = wifi_ipc_host_tx_send(&wifi_tx, data);
+		} while (ret == WIFI_IPC_STATUS_BUSYQ_NOTREADY);
+
+		/* Critical error during IPC service transfer. Should never happen. */
+		if (ret == WIFI_IPC_STATUS_BUSYQ_CRITICAL_ERR) {
+			LOG_ERR("Critical error during IPC TX busyq transfer");
+			return -1;
+		}
+		break;
+	case IPC_INSTANCE_RX:
+		break;
+	default:
+		break;
+	}
+
+	LOG_DBG("IPC send completed: %d", ret);
+
+	return ret;
+}
+
+int ipc_register_rx_cb(int (*rx_handler)(void *priv), void *data)
+{
+	int ret;
+
+	callback_func = rx_handler;
+
+	ret = wifi_ipc_bind_ipc_service_tx_rx(&wifi_cmd, &wifi_event,
+					      DEVICE_DT_GET(DT_NODELABEL(ipc0)), event_recv, data);
+	if (ret != WIFI_IPC_STATUS_OK) {
+		LOG_ERR("Failed to bind IPC service: %d", ret);
+		return -1;
+	}
+
+	ret = wifi_ipc_bind_ipc_service(&wifi_tx, DEVICE_DT_GET(DT_NODELABEL(ipc1)), event_recv,
+					data);
+	if (ret != WIFI_IPC_STATUS_OK) {
+		LOG_ERR("Failed to bind IPC service: %d", ret);
+		return -1;
+	}
+
+	return 0;
+}
diff --git a/modules/nrf_wifi/bus/ipc_if.h b/modules/nrf_wifi/bus/ipc_if.h
new file mode 100644
index 00000000000..5dbc2edf4f4
--- /dev/null
+++ b/modules/nrf_wifi/bus/ipc_if.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __IPC_IF_H__
+#define __IPC_IF_H__
+
+#include <zephyr/kernel.h>
+#include "ipc_service.h"
+
+typedef enum {
+	IPC_INSTANCE_CMD_CTRL = 0,
+	IPC_INSTANCE_CMD_TX,
+	IPC_INSTANCE_EVT,
+	IPC_INSTANCE_RX
+} ipc_instances_nrf71_t;
+
+typedef enum {
+	IPC_EPT_UMAC = 0,
+	IPC_EPT_LMAC
+} ipc_epts_nrf71_t;
+
+typedef struct ipc_ctx {
+	ipc_instances_nrf71_t inst;
+	ipc_epts_nrf71_t ept;
+} ipc_ctx_t;
+
+struct rpu_dev {
+	int (*init)();
+	int (*deinit)(void);
+	int (*send)(ipc_ctx_t ctx, const void *data, int len);
+	int (*recv)(ipc_ctx_t ctx, void *data, int len);
+	int (*register_rx_cb)(int (*rx_handler)(void *priv), void *data);
+};
+
+struct rpu_dev *rpu_dev(void);
+
+int ipc_init(void);
+int ipc_deinit(void);
+int ipc_send(ipc_ctx_t ctx, const void *data, int len);
+/* Blocking Receive */
+int ipc_recv(ipc_ctx_t ctx, void *data, int len);
+/* Non-blocking Receive (global, not per instance) */
+int ipc_register_rx_cb(int (*rx_handler)(void *priv), void *data);
+
+#endif /* __IPC_IF_H__ */
diff --git a/modules/nrf_wifi/bus/ipc_service.c b/modules/nrf_wifi/bus/ipc_service.c
new file mode 100644
index 00000000000..e1e6b3cf4fb
--- /dev/null
+++ b/modules/nrf_wifi/bus/ipc_service.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief File containing API definitions for the
+ * IPC service layer of the nrf71 Wi-Fi driver.
+ */
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
+
+#include "ipc_service.h"
+
+static void wifi_ipc_ep_bound(void *priv)
+{
+	wifi_ipc_t *context = (wifi_ipc_t *)priv;
+
+	context->busy_q.ipc_ready = true;
+}
+
+static void wifi_ipc_recv_callback(const void *data, size_t len, void *priv)
+{
+	(void)len;
+	uint32_t global_addr = *((uint32_t *)data);
+
+	wifi_ipc_t *context = (wifi_ipc_t *)priv;
+
+	context->busy_q.recv_cb((void *)global_addr, context->busy_q.priv);
+
+	if (context->free_q != NULL) {
+		while (!spsc32_push(context->free_q, global_addr)) {
+		};
+	}
+}
+
+static void wifi_ipc_busyq_init(wifi_ipc_busyq_t *busyq, const ipc_device_wrapper_t *ipc_inst,
+				void *rx_cb, void *priv)
+{
+	busyq->ipc_inst = ipc_inst;
+	busyq->ipc_ep_cfg.cb.bound = wifi_ipc_ep_bound;
+	busyq->ipc_ep_cfg.cb.received = wifi_ipc_recv_callback;
+	busyq->recv_cb = rx_cb;
+	busyq->ipc_ready = false;
+	busyq->priv = priv;
+}
+
+/**
+ * Register the IPC service on the busy_queue
+ */
+static wifi_ipc_status_t wifi_ipc_busyq_register(wifi_ipc_t *context)
+{
+	int ret;
+	const struct device *ipc_instance = GET_IPC_INSTANCE(context->busy_q.ipc_inst);
+
+	ret = ipc_service_open_instance(ipc_instance);
+	if (ret < 0) {
+		return WIFI_IPC_STATUS_INIT_ERR;
+	}
+
+	context->busy_q.ipc_ep_cfg.name = "ep";
+	context->busy_q.ipc_ep_cfg.priv = context;
+
+	ret = ipc_service_register_endpoint(ipc_instance, &context->busy_q.ipc_ep,
+						&context->busy_q.ipc_ep_cfg);
+	if (ret < 0 && ret != -EALREADY) {
+		return WIFI_IPC_STATUS_INIT_ERR;
+	}
+
+	LOG_INF("IPC busy queue registered");
+
+	return WIFI_IPC_STATUS_OK;
+}
+
+wifi_ipc_status_t wifi_ipc_bind_ipc_service(wifi_ipc_t *context,
+						const ipc_device_wrapper_t *ipc_inst,
+						void (*rx_cb)(void *data, void *priv), void *priv)
+{
+	wifi_ipc_busyq_init(&context->busy_q, ipc_inst, rx_cb, priv);
+	return wifi_ipc_busyq_register(context);
+}
+
+wifi_ipc_status_t wifi_ipc_bind_ipc_service_tx_rx(wifi_ipc_t *tx, wifi_ipc_t *rx,
+						  const ipc_device_wrapper_t *ipc_inst,
+						  void (*rx_cb)(void *data, void *priv), void *priv)
+{
+	wifi_ipc_busyq_init(&rx->busy_q, ipc_inst, rx_cb, priv);
+
+	/**
+	 * When initialising an IPC service, both TX and RX mailboxes need to be
+	 * registered at the same time using a single function call. Both tx and
+	 * rx need to refer to the same IPC instance.
+	 */
+	tx->linked_ipc = &rx->busy_q;
+
+	return wifi_ipc_busyq_register(rx);
+}
+
+wifi_ipc_status_t wifi_ipc_freeq_get(wifi_ipc_t *context, uint32_t *data)
+{
+	if (context->free_q == NULL) {
+		LOG_ERR("Free queue is not initialised");
+		return WIFI_IPC_STATUS_FREEQ_UNINIT_ERR;
+	}
+
+	if (spsc32_is_empty(context->free_q)) {
+		LOG_DBG("Free queue is empty");
+		return WIFI_IPC_STATUS_FREEQ_EMPTY;
+	}
+
+	if (!spsc32_read_head(context->free_q, data)) {
+		LOG_DBG("Free queue is empty");
+		return WIFI_IPC_STATUS_FREEQ_EMPTY;
+	}
+
+	return WIFI_IPC_STATUS_OK;
+}
+
+wifi_ipc_status_t wifi_ipc_freeq_send(wifi_ipc_t *context, uint32_t data)
+{
+	return (spsc32_push(context->free_q, data) == true ? WIFI_IPC_STATUS_OK
+								 : WIFI_IPC_STATUS_FREEQ_FULL);
+}
+
+wifi_ipc_status_t wifi_ipc_busyq_send(wifi_ipc_t *context, uint32_t *data)
+{
+	/* Get correct linked endpoint */
+	wifi_ipc_busyq_t *busyq =
+		context->linked_ipc ? context->linked_ipc : &context->busy_q;
+
+	if (!busyq->ipc_ready) {
+		LOG_ERR("IPC service is not ready");
+		return WIFI_IPC_STATUS_BUSYQ_NOTREADY;
+	}
+
+	int ret = ipc_service_send(&busyq->ipc_ep, data, sizeof(*data));
+
+	if (ret == -ENOMEM) {
+		LOG_ERR("No space in the buffer");
+		/* No space in the buffer */
+		return WIFI_IPC_STATUS_BUSYQ_FULL;
+	} else if (ret < 0) {
+		LOG_ERR("Critical IPC failure: %d", ret);
+		/* Critical IPC failure */
+		return WIFI_IPC_STATUS_BUSYQ_CRITICAL_ERR;
+	}
+
+	if (context->free_q != NULL) {
+		/* Free up global address pointer from the free queue */
+		uint32_t data_out;
+
+		return (spsc32_pop(context->free_q, &data_out) == true
+				? (*data == data_out ? WIFI_IPC_STATUS_OK
+							: WIFI_IPC_STATUS_FREEQ_INVALID)
+				: WIFI_IPC_STATUS_FREEQ_EMPTY);
+	}
+
+	return WIFI_IPC_STATUS_OK;
+}
+
+wifi_ipc_status_t wifi_ipc_host_cmd_init(wifi_ipc_t *context, uint32_t addr_freeq)
+{
+	context->free_q = (void *)addr_freeq;
+	return WIFI_IPC_STATUS_OK;
+}
+
+wifi_ipc_status_t wifi_ipc_host_event_init(wifi_ipc_t *context, uint32_t addr_freeq)
+{
+	context->free_q = (void *)addr_freeq;
+	return WIFI_IPC_STATUS_OK;
+}
+
+wifi_ipc_status_t wifi_ipc_host_cmd_get(wifi_ipc_t *context, uint32_t *data)
+{
+	return wifi_ipc_freeq_get(context, data);
+}
+
+wifi_ipc_status_t wifi_ipc_host_cmd_send(wifi_ipc_t *context, uint32_t *data)
+{
+	return wifi_ipc_busyq_send(context, data);
+}
+
+wifi_ipc_status_t wifi_ipc_host_cmd_send_memcpy(wifi_ipc_t *context, const void *msg,
+						size_t len)
+{
+	int ret;
+	uint32_t gdram_addr;
+
+	ret = wifi_ipc_host_cmd_get(context, &gdram_addr);
+	if (ret != WIFI_IPC_STATUS_OK) {
+		LOG_ERR("Failed to get command location from free queue: %d", ret);
+		return ret;
+	}
+
+	memcpy((void *)gdram_addr, msg, len);
+
+	return wifi_ipc_host_cmd_send(context, &gdram_addr);
+}
+
+wifi_ipc_status_t wifi_ipc_host_tx_send(wifi_ipc_t *context, const void *msg)
+{
+	return wifi_ipc_host_cmd_send(context, (uint32_t *)&msg);
+}
diff --git a/modules/nrf_wifi/bus/ipc_service.h b/modules/nrf_wifi/bus/ipc_service.h
new file mode 100644
index 00000000000..3d355e0c23a
--- /dev/null
+++ b/modules/nrf_wifi/bus/ipc_service.h
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef IPC_SERVICE_H
+#define IPC_SERVICE_H
+
+#include <zephyr/device.h>
+#include <zephyr/ipc/ipc_service.h>
+#include "spsc_qm.h"
+
+#define GET_IPC_INSTANCE(dev) (dev)
+typedef struct device ipc_device_wrapper_t;
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/*
+ * Must be large enough to contain the internal struct (spsc_pbuf struct) and
+ * at least two bytes of data (one is reserved for written message length)
+ */
+#define _MIN_SPSC_SIZE            (sizeof(spsc_queue_t) + sizeof(uint32_t))
+/*
+ * TODO: Unsure why some additional bytes are needed for overhead.
+ */
+#define WIFI_IPC_GET_SPSC_SIZE(x) (_MIN_SPSC_SIZE + 12 + (x))
+
+/* 4 x cmd location 32-bit pointers of 400 bytes each */
+#define WIFI_IPC_CMD_SIZE      400
+#define WIFI_IPC_CMD_NUM       4
+#define WIFI_IPC_CMD_SPSC_SIZE WIFI_IPC_GET_SPSC_SIZE(WIFI_IPC_CMD_NUM * sizeof(uint32_t))
+
+/* 7 x event location 32-bit pointers of 1000 bytes each */
+#define WIFI_IPC_EVENT_SIZE      1000
+#define WIFI_IPC_EVENT_NUM       7
+#define WIFI_IPC_EVENT_SPSC_SIZE WIFI_IPC_GET_SPSC_SIZE(WIFI_IPC_EVENT_NUM * sizeof(uint32_t))
+
+/**
+ * @enum wifi_ipc_status_t
+ * @brief Status codes for the Wi-Fi IPC service.
+ *
+ * This enumeration defines various status codes that represent
+ * the state or result of operations in the Wi-Fi IPC service.
+ */
+typedef enum {
+	/** Status indicating the operation completed successfully. */
+	WIFI_IPC_STATUS_OK = 0,
+
+	/** Error indicating failure to register IPC service for the Busy queue. */
+	WIFI_IPC_STATUS_INIT_ERR,
+
+	/** Error indicating that the Free queue has not been initialized. */
+	WIFI_IPC_STATUS_FREEQ_UNINIT_ERR,
+
+	/** Status indicating that the Free queue is empty. */
+	WIFI_IPC_STATUS_FREEQ_EMPTY,
+
+	/** Error indicating that the value passed to wifi_ipc_busyq_send()
+	 * does not match the value from the Free queue.
+	 */
+	WIFI_IPC_STATUS_FREEQ_INVALID,
+
+	/** Status indicating that the Free queue is full. */
+	WIFI_IPC_STATUS_FREEQ_FULL,
+
+	/** Error indicating that the IPC service for the Busy queue connection
+	 * has not been established.
+	 */
+	WIFI_IPC_STATUS_BUSYQ_NOTREADY,
+
+	/** Status indicating that the Busy queue is full. */
+	WIFI_IPC_STATUS_BUSYQ_FULL,
+
+	/** Critical error indicating an IPC transfer failure. This should never happen. */
+	WIFI_IPC_STATUS_BUSYQ_CRITICAL_ERR,
+} wifi_ipc_status_t;
+
+/**
+ * Structure to hold context information for busy queue.
+ */
+typedef struct {
+	const ipc_device_wrapper_t *ipc_inst;
+	struct ipc_ept ipc_ep;
+	struct ipc_ept_cfg ipc_ep_cfg;
+	void (*recv_cb)(const void *data, const void *priv);
+	const void *priv;
+	volatile bool ipc_ready;
+} wifi_ipc_busyq_t;
+
+/**
+ * Top-level structure to hold context information for sending data between RPU
+ * and the Host.
+ */
+typedef struct {
+	spsc_queue_t *free_q;
+
+	wifi_ipc_busyq_t busy_q;
+	wifi_ipc_busyq_t *linked_ipc;
+} wifi_ipc_t;
+
+/**
+ * Performs memory-to-memory copy via MVDMA.
+ *
+ * Enters low power state by issuing wait-for-interrupt (WFI) while waiting for
+ * MVDMA event to complete.
+ *
+ * @param[in] p_dest : Pointer to destination memory to be copied to.
+ * @param[in] p_src : Pointer to source memory to be copied from.
+ * @param[in] len : Number of bytes to be copied.
+ */
+void wifi_ipc_mvdma_copy(void *p_dest, const void *p_src, size_t len);
+
+/**
+ * Bind either TX or RX context to one IPC service. This utilises the half-duplex
+ * capability of the IPC service.
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[in] ipc_inst : Pointer to the IPC instance.
+ * @param[in] rx_cb : If binding RX context, this is the callback function.
+ *                    Leave NULL if binding to a TX.
+ * @param[in] priv : If binding RX context, this is the private data to be passed
+ *                   along with the callback function.
+ *                   Leave NULL if binding to a TX.
+ * @return : wifi_ipc_status_ok if successful, otherwise wifi_ipc_status_init_err.
+ */
+wifi_ipc_status_t wifi_ipc_bind_ipc_service(wifi_ipc_t *p_context,
+						const ipc_device_wrapper_t *ipc_inst,
+						void (*rx_cb)(void *data, void *priv), void *priv);
+
+/**
+ * Bind both TX and RX contexts to a single IPC service. This utilises the
+ * full-duplex capability of the IPC service.
+ *
+ * @param[in] p_tx : Pointer to wifi_ipc_t struct to bind IPC TX mailbox to.
+ * @param[in] p_rx : Pointer to wifi_ipc_t struct to bind IPC RX mailbox to.
+ * @param[in] ipc_inst : Pointer to the IPC instance.
+ * @param[in] rx_cb : Callback function to bind to data in received from RX mailbox.
+ * @param[in] priv : Private data to the callback function.
+ * @return : wifi_ipc_status_ok if successful, otherwise wifi_ipc_status_init_err.
+ */
+wifi_ipc_status_t wifi_ipc_bind_ipc_service_tx_rx(wifi_ipc_t *p_tx, wifi_ipc_t *p_rx,
+						  const ipc_device_wrapper_t *ipc_inst,
+						  void (*rx_cb)(void *data, void *priv),
+						  void *priv);
+
+/**
+ * Get data from the free queue.
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[out] data : Pointer to the data to read to.
+ * @return : wifi_ipc_status_ok if successful, otherwise wifi_ipc_status_freeq_empty.
+ */
+wifi_ipc_status_t wifi_ipc_freeq_get(wifi_ipc_t *p_context, uint32_t *data);
+
+/**
+ * Send data to the free queue.
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[in] data : 32-bit data to send.
+ * @return : wifi_ipc_status_ok if successful, otherwise wifi_ipc_status_freeq_full.
+ */
+wifi_ipc_status_t wifi_ipc_freeq_send(wifi_ipc_t *p_context, uint32_t data);
+
+/**
+ * Send data to the busy queue over IPC service, and pop the same data from the
+ * free queue.
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[in] data : Pointer to the data to send to.
+ * @return : wifi_ipc_status_ok if successful, otherwise one of the following:
+ *              - wifi_ipc_status_busyq_notready
+ *              - wifi_ipc_status_busyq_full
+ *              - wifi_ipc_status_busyq_critical_err
+ *              - wifi_ipc_status_freeq_invalid
+ *              - wifi_ipc_status_freeq_empty
+ */
+wifi_ipc_status_t wifi_ipc_busyq_send(wifi_ipc_t *p_context, uint32_t *data);
+
+/**
+ * Prepares and initialises the Host for sending a command to RPU.
+ *
+ * The free queue points to the already allocated free queue from the RPU.
+ *
+ * The busy queue using IPC service must be initialised using @see wifi_ipc_bind_ipc_service()
+ * or @see wifi_ipc_bind_ipc_service_tx_rx().
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[in] addr_freeq : Address of the allocated free queue.
+ * @return : wifi_ipc_status_ok if successful.
+ */
+wifi_ipc_status_t wifi_ipc_host_cmd_init(wifi_ipc_t *p_context, uint32_t addr_freeq);
+
+/**
+ * Prepares and initialises the Host for receiving an event from RPU.
+ *
+ * The free queue points to the already allocated free queue from the RPU.
+ *
+ * The busy queue using IPC service must be initialised using @see wifi_ipc_bind_ipc_service()
+ * or @see wifi_ipc_bind_ipc_service_tx_rx().
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[in] addr_freeq : Address of the allocated SPSC free queue.
+ * @return : wifi_ipc_status_ok if successful.
+ */
+wifi_ipc_status_t wifi_ipc_host_event_init(wifi_ipc_t *p_context, uint32_t addr_freeq);
+
+/**
+ * Get a command location from the free queue.
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[out] p_data : Pointer to data to write event location to.
+ * @return : wifi_ipc_status_ok if successful, otherwise wifi_ipc_status_freeq_empty.
+ */
+wifi_ipc_status_t wifi_ipc_host_cmd_get(wifi_ipc_t *p_context, uint32_t *p_data);
+
+/**
+ * Send an event location pointer to the Host and frees up the event location
+ * pointer from the free queue.
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[in] p_data : Pointer to command location to be sent.
+ * @return : wifi_ipc_status_ok if successful, otherwise one of the following
+ *              - wifi_ipc_status_busyq_notready
+ *              - wifi_ipc_status_busyq_full
+ *              - wifi_ipc_status_busyq_critical_err
+ *              - wifi_ipc_status_freeq_invalid
+ *              - wifi_ipc_status_freeq_empty
+ */
+wifi_ipc_status_t wifi_ipc_host_cmd_send(wifi_ipc_t *p_context, uint32_t *p_data);
+
+/**
+ * Send a command from the Host to RPU using standard memcpy.
+ *
+ * 1. Retrieves an address pointer of Packet RAM from the free queue.
+ * 2. Copies local message to the retrieved address pointer via memcpy.
+ * 3. Sends the address pointer to the busy queue via IPC service.
+ * 4. Upon successful transmission, removes the address pointer the free queue.
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[in] p_msg : Pointer the local message to be copied to Packet RAM via memcpy.
+ * @param[in] len : Length of the local message in bytes.
+ * @return : wifi_ipc_status_ok if send is successful, otherwise one of
+ *           status code from wifi_ipc_status_t will be returned.
+ */
+wifi_ipc_status_t wifi_ipc_host_cmd_send_memcpy(wifi_ipc_t *p_context, const void *p_msg,
+						size_t len);
+
+/**
+ * Send a tx data pointer from the Host to RPU and raises RPU interrupt.
+ *
+ * @param[in] p_context : Pointer to wifi_ipc_t struct.
+ * @param[in] p_msg : Pointer to message.
+ * @return : wifi_ipc_status_ok if send is successful, otherwise one of
+ *           status code from wifi_ipc_status_t will be returned.
+ */
+wifi_ipc_status_t wifi_ipc_host_tx_send(wifi_ipc_t *p_context, const void *p_msg);
+
+#endif /* IPC_SERVICE_H */
diff --git a/modules/nrf_wifi/bus/spsc_qm.c b/modules/nrf_wifi/bus/spsc_qm.c
new file mode 100644
index 00000000000..01da1b5e897
--- /dev/null
+++ b/modules/nrf_wifi/bus/spsc_qm.c
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief File containing API definitions for the
+ * SPSC queue management layer of the nRF71 Wi-Fi driver.
+ */
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_DECLARE(wifi_nrf_bus, CONFIG_WIFI_NRF70_BUSLIB_LOG_LEVEL);
+
+#include "spsc_qm.h"
+
+spsc_queue_t *spsc32_init(uint32_t address, size_t size)
+{
+	return spsc_pbuf_init((void *)address, size, 0);
+}
+
+bool spsc32_push(spsc_queue_t *queue, uint32_t value)
+{
+	char *pbuf;
+	uint8_t len = sizeof(uint32_t);
+
+	if (spsc_pbuf_alloc(queue, len, &pbuf) != len) {
+		LOG_ERR("%s: Failed to allocate buffer", __func__);
+		return false;
+	}
+
+	memcpy(pbuf, &value, len);
+	spsc_pbuf_commit(queue, len);
+
+	return true;
+}
+
+bool spsc32_pop(spsc_queue_t *queue, uint32_t *out_value)
+{
+	char *buf;
+	uint16_t plen = spsc_pbuf_claim(queue, &buf);
+
+	if (plen == 0) {
+		LOG_ERR("%s: Failed to claim buffer", __func__);
+		return false;
+	}
+
+	spsc_pbuf_free(queue, plen);
+
+	*out_value = *((uint32_t *)buf);
+
+	return true;
+}
+
+bool spsc32_read_head(spsc_queue_t *queue, uint32_t *out_value)
+{
+	char *buf;
+	uint16_t plen = spsc_pbuf_claim(queue, &buf);
+
+	if (plen == 0) {
+		LOG_ERR("%s: Failed to claim buffer", __func__);
+		return false;
+	}
+
+	*out_value = *((uint32_t *)buf);
+
+	return true;
+}
+
+bool spsc32_is_empty(spsc_queue_t *queue)
+{
+	char *buf;
+
+	return spsc_pbuf_claim(queue, &buf) == 0;
+}
+
+bool spsc32_is_full(spsc_queue_t *queue)
+{
+	char *pbuf;
+	uint8_t len = sizeof(uint32_t);
+
+	return spsc_pbuf_alloc(queue, len, &pbuf) != len;
+}
diff --git a/modules/nrf_wifi/bus/spsc_qm.h b/modules/nrf_wifi/bus/spsc_qm.h
new file mode 100644
index 00000000000..063cb470b52
--- /dev/null
+++ b/modules/nrf_wifi/bus/spsc_qm.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @brief File containing API definitions for the
+ * SPSC queue management layer of the nRF71 Wi-Fi driver.
+
+ * SPSC Queue Manager API for handling 32-bit values.
+ *
+ * The Queue Manager API for Single-Producer, Single-Consumer (SPSC) queue. This
+ * API allows queues to be allocated, pushed and popped.
+ */
+
+#ifndef SPSC_QM_H
+#define SPSC_QM_H
+
+#include <zephyr/sys/spsc_pbuf.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef struct spsc_pbuf spsc_queue_t;
+
+/**
+ * Initialise and allocate SPSC queue.
+ *
+ * @param[in] address : Address to allocate.
+ * @param[in] size : Size in bytes to allocate.
+ * @return : SPSC packet queue.
+ */
+spsc_queue_t *spsc32_init(uint32_t address, size_t size);
+
+/**
+ * Push a value onto the tail of a queue.
+ *
+ * @param[in] pb : Pointer to SPSC packet queue.
+ * @param[in] value : The value to push to the queue.
+ * @return : true if push is successful, false otherwise.
+ */
+bool spsc32_push(spsc_queue_t *pb, uint32_t value);
+
+/**
+ * Pop a value from the head of a queue and return it.
+ *
+ * @param[in] pb : Pointer to SPSC packet queue.
+ * @param[out] out_value : Pointer to the value to pop to.
+ * @return : true if pop is successful, false otherwise.
+ */
+bool spsc32_pop(spsc_queue_t *pb, uint32_t *out_value);
+
+/**
+ * Return a value at the head of a queue without popping it.
+ *
+ * @param[in] pb : Pointer to SPSC packet queue.
+ * @param[out] out_value : Pointer to value to read from the head of the queue.
+ * @return : true if read is successful, false otherwise.
+ */
+bool spsc32_read_head(spsc_queue_t *pb, uint32_t *out_value);
+
+/**
+ * Test whether a queue is empty.
+ *
+ * @param[in] pb : Pointer to SPSC packet queue.
+ * @return : true if the queue is empty, false otherwise.
+ */
+bool spsc32_is_empty(spsc_queue_t *pb);
+
+/**
+ * Test whether a queue is full.
+ *
+ * @param[in] pb : Pointer to SPSC packet queue.
+ * @return : true if the queue is full, false otherwise.
+ */
+bool spsc32_is_full(spsc_queue_t *pb);
+
+#endif /* SPSC_QM_H */
diff --git a/modules/nrf_wifi/os/CMakeLists.txt b/modules/nrf_wifi/os/CMakeLists.txt
index e4f9cf2a0b6..ce1c9a850c8 100644
--- a/modules/nrf_wifi/os/CMakeLists.txt
+++ b/modules/nrf_wifi/os/CMakeLists.txt
@@ -15,5 +15,13 @@ zephyr_library_sources(
   timer.c
   work.c
 )
+zephyr_include_directories_ifdef(CONFIG_NRF71_ON_IPC
+  ${CMAKE_CURRENT_LIST_DIR}/../bus/
+  ${CMAKE_CURRENT_LIST_DIR}/../hw_if/hal/inc
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_NRF71_ON_IPC
+  NRF71_ON_IPC
+)
 
 zephyr_library_link_libraries(nrf-wifi-osal)
diff --git a/modules/nrf_wifi/os/shim.c b/modules/nrf_wifi/os/shim.c
index 997704b01bb..b892d50df7f 100644
--- a/modules/nrf_wifi/os/shim.c
+++ b/modules/nrf_wifi/os/shim.c
@@ -18,14 +18,19 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
+#ifdef CONFIG_NRF71_ON_IPC
+#include "ipc_if.h"
+#else
 #include <zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h>
 #include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
+#endif /* CONFIG_NRF71_ON_IPC */
 #include <zephyr/sys/math_extras.h>
 
 #include "shim.h"
 #include "work.h"
 #include "timer.h"
 #include "osal_ops.h"
+#include "common/hal_structs_common.h"
 
 LOG_MODULE_REGISTER(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 #if defined(CONFIG_NOCACHE_MEMORY)
@@ -122,6 +127,7 @@ static int zep_shim_mem_cmp(const void *addr1,
 	return memcmp(addr1, addr2, size);
 }
 
+#ifndef CONFIG_NRF71_ON_IPC
 static unsigned int zep_shim_qspi_read_reg32(void *priv, unsigned long addr)
 {
 	unsigned int val;
@@ -174,6 +180,7 @@ static void zep_shim_qspi_cpy_to(void *priv, unsigned long addr, const void *src
 
 	dev->write(addr, src, count_aligned);
 }
+#endif /* !CONFIG_NRF71_ON_IPC */
 
 static void *zep_shim_spinlock_alloc(void)
 {
@@ -807,14 +814,56 @@ static enum nrf_wifi_status zep_shim_bus_qspi_dev_init(void *os_qspi_dev_ctx)
 static void zep_shim_bus_qspi_dev_deinit(void *priv)
 {
 	struct zep_shim_bus_qspi_priv *qspi_priv = priv;
+#ifndef CONFIG_NRF71_ON_IPC
 	volatile struct qspi_dev *dev = qspi_priv->qspi_dev;
-
+#else
+	volatile struct rpu_dev *dev = qspi_priv->qspi_dev;
+#endif /* !CONFIG_NRF71_ON_IPC */
 	dev->deinit();
 }
 
+#ifdef CONFIG_NRF71_ON_IPC
+static int ipc_send_msg(unsigned int msg_type, void *msg, unsigned int len)
+{
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct rpu_dev *dev = rpu_dev();
+	int ret;
+	ipc_ctx_t ctx;
+
+	switch (msg_type) {
+	case NRF_WIFI_HAL_MSG_TYPE_CMD_CTRL:
+		ctx.inst = IPC_INSTANCE_CMD_CTRL;
+		ctx.ept = IPC_EPT_UMAC;
+		break;
+	case NRF_WIFI_HAL_MSG_TYPE_CMD_DATA_TX:
+		ctx.inst = IPC_INSTANCE_CMD_TX;
+		ctx.ept = IPC_EPT_UMAC;
+		break;
+	case NRF_WIFI_HAL_MSG_TYPE_CMD_DATA_RX:
+		ctx.inst = IPC_INSTANCE_RX;
+		ctx.ept = IPC_EPT_LMAC;
+		break;
+	default:
+		nrf_wifi_osal_log_err("%s: Invalid msg_type (%d)", __func__, msg_type);
+		goto out;
+	};
+
+	ret = dev->send(ctx, msg, len);
+	if (ret < 0) {
+		nrf_wifi_osal_log_err("%s: Sending message to RPU failed\n", __func__);
+		goto out;
+	}
+
+	status = NRF_WIFI_STATUS_SUCCESS;
+out:
+	return status;
+}
+#endif /*  CONFIG_NRF71_ON_IPC */
+
 static void *zep_shim_bus_qspi_dev_add(void *os_qspi_priv, void *osal_qspi_dev_ctx)
 {
 	struct zep_shim_bus_qspi_priv *zep_qspi_priv = os_qspi_priv;
+#ifndef CONFIG_NRF71_ON_IPC
 	struct qspi_dev *dev = qspi_dev();
 	int ret;
 	enum nrf_wifi_status status;
@@ -836,6 +885,11 @@ static void *zep_shim_bus_qspi_dev_add(void *os_qspi_priv, void *osal_qspi_dev_c
 		LOG_ERR("%s: RPU enable failed with error %d", __func__, ret);
 		return NULL;
 	}
+#else
+	struct rpu_dev *dev = rpu_dev();
+
+	dev->init();
+#endif /* !CONFIG_NRF71_ON_IPC */
 	zep_qspi_priv->qspi_dev = dev;
 	zep_qspi_priv->dev_added = true;
 
@@ -849,8 +903,10 @@ static void zep_shim_bus_qspi_dev_rem(void *priv)
 
 	ARG_UNUSED(dev);
 
+#ifndef CONFIG_NRF71_ON_IPC
 	/* TODO: Make qspi_dev a dynamic instance and remove it here */
 	rpu_disable();
+#endif /* !CONFIG_NRF71_ON_IPC */
 }
 
 static void *zep_shim_bus_qspi_init(void)
@@ -908,6 +964,7 @@ static void zep_shim_bus_qspi_dev_host_map_get(void *os_qspi_dev_ctx,
 	host_map->addr = 0;
 }
 
+#ifndef CONFIG_NRF71_ON_IPC
 static void irq_work_handler(struct k_work *work)
 {
 	int ret = 0;
@@ -940,6 +997,8 @@ static void zep_shim_irq_handler(const struct device *dev, struct gpio_callback
 	k_work_schedule_for_queue(&zep_wifi_intr_q, &intr_priv->work, K_NO_WAIT);
 }
 
+#endif /* !CONFIG_NRF71_ON_IPC */
+
 static enum nrf_wifi_status zep_shim_bus_qspi_intr_reg(void *os_dev_ctx, void *callbk_data,
 						       int (*callbk_fn)(void *callbk_data))
 {
@@ -948,6 +1007,14 @@ static enum nrf_wifi_status zep_shim_bus_qspi_intr_reg(void *os_dev_ctx, void *c
 
 	ARG_UNUSED(os_dev_ctx);
 
+#ifdef CONFIG_NRF71_ON_IPC
+	ret = ipc_register_rx_cb(callbk_fn, callbk_data);
+	if (ret) {
+		LOG_ERR("%s: ipc_register_rx_cb failed\n", __func__);
+		goto out;
+	}
+	status = NRF_WIFI_STATUS_SUCCESS;
+#else
 	intr_priv = zep_shim_mem_zalloc(sizeof(*intr_priv));
 
 	if (!intr_priv) {
@@ -970,18 +1037,20 @@ static enum nrf_wifi_status zep_shim_bus_qspi_intr_reg(void *os_dev_ctx, void *c
 	}
 
 	status = NRF_WIFI_STATUS_SUCCESS;
-
+#endif /* CONFIG_NRF71_ON_IPC */
 out:
 	return status;
 }
 
 static void zep_shim_bus_qspi_intr_unreg(void *os_qspi_dev_ctx)
 {
+#ifndef CONFIG_NRF71_ON_IPC
 	struct k_work_sync sync;
 	int ret;
+#endif /* !CONFIG_NRF71_ON_IPC */
 
 	ARG_UNUSED(os_qspi_dev_ctx);
-
+#ifndef CONFIG_NRF71_ON_IPC
 	ret = rpu_irq_remove(&intr_priv->gpio_cb_data);
 	if (ret) {
 		LOG_ERR("%s: rpu_irq_remove failed", __func__);
@@ -992,6 +1061,7 @@ static void zep_shim_bus_qspi_intr_unreg(void *os_qspi_dev_ctx)
 
 	zep_shim_mem_free(intr_priv);
 	intr_priv = NULL;
+#endif /*! CONFIG_NRF71_ON_IPC */
 }
 
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
@@ -1072,12 +1142,12 @@ const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops = {
 	.mem_cpy = zep_shim_mem_cpy,
 	.mem_set = zep_shim_mem_set,
 	.mem_cmp = zep_shim_mem_cmp,
-
+#ifndef CONFIG_NRF71_ON_IPC
 	.qspi_read_reg32 = zep_shim_qspi_read_reg32,
 	.qspi_write_reg32 = zep_shim_qspi_write_reg32,
 	.qspi_cpy_from = zep_shim_qspi_cpy_from,
 	.qspi_cpy_to = zep_shim_qspi_cpy_to,
-
+#endif /* CONFIG_NRF71_ON_IPC */
 	.spinlock_alloc = zep_shim_spinlock_alloc,
 	.spinlock_free = zep_shim_spinlock_free,
 	.spinlock_init = zep_shim_spinlock_init,
@@ -1157,7 +1227,9 @@ const struct nrf_wifi_osal_ops nrf_wifi_os_zep_ops = {
 	.bus_qspi_ps_wake = zep_shim_bus_qspi_ps_wake,
 	.bus_qspi_ps_status = zep_shim_bus_qspi_ps_status,
 #endif /* CONFIG_NRF_WIFI_LOW_POWER */
-
 	.assert = zep_shim_assert,
 	.strlen = zep_shim_strlen,
+#ifdef CONFIG_NRF71_ON_IPC
+	.ipc_send_msg = ipc_send_msg,
+#endif /* CONFIG_NRF71_ON_IPC */
 };
diff --git a/modules/trusted-firmware-a/CMakeLists.txt b/modules/trusted-firmware-a/CMakeLists.txt
index 72c1ea5c75a..0c0230174f0 100644
--- a/modules/trusted-firmware-a/CMakeLists.txt
+++ b/modules/trusted-firmware-a/CMakeLists.txt
@@ -8,6 +8,9 @@ if (CONFIG_BUILD_WITH_TFA)
 
   include(ExternalProject)
 
+  set(tfa_image_info MAP "name: tfa, source-dir: ${ZEPHYR_TRUSTED_FIRMWARE_A_MODULE_DIR}")
+  build_info(images VALUE ${tfa_image_info})
+
   ExternalProject_Add(
     tfa
     SOURCE_DIR ${ZEPHYR_TRUSTED_FIRMWARE_A_MODULE_DIR}
diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt
index 698b23aaf78..ff4a3093fdc 100644
--- a/modules/trusted-firmware-m/CMakeLists.txt
+++ b/modules/trusted-firmware-m/CMakeLists.txt
@@ -310,6 +310,9 @@ if (CONFIG_BUILD_WITH_TFM)
 	# threads. Which is num_cores+2 on Ninja and MAKEFLAGS with Make.
   endif()
 
+  set(tfm_image_info MAP "name: tfm, source-dir: ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}")
+  build_info(images VALUE ${tfm_image_info})
+
   ExternalProject_Add(
     tfm
     SOURCE_DIR ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}
diff --git a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
index 1d70a2c44d2..9604319ca01 100644
--- a/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
+++ b/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules
@@ -10,6 +10,7 @@ if TFM_PARTITION_CRYPTO
 config TFM_CRYPTO_RNG_MODULE_ENABLED
 	bool "Random number generator crypto module"
 	default y
+	depends on PSA_WANT_GENERATE_RANDOM && NRF_SECURITY
 	help
 	  Enables the random number generator  module within the crypto partition.
 	  Unset this option if 'psa_generate_random' is not used.
@@ -17,6 +18,7 @@ config TFM_CRYPTO_RNG_MODULE_ENABLED
 config TFM_CRYPTO_KEY_MODULE_ENABLED
 	bool "KEY crypto module"
 	default y
+	depends on PSA_HAS_KEY_SUPPORT && NRF_SECURITY
 	help
 	  Enables the KEY crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_key_management.c'
@@ -25,6 +27,7 @@ config TFM_CRYPTO_KEY_MODULE_ENABLED
 config TFM_CRYPTO_AEAD_MODULE_ENABLED
 	bool "AEAD crypto module"
 	default y
+	depends on PSA_HAS_AEAD_SUPPORT && NRF_SECURITY
 	help
 	  Enables the AEAD crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_aead.c'
@@ -33,6 +36,7 @@ config TFM_CRYPTO_AEAD_MODULE_ENABLED
 config TFM_CRYPTO_MAC_MODULE_ENABLED
 	bool "MAC crypto module"
 	default y
+	depends on PSA_HAS_MAC_SUPPORT && NRF_SECURITY
 	help
 	  Enables the MAC crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_mac.c'
@@ -41,6 +45,7 @@ config TFM_CRYPTO_MAC_MODULE_ENABLED
 config TFM_CRYPTO_HASH_MODULE_ENABLED
 	bool "HASH crypto module"
 	default y
+	depends on PSA_HAS_HASH_SUPPORT && NRF_SECURITY
 	help
 	  Enables the HASH crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_hash.c'
@@ -49,6 +54,7 @@ config TFM_CRYPTO_HASH_MODULE_ENABLED
 config TFM_CRYPTO_CIPHER_MODULE_ENABLED
 	bool "CIPHER crypto module"
 	default y
+	depends on PSA_HAS_CIPHER_SUPPORT && NRF_SECURITY
 	help
 	  Enables the CIPHER crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_cipher.c'
@@ -57,6 +63,7 @@ config TFM_CRYPTO_CIPHER_MODULE_ENABLED
 config TFM_CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
 	bool "ASYM ENCRYPT crypto module"
 	default y
+	depends on PSA_HAS_ASYM_ENCRYPT_SUPPORT && NRF_SECURITY
 	help
 	  Enables the ASYM ENCRYPT crypto module within the crypto partition.
 	  Unset this option if the encrypt functionality provided by 'crypto_asymmetric.c'
@@ -65,6 +72,7 @@ config TFM_CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
 config TFM_CRYPTO_ASYM_SIGN_MODULE_ENABLED
 	bool "ASYM SIGN crypto module"
 	default y
+	depends on PSA_HAS_ASYM_SIGN_SUPPORT && NRF_SECURITY
 	help
 	  Enables the ASYM SIGN crypto module within the crypto partition.
 	  Unset this option if the sign functionality provided by 'crypto_asymmetric.c'
@@ -73,10 +81,23 @@ config TFM_CRYPTO_ASYM_SIGN_MODULE_ENABLED
 config TFM_CRYPTO_KEY_DERIVATION_MODULE_ENABLED
 	bool "KEY DERIVATION crypto module"
 	default y
+	depends on (PSA_HAS_KEY_DERIVATION || PSA_HAS_KEY_AGREEMENT) && NRF_SECURITY
 	help
 	  Enables the KEY_DERIVATION crypto module within the crypto partition.
 	  Unset this option if the functionality provided by 'crypto_key_derivation.c'
 	  is not used.
+	  Note that key agreement is under key derivation in the current implementation.
+
+config TFM_CRYPTO_PAKE_MODULE_ENABLED
+	bool "PAKE crypto module"
+	default y
+	depends on PSA_HAS_PAKE_SUPPORT
+	depends on NRF_SECURITY
+	depends on PSA_CRYPTO_DRIVER_OBERON || PSA_CRYPTO_DRIVER_CRACEN
+	help
+	  Enables the PAKE crypto module within the crypto partition.
+	  Unset this option if the functionality provided by 'crypto_pake.c'
+	  is not used.
 
 endif # TFM_PARTITION_CRYPTO
 
diff --git a/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_hpf_gpio.overlay b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_hpf_gpio.overlay
new file mode 100644
index 00000000000..bd1ceb2f894
--- /dev/null
+++ b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_hpf_gpio.overlay
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&led0 {
+	gpios = <&hpf_gpio 9 GPIO_ACTIVE_HIGH>;
+};
diff --git a/samples/bluetooth/bap_broadcast_sink/sample.yaml b/samples/bluetooth/bap_broadcast_sink/sample.yaml
index 5d06dee0bf8..148b8b64169 100644
--- a/samples/bluetooth/bap_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_sink/sample.yaml
@@ -24,5 +24,7 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake b/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_broadcast_source/sample.yaml b/samples/bluetooth/bap_broadcast_source/sample.yaml
index 5e5b01d942d..5f745cd0895 100644
--- a/samples/bluetooth/bap_broadcast_source/sample.yaml
+++ b/samples/bluetooth/bap_broadcast_source/sample.yaml
@@ -36,5 +36,7 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_client/sample.yaml b/samples/bluetooth/bap_unicast_client/sample.yaml
index 7283090b878..44f32934ce9 100644
--- a/samples/bluetooth/bap_unicast_client/sample.yaml
+++ b/samples/bluetooth/bap_unicast_client/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_client/sysbuild.cmake b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_unicast_client/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_client/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/bap_unicast_server/sample.yaml b/samples/bluetooth/bap_unicast_server/sample.yaml
index 068f752b626..266ced73f66 100644
--- a/samples/bluetooth/bap_unicast_server/sample.yaml
+++ b/samples/bluetooth/bap_unicast_server/sample.yaml
@@ -22,5 +22,7 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_server/sysbuild.cmake b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/bap_unicast_server/sysbuild.cmake
+++ b/samples/bluetooth/bap_unicast_server/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/beacon/sample.yaml b/samples/bluetooth/beacon/sample.yaml
index f6f08790092..819ac3d3002 100644
--- a/samples/bluetooth/beacon/sample.yaml
+++ b/samples/bluetooth/beacon/sample.yaml
@@ -18,7 +18,9 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - ophelia4ev/nrf54l15/cpuapp
   sample.bluetooth.beacon-coex:
-    extra_args: CONF_FILE="prj-coex.conf"
+    extra_args:
+      - CONF_FILE="prj-coex.conf"
+      - SNIPPET="bt-ll-sw-split"
     harness: bluetooth
     platform_allow:
       - nrf52840dk/nrf52840
diff --git a/samples/bluetooth/cap_acceptor/sample.yaml b/samples/bluetooth/cap_acceptor/sample.yaml
index 824e744eeca..9061f44679f 100644
--- a/samples/bluetooth/cap_acceptor/sample.yaml
+++ b/samples/bluetooth/cap_acceptor/sample.yaml
@@ -26,5 +26,7 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/cap_acceptor/sysbuild.cmake b/samples/bluetooth/cap_acceptor/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/cap_acceptor/sysbuild.cmake
+++ b/samples/bluetooth/cap_acceptor/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/cap_initiator/sample.yaml b/samples/bluetooth/cap_initiator/sample.yaml
index b4f593c9912..e3e557f4830 100644
--- a/samples/bluetooth/cap_initiator/sample.yaml
+++ b/samples/bluetooth/cap_initiator/sample.yaml
@@ -26,5 +26,7 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/cap_initiator/sysbuild.cmake b/samples/bluetooth/cap_initiator/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/cap_initiator/sysbuild.cmake
+++ b/samples/bluetooth/cap_initiator/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml
index b7a118e6cdc..ffdf634c6e3 100644
--- a/samples/bluetooth/direction_finding_central/sample.yaml
+++ b/samples/bluetooth/direction_finding_central/sample.yaml
@@ -14,15 +14,24 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.central.aod:
+  sample.bluetooth.direction_finding.central.aod_with_controller:
     harness: bluetooth
-    extra_args: EXTRA_CONF_FILE="overlay-aod.conf"
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.central.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
index 8e6097de58a..c500cc80dce 100644
--- a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
@@ -12,14 +12,22 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless_rx.aod:
+  sample.bluetooth.direction_finding_connectionless_rx.aod_with_controller:
     harness: bluetooth
-    extra_args: EXTRA_CONF_FILE="overlay-aod.conf"
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-aod.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless_rx.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aod.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
index 78d21b2c95f..2a4fa93d19d 100644
--- a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
+++ b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
@@ -12,14 +12,22 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_connectionless.aoa:
+  sample.bluetooth.direction_finding_connectionless.aoa_with_controller:
     harness: bluetooth
-    extra_args: EXTRA_CONF_FILE="overlay-aoa.conf"
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-aoa.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_connectionless.aoa_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml
index f300cb415cc..01f612ad08a 100644
--- a/samples/bluetooth/direction_finding_peripheral/sample.yaml
+++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml
@@ -14,15 +14,24 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding.peripheral.aod:
+  sample.bluetooth.direction_finding.peripheral.aod_with_controller:
     harness: bluetooth
-    extra_args: EXTRA_CONF_FILE="overlay-aoa.conf"
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-aoa.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
-      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding.peripheral.aod_host_only:
+    harness: bluetooth
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..296e6836638
--- /dev/null
+++ b/samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1,2 @@
+# Increase stack size for Cracen driver.
+CONFIG_MAIN_STACK_SIZE=1024
diff --git a/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf b/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf
new file mode 100644
index 00000000000..1f7748e5cd7
--- /dev/null
+++ b/samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf
@@ -0,0 +1,33 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+
+# Host
+CONFIG_BT_BROADCASTER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_PER_ADV=y
+CONFIG_BT_PER_ADV_SYNC=y
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=n
+CONFIG_BT_LL_SOFTDEVICE=y
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
diff --git a/samples/bluetooth/hci_ipc/sample.yaml b/samples/bluetooth/hci_ipc/sample.yaml
index b758b254768..3763478b6b3 100644
--- a/samples/bluetooth/hci_ipc/sample.yaml
+++ b/samples/bluetooth/hci_ipc/sample.yaml
@@ -15,7 +15,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_broadcast.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -25,7 +27,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_receive.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -35,7 +39,9 @@ tests:
   sample.bluetooth.hci_ipc.bis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -45,7 +51,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_central.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_central-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -55,7 +63,9 @@ tests:
   sample.bluetooth.hci_ipc.iso_peripheral.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -65,7 +75,9 @@ tests:
   sample.bluetooth.hci_ipc.cis.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_cis-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -75,7 +87,9 @@ tests:
   sample.bluetooth.hci_ipc.iso.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_iso-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf5340_audio_dk/nrf5340/cpunet
@@ -99,6 +113,7 @@ tests:
     extra_args:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
@@ -109,13 +124,16 @@ tests:
       - CONF_FILE="nrf5340_cpunet_df-bt_ll_sw_split.conf"
       - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay"
       - CONFIG_BT_CTLR_PHY_CODED=n
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
   sample.bluetooth.hci_ipc.mesh.bt_ll_sw_split:
     harness: bluetooth
     tags: bluetooth
-    extra_args: CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+    extra_args:
+      - CONF_FILE="nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
     platform_allow: nrf5340dk/nrf5340/cpunet
     integration_platforms:
       - nrf5340dk/nrf5340/cpunet
diff --git a/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf b/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf
new file mode 100644
index 00000000000..e6749ae6399
--- /dev/null
+++ b/samples/bluetooth/hci_pwr_ctrl/sysbuild/hci_rpmsg.conf
@@ -0,0 +1 @@
+CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
index b555a74ac5b..97ad6c561b2 100644
--- a/samples/bluetooth/hci_uart/sample.yaml
+++ b/samples/bluetooth/hci_uart/sample.yaml
@@ -20,7 +20,9 @@ tests:
     platform_allow: nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -29,7 +31,9 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
     tags:
@@ -40,7 +44,9 @@ tests:
     platform_allow: nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -50,7 +56,9 @@ tests:
   sample.bluetooth.hci_uart.nrf5340_netcore.df.iq_report:
     harness: bluetooth
     platform_allow: nrf5340dk/nrf5340/cpunet
-    extra_args: DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+    extra_args:
+      - DTC_OVERLAY_FILE=./boards/nrf5340dk_nrf5340_cpunet_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     extra_configs:
       - CONFIG_BT_CTLR_DF=y
       - CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT=y
@@ -84,6 +92,7 @@ tests:
     extra_args:
       - EXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
@@ -95,6 +104,7 @@ tests:
     extra_args:
       - EXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
+      - SNIPPET="bt-ll-sw-split"
     tags:
       - uart
       - bluetooth
diff --git a/samples/bluetooth/hci_vs_scan_req/sample.yaml b/samples/bluetooth/hci_vs_scan_req/sample.yaml
index 245a83aa0d9..49526522d16 100644
--- a/samples/bluetooth/hci_vs_scan_req/sample.yaml
+++ b/samples/bluetooth/hci_vs_scan_req/sample.yaml
@@ -9,4 +9,6 @@ tests:
       - nrf52dk/nrf52832
     extra_configs:
       - CONFIG_BT_LL_SW_SPLIT=y
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/iso_central/sample.yaml b/samples/bluetooth/iso_central/sample.yaml
index 3a7dedd404a..57254ee809a 100644
--- a/samples/bluetooth/iso_central/sample.yaml
+++ b/samples/bluetooth/iso_central/sample.yaml
@@ -11,11 +11,11 @@ tests:
   sample.bluetooth.iso_central.bt_ll_sw_split:
     harness: bluetooth
     platform_allow:
-      - qemu_cortex_m3
-      - qemu_x86
       - nrf52_bsim
       - nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/mesh/boards/qemu_x86.conf b/samples/bluetooth/mesh/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/samples/bluetooth/mesh/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh/prj.conf b/samples/bluetooth/mesh/prj.conf
index 14b19316a86..cd7d6532b61 100644
--- a/samples/bluetooth/mesh/prj.conf
+++ b/samples/bluetooth/mesh/prj.conf
@@ -5,7 +5,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 CONFIG_HWINFO=y
 
 CONFIG_BT=y
diff --git a/samples/bluetooth/mesh_demo/boards/qemu_x86.conf b/samples/bluetooth/mesh_demo/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/samples/bluetooth/mesh_demo/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_demo/prj.conf b/samples/bluetooth/mesh_demo/prj.conf
index bcb738ae5bd..b7016b02c65 100644
--- a/samples/bluetooth/mesh_demo/prj.conf
+++ b/samples/bluetooth/mesh_demo/prj.conf
@@ -31,7 +31,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 # Limit the number of key slots in PSA Crypto core to reduce
 # RAM footprint
diff --git a/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf b/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/samples/bluetooth/mesh_provisioner/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/samples/bluetooth/mesh_provisioner/prj.conf b/samples/bluetooth/mesh_provisioner/prj.conf
index 10949c5480d..24176780516 100644
--- a/samples/bluetooth/mesh_provisioner/prj.conf
+++ b/samples/bluetooth/mesh_provisioner/prj.conf
@@ -45,7 +45,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 #CONFIG_BT_MESH_LOG_LEVEL_DBG=y
 #CONFIG_BT_MESH_SETTINGS_LOG_LEVEL_DBG=y
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
index d7c816ee5b7..901d40b00d4 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
index 2523aac8ea7..d5d260789ff 100644
--- a/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
index 80c90704211..1d2e31306e2 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
+++ b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
@@ -23,5 +23,7 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+    extra_args:
+      - EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
+      - SNIPPET="bt-ll-sw-split"
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
index d3bf7be5b6c..e0a7fd9d175 100644
--- a/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
+++ b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake
@@ -18,6 +18,10 @@ if(NOT("${SB_CONFIG_NET_CORE_BOARD}" STREQUAL ""))
 	 CACHE INTERNAL ""
 	)
 
+	list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
+	list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
+	set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
+
 	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
 endif()
 
diff --git a/samples/boards/nordic/mesh/onoff-app/prj.conf b/samples/boards/nordic/mesh/onoff-app/prj.conf
index 0e67042b265..0783579e795 100644
--- a/samples/boards/nordic/mesh/onoff-app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff-app/prj.conf
@@ -9,7 +9,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=600
 
diff --git a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
index 3bb984208c7..96b5466b4a1 100644
--- a/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
+++ b/samples/boards/nordic/mesh/onoff_level_lighting_vnd_app/prj.conf
@@ -7,7 +7,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT_OBSERVER=y
 CONFIG_BT_BROADCASTER=y
diff --git a/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf b/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/boards/nordic/nrf53_sync_rtc/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/boards/nordic/nrf_ironside/update/CMakeLists.txt b/samples/boards/nordic/nrf_ironside/update/CMakeLists.txt
new file mode 100644
index 00000000000..b3aa8c35c2a
--- /dev/null
+++ b/samples/boards/nordic/nrf_ironside/update/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(ironside_se_update)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/samples/boards/nordic/nrf_ironside/update/Kconfig b/samples/boards/nordic/nrf_ironside/update/Kconfig
new file mode 100644
index 00000000000..702b943ff60
--- /dev/null
+++ b/samples/boards/nordic/nrf_ironside/update/Kconfig
@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config UPDATE_BLOB_ADDRESS
+	hex "Address of the update blob"
+	default 0xe100000
+	help
+	  Address of the update blob. The default value matches the placement of the
+	  update blobs delivered with the IRONside SE firmware.
+
+source "Kconfig.zephyr"
diff --git a/samples/boards/nordic/nrf_ironside/update/README.rst b/samples/boards/nordic/nrf_ironside/update/README.rst
new file mode 100644
index 00000000000..2f44feedf06
--- /dev/null
+++ b/samples/boards/nordic/nrf_ironside/update/README.rst
@@ -0,0 +1,74 @@
+.. zephyr:code-sample:: nrf_ironside_update
+   :name: Nordic IRONside SE firmware update
+
+   Update the Nordic IRONside SE firmware.
+
+Overview
+********
+
+The Nordic IRONside SE Update sample updates the IRONside SE firmware on a SoC that already has IRONside SE installed.
+It can update both the main image and the recovery image of IRONside SE using the IRONside SE firmware release ZIP file.
+
+Update procedure
+****************
+
+The update procedure works as follows:
+
+1. The application invokes the IRONside SE update service and passes the parameters that correspond to the location of the HEX file of the IRONside SE firmware update.
+
+#. The application prints the return value of the service call and outputs information from the update HEX file.
+
+#. After the service call completes, the IRONside SE firmware updates the internal state of the device.
+
+#. The firmware installs the update during the next device boot.
+   This operation can take several seconds.
+
+Once the operation has completed, you can read the boot report to verify that the update has taken place.
+
+Building and running the application for nrf54h20dk/nrf54h20/cpuapp/iron
+************************************************************************
+
+.. note::
+   You can use this application only when there is already a version of IRONside SE installed on the device.
+
+1. Unzip the IRONside SE release ZIP to get the update hex file:
+
+   .. code-block:: console
+
+      unzip nrf54h20_soc_binaries_v.*.zip
+
+#. Program the appropriate update hex file from the release ZIP using one (not both) of the following commands:
+
+   a) To update IRONside SE firmware:
+
+      .. code-block:: console
+
+         nrfutil device program --traits jlink --firmware update/ironside_se_update.hex
+
+   b) To update IRONside SE recovery firmware:
+
+      .. code-block:: console
+
+         nrfutil device program --traits jlink --firmware update/ironside_se_recovery_update.hex
+
+#. Build and program the application:
+
+   .. zephyr-app-commands::
+      :zephyr-app: samples/boards/nordic/nrf_ironside/update
+      :board: nrf54h20dk/nrf54h20/cpuapp/iron
+      :goals: flash
+
+#. Trigger a reset:
+
+.. code-block:: console
+
+   nrfutil device reset --reset-kind RESET_PIN --traits jlink
+
+#. Check that the new version is installed:
+
+   .. code-block:: console
+
+      # Read the version fields from the boot report
+      nrfutil x-read --direct --address 0x2f88fd04 --bytes 16 --traits jlink
+      # Read the update status in the boot report
+      nrfutil x-read --direct --address 0x2f88fd24 --bytes 4 --traits jlink
diff --git a/samples/boards/nordic/nrf_ironside/update/prj.conf b/samples/boards/nordic/nrf_ironside/update/prj.conf
new file mode 100644
index 00000000000..8682307eca6
--- /dev/null
+++ b/samples/boards/nordic/nrf_ironside/update/prj.conf
@@ -0,0 +1,3 @@
+CONFIG_LOG=y
+
+CONFIG_NRF_IRONSIDE_UPDATE_SERVICE=y
diff --git a/samples/boards/nordic/nrf_ironside/update/sample.yaml b/samples/boards/nordic/nrf_ironside/update/sample.yaml
new file mode 100644
index 00000000000..af3c24624b8
--- /dev/null
+++ b/samples/boards/nordic/nrf_ironside/update/sample.yaml
@@ -0,0 +1,12 @@
+sample:
+  name: Nordic IRONside SE update service
+  description: Demonstrates how to update the Nordic IRONside SE firmware
+common:
+  build_only: true
+  tags: nrf_ironside
+  integration_platforms:
+    - nrf54h20dk/nrf54h20/cpuapp/iron
+
+tests:
+  sample.boards.nordic.nrf_ironside.update:
+    platform_allow: nrf54h20dk/nrf54h20/cpuapp/iron
diff --git a/samples/boards/nordic/nrf_ironside/update/src/main.c b/samples/boards/nordic/nrf_ironside/update/src/main.c
new file mode 100644
index 00000000000..09513497de9
--- /dev/null
+++ b/samples/boards/nordic/nrf_ironside/update/src/main.c
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/drivers/firmware/nrf_ironside/update.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(app, LOG_LEVEL_INF);
+
+int main(void)
+{
+	int err;
+	const struct ironside_update_blob *update = (void *)CONFIG_UPDATE_BLOB_ADDRESS;
+
+	err = ironside_update(update);
+	LOG_INF("IRONside update retval: 0x%x", err);
+
+	if (err == 0) {
+		LOG_HEXDUMP_INF(update->manifest, sizeof(update->manifest), "Update manifest:");
+		LOG_HEXDUMP_INF(update->pubkey, sizeof(update->pubkey), "Public key:");
+		LOG_HEXDUMP_INF(update->signature, sizeof(update->signature), "Signature:");
+		LOG_HEXDUMP_INF(update->firmware, 8, "First 8 bytes of encrypted fw:");
+		LOG_INF("Reboot the device to trigger the update");
+	} else {
+		LOG_ERR("The request to update failed");
+	}
+
+	return 0;
+}
diff --git a/samples/boards/nordic/system_off/sample.yaml b/samples/boards/nordic/system_off/sample.yaml
index 81c2f0f262b..6e17223e12b 100644
--- a/samples/boards/nordic/system_off/sample.yaml
+++ b/samples/boards/nordic/system_off/sample.yaml
@@ -42,7 +42,7 @@ tests:
       ordered: true
       regex:
         - "system off demo"
-        - "Retained data: INVALID"
+        - "Retained data: valid"
         - "Boot count: 1"
         - "Off count: 0"
         - "Active Ticks:"
@@ -87,7 +87,7 @@ tests:
       ordered: true
       regex:
         - "system off demo"
-        - "Retained data: INVALID"
+        - "Retained data: valid"
         - "Boot count: 1"
         - "Off count: 0"
         - "Active Ticks:"
@@ -134,7 +134,7 @@ tests:
       ordered: true
       regex:
         - "system off demo"
-        - "Retained data: INVALID"
+        - "Retained data: valid"
         - "Boot count: 1"
         - "Off count: 0"
         - "Active Ticks:"
diff --git a/samples/boards/nordic/system_off/src/main.c b/samples/boards/nordic/system_off/src/main.c
index 0b0cbf3cb0b..d119eff87da 100644
--- a/samples/boards/nordic/system_off/src/main.c
+++ b/samples/boards/nordic/system_off/src/main.c
@@ -18,6 +18,8 @@
 #include <zephyr/sys/poweroff.h>
 #include <zephyr/sys/util.h>
 
+#define NON_WAKEUP_RESET_REASON (RESET_PIN | RESET_SOFTWARE | RESET_POR | RESET_DEBUG)
+
 #if defined(CONFIG_GRTC_WAKEUP_ENABLE)
 #include <zephyr/drivers/timer/nrf_grtc_timer.h>
 #define DEEP_SLEEP_TIME_S 2
@@ -29,15 +31,14 @@ static const struct gpio_dt_spec sw0 = GPIO_DT_SPEC_GET(DT_ALIAS(sw0), gpios);
 static const struct device *comp_dev = DEVICE_DT_GET(DT_NODELABEL(comp));
 #endif
 
-void print_reset_cause(void)
+void print_reset_cause(uint32_t reset_cause)
 {
-	uint32_t reset_cause;
-
-	hwinfo_get_reset_cause(&reset_cause);
 	if (reset_cause & RESET_DEBUG) {
 		printf("Reset by debugger.\n");
 	} else if (reset_cause & RESET_CLOCK) {
 		printf("Wakeup from System OFF by GRTC.\n");
+	} else if (reset_cause & RESET_LOW_POWER_WAKE) {
+		printf("Wakeup from System OFF by GPIO.\n");
 	} else  {
 		printf("Other wake up cause 0x%08X.\n", reset_cause);
 	}
@@ -46,6 +47,7 @@ void print_reset_cause(void)
 int main(void)
 {
 	int rc;
+	uint32_t reset_cause;
 	const struct device *const cons = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 
 	if (!device_is_ready(cons)) {
@@ -54,11 +56,19 @@ int main(void)
 	}
 
 	printf("\n%s system off demo\n", CONFIG_BOARD);
-	print_reset_cause();
+	hwinfo_get_reset_cause(&reset_cause);
+	print_reset_cause(reset_cause);
 
 	if (IS_ENABLED(CONFIG_APP_USE_RETAINED_MEM)) {
 		bool retained_ok = retained_validate();
 
+		if (reset_cause & NON_WAKEUP_RESET_REASON) {
+			retained.boots = 0;
+			retained.off_count = 0;
+			retained.uptime_sum = 0;
+			retained.uptime_latest = 0;
+			retained_ok = true;
+		}
 		/* Increment for this boot attempt and update. */
 		retained.boots += 1;
 		retained_update();
diff --git a/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index bf53616d928..24cce679375 100644
--- a/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/drivers/adc/adc_sequence/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -45,6 +45,7 @@
 		zephyr,reference = "ADC_REF_INTERNAL";
 		zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
 		zephyr,input-positive = <NRF_SAADC_AIN9>; /* P9.01 */
+		zephyr,vref-mv = <3686>; /* 3.6V * 1024 */
 		zephyr,resolution = <12>;
 		zephyr,oversampling = <8>;
 	};
diff --git a/samples/drivers/adc/adc_sequence/src/main.c b/samples/drivers/adc/adc_sequence/src/main.c
index d80a09a601e..aa6d64d7a72 100644
--- a/samples/drivers/adc/adc_sequence/src/main.c
+++ b/samples/drivers/adc/adc_sequence/src/main.c
@@ -64,7 +64,7 @@ int main(void)
 			printf("Could not setup channel #%d (%d)\n", i, err);
 			return 0;
 		}
-		if (channel_cfgs[i].reference == ADC_REF_INTERNAL) {
+		if ((vrefs_mv[i] == 0) && (channel_cfgs[i].reference == ADC_REF_INTERNAL)) {
 			vrefs_mv[i] = adc_ref_internal(adc);
 		}
 	}
diff --git a/samples/drivers/mbox/sysbuild.conf b/samples/drivers/mbox/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/drivers/mbox/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/net/cloud/mqtt_azure/prj.conf b/samples/net/cloud/mqtt_azure/prj.conf
index b857f7e4317..87fce73d774 100644
--- a/samples/net/cloud/mqtt_azure/prj.conf
+++ b/samples/net/cloud/mqtt_azure/prj.conf
@@ -35,6 +35,9 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=10240
 CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
 CONFIG_MBEDTLS_SHA1=y
 CONFIG_MBEDTLS_SHA384=y
+CONFIG_MBEDTLS_RSA_C=y
+CONFIG_MBEDTLS_PKCS1_V15=y
+CONFIG_MBEDTLS_PKCS1_V21=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
 CONFIG_MBEDTLS_ECDH_C=y
diff --git a/samples/net/dns_resolve/Kconfig.sysbuild b/samples/net/dns_resolve/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/dns_resolve/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/ipv4_autoconf/Kconfig.sysbuild b/samples/net/ipv4_autoconf/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/ipv4_autoconf/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/lwm2m_client/Kconfig.sysbuild b/samples/net/lwm2m_client/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/lwm2m_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/lwm2m_client/overlay-nrf91x.conf b/samples/net/lwm2m_client/overlay-nrf91x.conf
new file mode 100644
index 00000000000..9597791c10e
--- /dev/null
+++ b/samples/net/lwm2m_client/overlay-nrf91x.conf
@@ -0,0 +1,53 @@
+# Configuration file for nRF91x
+# This file is merged with prj.conf in the application folder, and options
+# set here will take precedence if they are present in both files.
+
+# General
+CONFIG_MAIN_STACK_SIZE=4096
+
+CONFIG_NET_SOCKETS=y
+CONFIG_NET_NATIVE=y
+CONFIG_NET_SOCKETS_OFFLOAD=y
+
+CONFIG_NET_CONFIG_MY_IPV6_ADDR=""
+CONFIG_NET_CONFIG_PEER_IPV6_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_CONFIG_MY_IPV4_GW=""
+
+CONFIG_NET_CONFIG_NEED_IPV6=n
+CONFIG_NET_CONFIG_NEED_IPV4=n
+CONFIG_NET_CONFIG_AUTO_INIT=n
+
+# Modem related configurations
+CONFIG_NRF_MODEM_LIB_NET_IF=y
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_DOWN=n
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_CONNECT=n
+CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_START=n
+CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=y
+
+CONFIG_LTE_LINK_CONTROL_LOG_LEVEL_DBG=n
+CONFIG_NRF_MODEM_LIB_NET_IF_LOG_LEVEL_DBG=n
+
+# Disable Duplicate Address Detection (DAD)
+# due to not being properly implemented for offloaded interfaces.
+CONFIG_NET_IPV6_NBR_CACHE=n
+CONFIG_NET_IPV6_MLD=n
+
+# Zephyr NET Connection Manager and Connectivity layer.
+CONFIG_NET_CONNECTION_MANAGER=y
+CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
+
+CONFIG_LWM2M_APP_ID="nrf91x"
+CONFIG_LWM2M_APP_SERVER="coaps://leshan.eclipseprojects.io:5684"
+CONFIG_LWM2M_DNS_SUPPORT=y
+
+## Enable DTLS support
+CONFIG_LWM2M_DTLS_SUPPORT=y
+CONFIG_LWM2M_TLS_SESSION_CACHING=y
+CONFIG_LWM2M_DTLS_CID=y
+CONFIG_TLS_CREDENTIALS=y
+
+## Crypto
+CONFIG_OBERON_BACKEND=y
+CONFIG_NORDIC_SECURITY_BACKEND=y
+CONFIG_MBEDTLS_SHA256_C=y
diff --git a/samples/net/mdns_responder/Kconfig.sysbuild b/samples/net/mdns_responder/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/mdns_responder/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_publisher/Kconfig.sysbuild b/samples/net/mqtt_publisher/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/mqtt_publisher/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/mqtt_sn_publisher/Kconfig.sysbuild b/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/mqtt_sn_publisher/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/big_http_download/prj.conf b/samples/net/sockets/big_http_download/prj.conf
index a406f314dfb..8677e7113e4 100644
--- a/samples/net/sockets/big_http_download/prj.conf
+++ b/samples/net/sockets/big_http_download/prj.conf
@@ -3,6 +3,7 @@ CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_MD=y
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 CONFIG_MAIN_STACK_SIZE=2536
 
 # Networking config
diff --git a/samples/net/sockets/coap_server/Kconfig.sysbuild b/samples/net/sockets/coap_server/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/coap_server/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_async/Kconfig.sysbuild b/samples/net/sockets/echo_async/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/echo_async/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_client/Kconfig.sysbuild b/samples/net/sockets/echo_client/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/echo_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/echo_server/Kconfig.sysbuild b/samples/net/sockets/echo_server/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/echo_server/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/http_get/Kconfig.sysbuild b/samples/net/sockets/http_get/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/http_get/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/sockets/sntp_client/Kconfig.sysbuild b/samples/net/sockets/sntp_client/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/sockets/sntp_client/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/syslog_net/Kconfig.sysbuild b/samples/net/syslog_net/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/syslog_net/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/telnet/Kconfig.sysbuild b/samples/net/telnet/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/telnet/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/wifi/Kconfig.sysbuild b/samples/net/wifi/Kconfig.sysbuild
new file mode 100644
index 00000000000..158551060c5
--- /dev/null
+++ b/samples/net/wifi/Kconfig.sysbuild
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config WIFI_NRF70
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/net/wifi/shell/sample.yaml b/samples/net/wifi/shell/sample.yaml
index d39379bd613..75b751c0acf 100644
--- a/samples/net/wifi/shell/sample.yaml
+++ b/samples/net/wifi/shell/sample.yaml
@@ -58,6 +58,7 @@ tests:
       - nrf7002dk/nrf5340/cpuapp/nrf7001
   sample.net.wifi.nrf7002ek:
     extra_args:
+      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_BUILD_ONLY_NO_BLOBS=y
       - SHIELD=nrf7002ek
     platform_allow:
@@ -69,6 +70,7 @@ tests:
   sample.net.wifi.nrf7002eb:
     extra_args:
       - CONFIG_NRF70_UTIL=y
+      - SB_CONFIG_WIFI_NRF70=y
       - CONFIG_BUILD_ONLY_NO_BLOBS=y
       - SHIELD=nrf7002eb
     platform_allow:
diff --git a/samples/net/wifi/test_certs/rsa3k/ca.pem b/samples/net/wifi/test_certs/rsa3k/ca.pem
index b401b39ae33..2b872d2e30d 100644
--- a/samples/net/wifi/test_certs/rsa3k/ca.pem
+++ b/samples/net/wifi/test_certs/rsa3k/ca.pem
@@ -1,27 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEozCCAwugAwIBAgIJAME6wWYWgog4MA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU1WhcNMjkwODI0MDAyMjU1WjBdMQswCQYDVQQGEwJVUzEUMBIGA1UEBwwL
-U2FudGEgQ2xhcmExFzAVBgNVBAoMDldpLUZpIEFsbGlhbmNlMR8wHQYDVQQDDBZT
-dWl0ZSBCIFJTQSAzayBSb290IENBMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
-igKCAYEAtzzg4P4NDIPaRGftX3s0f5ZDuEXTSOYOS12vcNRiRy6rMlCTzzYTFHve
-caTiBRJ9Zw4apvzYK/xVSKNN/8rHE2/kojjXnpeTPrmpduSwlXKyE+gDfmWNbd5t
-8Swa/1y4FisJPVbPBxAH4s58HjKqMrLbogPTZfcRZwGBnjvwvlbdAV37biXrv5+h
-YZbiD1u/DNzQe2LezwkbjAqmJExfUyq85D7Nmyci4gjSWA/y/AEtb0R3q2bf5EHh
-bl+2DAdJuhqup2EsGI0RrekuXokNe0K3WMfGgOZpY3nsVuRXUbnQ5fm/Li5movsv
-MWBx7xRC9pvFhtb94sG2XH7bfYTkgxaphWWIjVcuc95w5CEt5TExGovZ4NZMl9CP
-vgpxsHUx/dLg84zkWA1RKXOe+2OGe2RsajLdyTgq4i/89kScKQmmKKenTis3jjmR
-O++I8rngrz+pV49WGWsTRnkwIqNaV28zfKMf2etTzOI7WyR0SqfhznV8iluYVnfd
-eTK19fApAgMBAAGjZjBkMB0GA1UdDgQWBBS7O/zgLUEj6W41+XoTcfsOLPxkljAf
-BgNVHSMEGDAWgBS7O/zgLUEj6W41+XoTcfsOLPxkljASBgNVHRMBAf8ECDAGAQH/
-AgEAMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwFAAOCAYEAWinoNLzdFi0f
-qsR+kkqckAj5k1uH04EqhZip4yLU8VzZUz0KPN4SlgPWys+tzvRHo7AX3VYC1AqM
-+6IR5b8Wff40Sm5MIUao07mkM3aJfhKfe63/zw7YPSPWfyiiN7899yLYCzlQjwM8
-Wp4MEXdkoCQqQawnPMr/yKjGJt6Clg/nKFT8qKVSQMoGTo3QEZveg4V7RraLlEn1
-bx8IExQX9OWww9XspuJAl/oxSj2JUbs3kiZemSjrqtBCIeJgDnLeYW+YDxUh4vG0
-agpidNa3Y21k8IGv66jdvEbTair5Bg+VFVZC5PaN8v/B+JwGg6Gl2iVfW7nJskI9
-+D968cXhnCRWLawRJtQTz4nQspC/Kc2qLAfEmeat/jFdsLC4tfPdA/HjrL3eb1Bv
-oJolgywVIFaMng1WO5FYV0jpMD1BpIkfWAdrXcPGWkMwTbGHvb0Q6/CH7KfPRtyo
-iEfxujGQSAjvwD39Hcp8XDtOx1ugH8SoUMCC6ZlrTUwJPMCXui0Z
+MIIEBzCCAu+gAwIBAgIUK8+d+8IOzeX+DP3VSvdF3lHiCdcwDQYJKoZIhvcNAQEL
+BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxJjAkBgNVBAMMHUV4YW1wbGUg
+Q2VydGlmaWNhdGUgQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
+cGxlLm9yZzAeFw0yNDEwMDgxMDI0MDZaFw0zNDEwMDYxMDI0MDZaMIGSMQswCQYD
+VQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUxFDAS
+BgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRl
+IEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWKIwjdRIp9IrpZELN/ZsN13Xj
+qQI6n086PNJ7BZfLi0+tD164rmxFk2eukNNksFCPhvMkqUxouGhc4mJjeivvrZxR
+oT3cblOQIkkdEci6iTKC2E1a20W/Ur7cTXoIsnKwjiUjXk+cujkrZu4fcHX+O4vy
+wTd5tEbhmifT/4u5nN8U2vBcEZqkGHOCp30VZSxtlGwqp4lc+tVziF3uFViW9MXk
+3bVt+s1E7ztwG7+WBgVlLYe3CNSWkMxfyYBafH/l7iep6AFjoTn1z3AAjYi7IUNN
+0JkW8MTgafRQIu4QsV5luq/Tiar2vwAm/GNgUJdSzUKARsfQzb/XTIgnLQqtAgMB
+AAGjUzBRMB0GA1UdDgQWBBSijSC03/Thi6EOdM91V33zsbQpgzAfBgNVHSMEGDAW
+gBSijSC03/Thi6EOdM91V33zsbQpgzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQAvKEfmCDoMTKC6bfP6DSs+MSAGc5tCr6w6cz2AKNJ2fOMhkq55
+JF47oBBGm9SdTB6Jqo6c109Ps69/+LMtEEGwvzL0RL0WAuTYGo6sudm9hj/jDHZh
+pAqi/2BQQeVgTa6oW0jtNPFe+/cobXo9TJ7wECGrhvVbmfl5ZPc0YVOIjjR0/LhL
+q7lqPAlJ5vx0WvsX+QReN97we8vD0x1D3mCySJTi3Irh+grE0yJOSN2fa7cyqi9+
+vSiNUB1eUgQwrO+S8ZazYNvAZXC2Xf4WB4SOifJD73pYPAdwOejc0FA+zfEKa/6/
+vTUs8cIhlmDWO+BEoc9wygMKMmhT5s7/T5Bv
 -----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa3k/ca2.pem b/samples/net/wifi/test_certs/rsa3k/ca2.pem
index b401b39ae33..2b872d2e30d 100644
--- a/samples/net/wifi/test_certs/rsa3k/ca2.pem
+++ b/samples/net/wifi/test_certs/rsa3k/ca2.pem
@@ -1,27 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEozCCAwugAwIBAgIJAME6wWYWgog4MA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU1WhcNMjkwODI0MDAyMjU1WjBdMQswCQYDVQQGEwJVUzEUMBIGA1UEBwwL
-U2FudGEgQ2xhcmExFzAVBgNVBAoMDldpLUZpIEFsbGlhbmNlMR8wHQYDVQQDDBZT
-dWl0ZSBCIFJTQSAzayBSb290IENBMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
-igKCAYEAtzzg4P4NDIPaRGftX3s0f5ZDuEXTSOYOS12vcNRiRy6rMlCTzzYTFHve
-caTiBRJ9Zw4apvzYK/xVSKNN/8rHE2/kojjXnpeTPrmpduSwlXKyE+gDfmWNbd5t
-8Swa/1y4FisJPVbPBxAH4s58HjKqMrLbogPTZfcRZwGBnjvwvlbdAV37biXrv5+h
-YZbiD1u/DNzQe2LezwkbjAqmJExfUyq85D7Nmyci4gjSWA/y/AEtb0R3q2bf5EHh
-bl+2DAdJuhqup2EsGI0RrekuXokNe0K3WMfGgOZpY3nsVuRXUbnQ5fm/Li5movsv
-MWBx7xRC9pvFhtb94sG2XH7bfYTkgxaphWWIjVcuc95w5CEt5TExGovZ4NZMl9CP
-vgpxsHUx/dLg84zkWA1RKXOe+2OGe2RsajLdyTgq4i/89kScKQmmKKenTis3jjmR
-O++I8rngrz+pV49WGWsTRnkwIqNaV28zfKMf2etTzOI7WyR0SqfhznV8iluYVnfd
-eTK19fApAgMBAAGjZjBkMB0GA1UdDgQWBBS7O/zgLUEj6W41+XoTcfsOLPxkljAf
-BgNVHSMEGDAWgBS7O/zgLUEj6W41+XoTcfsOLPxkljASBgNVHRMBAf8ECDAGAQH/
-AgEAMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwFAAOCAYEAWinoNLzdFi0f
-qsR+kkqckAj5k1uH04EqhZip4yLU8VzZUz0KPN4SlgPWys+tzvRHo7AX3VYC1AqM
-+6IR5b8Wff40Sm5MIUao07mkM3aJfhKfe63/zw7YPSPWfyiiN7899yLYCzlQjwM8
-Wp4MEXdkoCQqQawnPMr/yKjGJt6Clg/nKFT8qKVSQMoGTo3QEZveg4V7RraLlEn1
-bx8IExQX9OWww9XspuJAl/oxSj2JUbs3kiZemSjrqtBCIeJgDnLeYW+YDxUh4vG0
-agpidNa3Y21k8IGv66jdvEbTair5Bg+VFVZC5PaN8v/B+JwGg6Gl2iVfW7nJskI9
-+D968cXhnCRWLawRJtQTz4nQspC/Kc2qLAfEmeat/jFdsLC4tfPdA/HjrL3eb1Bv
-oJolgywVIFaMng1WO5FYV0jpMD1BpIkfWAdrXcPGWkMwTbGHvb0Q6/CH7KfPRtyo
-iEfxujGQSAjvwD39Hcp8XDtOx1ugH8SoUMCC6ZlrTUwJPMCXui0Z
+MIIEBzCCAu+gAwIBAgIUK8+d+8IOzeX+DP3VSvdF3lHiCdcwDQYJKoZIhvcNAQEL
+BQAwgZIxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIDAZSYWRpdXMxEjAQBgNVBAcMCVNv
+bWV3aGVyZTEUMBIGA1UECgwLRXhhbXBsZSBJbmMxJjAkBgNVBAMMHUV4YW1wbGUg
+Q2VydGlmaWNhdGUgQXV0aG9yaXR5MSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFt
+cGxlLm9yZzAeFw0yNDEwMDgxMDI0MDZaFw0zNDEwMDYxMDI0MDZaMIGSMQswCQYD
+VQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hlcmUxFDAS
+BgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRpZmljYXRl
+IEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5vcmcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWKIwjdRIp9IrpZELN/ZsN13Xj
+qQI6n086PNJ7BZfLi0+tD164rmxFk2eukNNksFCPhvMkqUxouGhc4mJjeivvrZxR
+oT3cblOQIkkdEci6iTKC2E1a20W/Ur7cTXoIsnKwjiUjXk+cujkrZu4fcHX+O4vy
+wTd5tEbhmifT/4u5nN8U2vBcEZqkGHOCp30VZSxtlGwqp4lc+tVziF3uFViW9MXk
+3bVt+s1E7ztwG7+WBgVlLYe3CNSWkMxfyYBafH/l7iep6AFjoTn1z3AAjYi7IUNN
+0JkW8MTgafRQIu4QsV5luq/Tiar2vwAm/GNgUJdSzUKARsfQzb/XTIgnLQqtAgMB
+AAGjUzBRMB0GA1UdDgQWBBSijSC03/Thi6EOdM91V33zsbQpgzAfBgNVHSMEGDAW
+gBSijSC03/Thi6EOdM91V33zsbQpgzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQAvKEfmCDoMTKC6bfP6DSs+MSAGc5tCr6w6cz2AKNJ2fOMhkq55
+JF47oBBGm9SdTB6Jqo6c109Ps69/+LMtEEGwvzL0RL0WAuTYGo6sudm9hj/jDHZh
+pAqi/2BQQeVgTa6oW0jtNPFe+/cobXo9TJ7wECGrhvVbmfl5ZPc0YVOIjjR0/LhL
+q7lqPAlJ5vx0WvsX+QReN97we8vD0x1D3mCySJTi3Irh+grE0yJOSN2fa7cyqi9+
+vSiNUB1eUgQwrO+S8ZazYNvAZXC2Xf4WB4SOifJD73pYPAdwOejc0FA+zfEKa/6/
+vTUs8cIhlmDWO+BEoc9wygMKMmhT5s7/T5Bv
 -----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa3k/client-key.pem b/samples/net/wifi/test_certs/rsa3k/client-key.pem
index 893280f7ba6..6ab70da2452 100644
--- a/samples/net/wifi/test_certs/rsa3k/client-key.pem
+++ b/samples/net/wifi/test_certs/rsa3k/client-key.pem
@@ -1,40 +1,30 @@
------BEGIN PRIVATE KEY-----
-MIIG/AIBADANBgkqhkiG9w0BAQEFAASCBuYwggbiAgEAAoIBgQCm2jz5DYHRvaSF
-4F+A7V1FgBaJdjIQNWZ7e/rpNuAzkMDNdGJKzW/JtuUDgq6Ttf4RnajIhplA/h3A
-1dGLpH66RK48hjrBW5BLpl0RPtPZLmsLnI3/cbUnj3FpFssvfBnmjhNCGl0KC6kX
-gmKOpQLprXYncCvrt8DG7looKJ8FdGx3Mxmi7m9P/B9hIu2MD0WVAF+Ec+MQyy43
-MEtl16bMkui+MZKTWNE/8opcCVxE4oEFMw9TCToR5+IS6uwMhE/yN0Lx6hKuptZ0
-TYt4Y7XsIYHfFJ3L47bsbQuZh3pVorTWlpQmUbs1n1f/d+8SNf29Mipx+nvKBPJl
-zUtnqI3f7lmOZ/X480JRTvZODM6Hzflc1//A6RvgJvP7oYlXTX+SZBJKkZ079tB5
-AoXmsCxw8ePCMf1kVjlxVLcko8LEa30MjCrUqCJ61PINhEgd+0JnV14csYAMZKh0
-2K2v26HPGyZxAXoJ2/x75zW152jfLTkF6fE2EGcx7Ah9UtmNmM0CAwEAAQKCAYAl
-DGBtjKo+wDU/5MpP/mSvgfl/HFeRccoHsUfNcPnneUTWWflZUrR3vbysQuAwvEBl
-+PP5UqnE3KgOoWud7jCVe5qUpdl2BbbMlWwk4CZ6Gux575E4Hy9yUU+FXiJPsOav
-YuyzyNbP3Db3mWP4+HrlGDccGrQl6u9LPLGYKSzmMSvEa/xNSVQ+FmWBVBga+Wkh
-5KtQ5cqNeBATAQ481t2anyQ+1xMM1LPh1yERvqJWSVUMqoHElk/mme6A9NjlDpu2
-CSl82w/qFP/psxZ+66+ZKSIrUCWAiKPboDmAJeSsAsHKol5z0l7l9AFDwoh3vM2P
-dmBZ63af3gtCdx877r/nBlwiemwlgaAxh2HLJPtC6OfzffMcdUbO4AZ5SDutF/kp
-yAgweqBfpdJiQhOTsQvGzB007b9szCOXdOs+3KXjyakch9XFM6KR7KKpCTeuBlWY
-SDOsfzqZ119Neapr68NMoXMouhiwyfo4+3nAPPPrCuavsBQwihFD6BSNOA8jj6EC
-gcEA0ivuGU9ga3mVToQv9reOcG39aX7Dc4emu/8QrAaIivwZTLf9HOB/KRpKcaBH
-Z57N3GEE5qMfAyl3XrL9EWxh27W4YxzouQROwZILTpss3k7PNSd4fg1EDvOHEYkd
-B/IrSCwErkeL79fncIPW15LD+GnXKxPu6euJbp2Yk2RkW7pRvvxuQFxKV3Y1rrAO
-E1COo7bKW7CYyF3qoaLTuwb7qJRBU+sE1FHj1+YbueJSoNWbNDItZAsISedemtsR
-xFGfAoHBAMs8LOlpotTkvXDjG9u0n95YQvBEWh9A0uTIPjF9e2YIvVx6pdiXm5p4
-0pbsaNudbU4ZoRsbZiXFwIruXcOfdu1z0vmjdWVolp6p3C0QaRZ+jSgCChqZ67qQ
-E6oVPVnZCasqXfZPrpnW0T9NvtxeTAt2Yvv5P2jnF4ePzmv0RcW6FxGXS8K28uvL
-Bbw1vqECLT6HdNmU1V+TdUKoIaJAC3lWWDKrMQq1Y+H4C9hvsTHWY8pHz6GjYuHx
-X+eYErw2EwKBwFuWFzDiXUMYfY70na4muSSXWbnyKpwavfbopMxCIJhoWWIMP3mo
-/uDbexte3B70ngLuKGOVK/uFw2X6G7vO/invW4WdYHDXxrYlvVWo23mY4ETqiWBs
-yX62cuKaXJNM3b2aqQOFXB7NeCaY3TOd2lZTUReNnSxEnuQcOxPnyLAMVnkiqazU
-SvUoJyaTw9542V/QVQh1wW53NrrvKNM0rM/+oyU9oiIf+Wjo9qYfUSCTVQn+37bb
-8+W4tIpI8soZQwKBwG12MbJd5QfJU4dTqxOAi4KUAymphujCX1Q9zdGWBjqEhoki
-veSUc4iVfscu+aMffVnNUAprjW7WvceWbwYIA2QNOBqgwYAm/sjiL+ZNqmwlKR3d
-S1fcgyxuoUjAO9UCosSAAy/A5weQvg7cbun+F/Mshk+0hUSZAwFOoR1f6Zx/iCE/
-Xdy38MqzBJnEULIjm/7LslHmaa4am9OU/tiGqidmLAbOUZG09OEmWirurX9sOz8d
-wmUKvR14hfEU5TJd5QKBwDjaQimySkKfn7VGxgUyoCfkYKgBp0MKqsNFc8Mi3w0D
-/vyEWv41o/cLRwdBopwIzVSY1uypRjMkqsDaR4KcuA6OoBbdCYQHqGl/P0N91QGH
-hSrkCFISWnj8i7IchhkW8uVo4leQM34rlbqz1F7jPXmKC5J4LabaYJSQn0DRNPgh
-5wkbKM/BSC58cP0lHkSEYu/uXCrW3+qW1Hk/kPqsZ15fuOtDvJzoqcOjzXuHG+3u
-8uc9kkrSksPzrwSWaPbH8Q==
------END PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQILVdWyEWhWU0CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDMFReIusCg7gSkoUQZV2flBIIE
+0BIFQH7+0dc7wHIQQ1y0ao90rrK3ExtCABH6xp4OAHUNPR1549zSEak/9Ba6WLBp
+YE0m/lpLz4oUJE4Kd3rg4ekSZk4mapZoW7g5ax4qAEblmM6rqmyjiU0Q6tsAb8n1
+x+RyjUILlgTH1HDmeNA53QNMCw++xIMIJPN29SvFN6vkU2Fd2f74/TuZRSaCEPLO
+LKtNMwWCMTrlv0UewEryOvZegPQuEF/Ewmmw/9l5VfkPp6zAtZKzWsfk4jUo5tv2
+5dPoHR+RKjNNVwetnCq59QYMS2My6KLqX4Vzqnbu8K1nlbm85ZHnvLGi8cDn8EB7
+QtRL+Ev5IwcwYJgV5AMojouJLQdR655jeITWI1Gsohz28YG8c1qYX4ZN6albSd1G
+fd1tMOWkeu4uEzJ7ijLDfnCzrklnLuAZx8yLzyrOa7i9AwwJmdgUEdbWWsru3L6C
+zDJ45rpA0FobdlTem4kpoE9yiyHkIhf3wmI3X+0aodC11pdbHP260KIC8E1K9FUh
+s/IoEQCYrBp8UltNTlezwq/E5uOuIu4EpfjEgH1Z3+hSDbnmMAXNX4DbL234x7iy
+3Y256DtOeHSElnRz3kDnZVNtM1Kd5fgEYJ1ptYRPYaWyJka7/hC/0UObuM9w+QeO
+OlG0QgumQFloyhDa9anPBK4sYJp4g1fK8golUDW4AdpFPNOJvvgOvQUzhPpHjr+N
+lpZ75Y6I3JSSKJ/UMlSCOqjak8oZtMtJNMfbx1lgwwDtgjDSJvSdl735gI9VmXXH
+qnlGEtyiQ7k1Z1a4HxiY2/CiDHvkymClir/Ik8gt+wmyT9c/9BcehLRf6PxMsDVy
+PCkty1LlzN+5tSZJtJnOiTlgsRn/w49Ohp74ITheSdb30/6PnFI+o8rcJHmrjN4d
+t3z/bCyWAeC8mS7m0wtXlyBeG9xvdyT8dDHAFOnqxX30dEwEbjNj58kWGAgRf9i3
+HlOAP8yRy7LAV7A4HEPnEzXBxYpsROUw/8d3Jtmr2nAp2hfKP339DYZPHZpRLjJr
+WQlJasHHLxHKKjSsuM06WsCO+Tt2FTSgGJuU6nFVK75fssmmJYzj9qMHVM6YSjfY
+sT0ZIWRgO9NLFx5O3QxY1wgMLhhv1FREy9NVnMU0W3A1u0F7dwHywZGha2IqEXgu
++UyWIJnePMvluV/s66AN/OpIxKU48c0B4l7XzXkHHd43tDUG3ztfRuPbWCHipuRO
+eo+vHGD01iBLSE1ZhrYLHKQhJvIKx/PIEaqJHP/Vy35AD/2/GH09TiIBHzX9aXie
+TiKFs30FQv7SpLNHNE7jUxsYGNUbYa70S/Vgn3wkKATcXpCc749XQV4OUbFoqkDm
+vuZOjkIOlm/OtZkUuDWmk96mgoVG/gWSEJPynJHUpmWdu/BCdYOgxBk/bmPa1leS
+Z5NbO0fGMnNhDMXYA5rqmVzABcNSYhgYw5aciWpBlgYHEYrPxZvCxWftIyb24oEk
+wdHEaFbIYbOoVZqo7Ym2hrvVrJb8Qdukf1BmUgfSSSc7BFoSrBUO4SNFtZI55NOB
+OM4rnkqfoYR0IpnxzPIpxpsWljG9QsgnTaffStDgIGXiAtBWJFy+44f1IS4EoC6B
++we1Q6atPwYSyPtG8mn4Ce0BNxLDUoFDLMQ7Bt8QBMeX
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/rsa3k/client-key2.pem b/samples/net/wifi/test_certs/rsa3k/client-key2.pem
index 893280f7ba6..6ab70da2452 100644
--- a/samples/net/wifi/test_certs/rsa3k/client-key2.pem
+++ b/samples/net/wifi/test_certs/rsa3k/client-key2.pem
@@ -1,40 +1,30 @@
------BEGIN PRIVATE KEY-----
-MIIG/AIBADANBgkqhkiG9w0BAQEFAASCBuYwggbiAgEAAoIBgQCm2jz5DYHRvaSF
-4F+A7V1FgBaJdjIQNWZ7e/rpNuAzkMDNdGJKzW/JtuUDgq6Ttf4RnajIhplA/h3A
-1dGLpH66RK48hjrBW5BLpl0RPtPZLmsLnI3/cbUnj3FpFssvfBnmjhNCGl0KC6kX
-gmKOpQLprXYncCvrt8DG7looKJ8FdGx3Mxmi7m9P/B9hIu2MD0WVAF+Ec+MQyy43
-MEtl16bMkui+MZKTWNE/8opcCVxE4oEFMw9TCToR5+IS6uwMhE/yN0Lx6hKuptZ0
-TYt4Y7XsIYHfFJ3L47bsbQuZh3pVorTWlpQmUbs1n1f/d+8SNf29Mipx+nvKBPJl
-zUtnqI3f7lmOZ/X480JRTvZODM6Hzflc1//A6RvgJvP7oYlXTX+SZBJKkZ079tB5
-AoXmsCxw8ePCMf1kVjlxVLcko8LEa30MjCrUqCJ61PINhEgd+0JnV14csYAMZKh0
-2K2v26HPGyZxAXoJ2/x75zW152jfLTkF6fE2EGcx7Ah9UtmNmM0CAwEAAQKCAYAl
-DGBtjKo+wDU/5MpP/mSvgfl/HFeRccoHsUfNcPnneUTWWflZUrR3vbysQuAwvEBl
-+PP5UqnE3KgOoWud7jCVe5qUpdl2BbbMlWwk4CZ6Gux575E4Hy9yUU+FXiJPsOav
-YuyzyNbP3Db3mWP4+HrlGDccGrQl6u9LPLGYKSzmMSvEa/xNSVQ+FmWBVBga+Wkh
-5KtQ5cqNeBATAQ481t2anyQ+1xMM1LPh1yERvqJWSVUMqoHElk/mme6A9NjlDpu2
-CSl82w/qFP/psxZ+66+ZKSIrUCWAiKPboDmAJeSsAsHKol5z0l7l9AFDwoh3vM2P
-dmBZ63af3gtCdx877r/nBlwiemwlgaAxh2HLJPtC6OfzffMcdUbO4AZ5SDutF/kp
-yAgweqBfpdJiQhOTsQvGzB007b9szCOXdOs+3KXjyakch9XFM6KR7KKpCTeuBlWY
-SDOsfzqZ119Neapr68NMoXMouhiwyfo4+3nAPPPrCuavsBQwihFD6BSNOA8jj6EC
-gcEA0ivuGU9ga3mVToQv9reOcG39aX7Dc4emu/8QrAaIivwZTLf9HOB/KRpKcaBH
-Z57N3GEE5qMfAyl3XrL9EWxh27W4YxzouQROwZILTpss3k7PNSd4fg1EDvOHEYkd
-B/IrSCwErkeL79fncIPW15LD+GnXKxPu6euJbp2Yk2RkW7pRvvxuQFxKV3Y1rrAO
-E1COo7bKW7CYyF3qoaLTuwb7qJRBU+sE1FHj1+YbueJSoNWbNDItZAsISedemtsR
-xFGfAoHBAMs8LOlpotTkvXDjG9u0n95YQvBEWh9A0uTIPjF9e2YIvVx6pdiXm5p4
-0pbsaNudbU4ZoRsbZiXFwIruXcOfdu1z0vmjdWVolp6p3C0QaRZ+jSgCChqZ67qQ
-E6oVPVnZCasqXfZPrpnW0T9NvtxeTAt2Yvv5P2jnF4ePzmv0RcW6FxGXS8K28uvL
-Bbw1vqECLT6HdNmU1V+TdUKoIaJAC3lWWDKrMQq1Y+H4C9hvsTHWY8pHz6GjYuHx
-X+eYErw2EwKBwFuWFzDiXUMYfY70na4muSSXWbnyKpwavfbopMxCIJhoWWIMP3mo
-/uDbexte3B70ngLuKGOVK/uFw2X6G7vO/invW4WdYHDXxrYlvVWo23mY4ETqiWBs
-yX62cuKaXJNM3b2aqQOFXB7NeCaY3TOd2lZTUReNnSxEnuQcOxPnyLAMVnkiqazU
-SvUoJyaTw9542V/QVQh1wW53NrrvKNM0rM/+oyU9oiIf+Wjo9qYfUSCTVQn+37bb
-8+W4tIpI8soZQwKBwG12MbJd5QfJU4dTqxOAi4KUAymphujCX1Q9zdGWBjqEhoki
-veSUc4iVfscu+aMffVnNUAprjW7WvceWbwYIA2QNOBqgwYAm/sjiL+ZNqmwlKR3d
-S1fcgyxuoUjAO9UCosSAAy/A5weQvg7cbun+F/Mshk+0hUSZAwFOoR1f6Zx/iCE/
-Xdy38MqzBJnEULIjm/7LslHmaa4am9OU/tiGqidmLAbOUZG09OEmWirurX9sOz8d
-wmUKvR14hfEU5TJd5QKBwDjaQimySkKfn7VGxgUyoCfkYKgBp0MKqsNFc8Mi3w0D
-/vyEWv41o/cLRwdBopwIzVSY1uypRjMkqsDaR4KcuA6OoBbdCYQHqGl/P0N91QGH
-hSrkCFISWnj8i7IchhkW8uVo4leQM34rlbqz1F7jPXmKC5J4LabaYJSQn0DRNPgh
-5wkbKM/BSC58cP0lHkSEYu/uXCrW3+qW1Hk/kPqsZ15fuOtDvJzoqcOjzXuHG+3u
-8uc9kkrSksPzrwSWaPbH8Q==
------END PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQILVdWyEWhWU0CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDMFReIusCg7gSkoUQZV2flBIIE
+0BIFQH7+0dc7wHIQQ1y0ao90rrK3ExtCABH6xp4OAHUNPR1549zSEak/9Ba6WLBp
+YE0m/lpLz4oUJE4Kd3rg4ekSZk4mapZoW7g5ax4qAEblmM6rqmyjiU0Q6tsAb8n1
+x+RyjUILlgTH1HDmeNA53QNMCw++xIMIJPN29SvFN6vkU2Fd2f74/TuZRSaCEPLO
+LKtNMwWCMTrlv0UewEryOvZegPQuEF/Ewmmw/9l5VfkPp6zAtZKzWsfk4jUo5tv2
+5dPoHR+RKjNNVwetnCq59QYMS2My6KLqX4Vzqnbu8K1nlbm85ZHnvLGi8cDn8EB7
+QtRL+Ev5IwcwYJgV5AMojouJLQdR655jeITWI1Gsohz28YG8c1qYX4ZN6albSd1G
+fd1tMOWkeu4uEzJ7ijLDfnCzrklnLuAZx8yLzyrOa7i9AwwJmdgUEdbWWsru3L6C
+zDJ45rpA0FobdlTem4kpoE9yiyHkIhf3wmI3X+0aodC11pdbHP260KIC8E1K9FUh
+s/IoEQCYrBp8UltNTlezwq/E5uOuIu4EpfjEgH1Z3+hSDbnmMAXNX4DbL234x7iy
+3Y256DtOeHSElnRz3kDnZVNtM1Kd5fgEYJ1ptYRPYaWyJka7/hC/0UObuM9w+QeO
+OlG0QgumQFloyhDa9anPBK4sYJp4g1fK8golUDW4AdpFPNOJvvgOvQUzhPpHjr+N
+lpZ75Y6I3JSSKJ/UMlSCOqjak8oZtMtJNMfbx1lgwwDtgjDSJvSdl735gI9VmXXH
+qnlGEtyiQ7k1Z1a4HxiY2/CiDHvkymClir/Ik8gt+wmyT9c/9BcehLRf6PxMsDVy
+PCkty1LlzN+5tSZJtJnOiTlgsRn/w49Ohp74ITheSdb30/6PnFI+o8rcJHmrjN4d
+t3z/bCyWAeC8mS7m0wtXlyBeG9xvdyT8dDHAFOnqxX30dEwEbjNj58kWGAgRf9i3
+HlOAP8yRy7LAV7A4HEPnEzXBxYpsROUw/8d3Jtmr2nAp2hfKP339DYZPHZpRLjJr
+WQlJasHHLxHKKjSsuM06WsCO+Tt2FTSgGJuU6nFVK75fssmmJYzj9qMHVM6YSjfY
+sT0ZIWRgO9NLFx5O3QxY1wgMLhhv1FREy9NVnMU0W3A1u0F7dwHywZGha2IqEXgu
++UyWIJnePMvluV/s66AN/OpIxKU48c0B4l7XzXkHHd43tDUG3ztfRuPbWCHipuRO
+eo+vHGD01iBLSE1ZhrYLHKQhJvIKx/PIEaqJHP/Vy35AD/2/GH09TiIBHzX9aXie
+TiKFs30FQv7SpLNHNE7jUxsYGNUbYa70S/Vgn3wkKATcXpCc749XQV4OUbFoqkDm
+vuZOjkIOlm/OtZkUuDWmk96mgoVG/gWSEJPynJHUpmWdu/BCdYOgxBk/bmPa1leS
+Z5NbO0fGMnNhDMXYA5rqmVzABcNSYhgYw5aciWpBlgYHEYrPxZvCxWftIyb24oEk
+wdHEaFbIYbOoVZqo7Ym2hrvVrJb8Qdukf1BmUgfSSSc7BFoSrBUO4SNFtZI55NOB
+OM4rnkqfoYR0IpnxzPIpxpsWljG9QsgnTaffStDgIGXiAtBWJFy+44f1IS4EoC6B
++we1Q6atPwYSyPtG8mn4Ce0BNxLDUoFDLMQ7Bt8QBMeX
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/rsa3k/client.pem b/samples/net/wifi/test_certs/rsa3k/client.pem
index 5386185fcf3..9e815474cd8 100644
--- a/samples/net/wifi/test_certs/rsa3k/client.pem
+++ b/samples/net/wifi/test_certs/rsa3k/client.pem
@@ -1,28 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIEsTCCAxmgAwIBAgIJAJfUB+ymBRUTMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU2WhcNMjkwODI0MDAyMjU2WjA9MQswCQYDVQQGEwJVUzEXMBUGA1UECgwO
-V2ktRmkgQWxsaWFuY2UxFTATBgNVBAMMDHVzZXItcnNhMzA3MjCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBAKbaPPkNgdG9pIXgX4DtXUWAFol2MhA1Znt7
-+uk24DOQwM10YkrNb8m25QOCrpO1/hGdqMiGmUD+HcDV0YukfrpErjyGOsFbkEum
-XRE+09kuawucjf9xtSePcWkWyy98GeaOE0IaXQoLqReCYo6lAumtdidwK+u3wMbu
-WigonwV0bHczGaLub0/8H2Ei7YwPRZUAX4Rz4xDLLjcwS2XXpsyS6L4xkpNY0T/y
-ilwJXETigQUzD1MJOhHn4hLq7AyET/I3QvHqEq6m1nRNi3hjtewhgd8Uncvjtuxt
-C5mHelWitNaWlCZRuzWfV/937xI1/b0yKnH6e8oE8mXNS2eojd/uWY5n9fjzQlFO
-9k4MzofN+VzX/8DpG+Am8/uhiVdNf5JkEkqRnTv20HkCheawLHDx48Ix/WRWOXFU
-tySjwsRrfQyMKtSoInrU8g2ESB37QmdXXhyxgAxkqHTYra/boc8bJnEBegnb/Hvn
-NbXnaN8tOQXp8TYQZzHsCH1S2Y2YzQIDAQABo4GTMIGQMAkGA1UdEwQCMAAwHQYD
-VR0OBBYEFNpIxeQyWBP8kE3g5lCfY7dW4aHdMB8GA1UdIwQYMBaAFLs7/OAtQSPp
-bjX5ehNx+w4s/GSWMCEGA1UdEQQaMBiBFnVzZXItcnNhMzA3MkB3MS1maS5vcmcw
-EwYDVR0lBAwwCgYIKwYBBQUHAwIwCwYDVR0PBAQDAgWgMA0GCSqGSIb3DQEBDAUA
-A4IBgQA+ZcZprt/VuxvlThQMVHW32jglsoFJtvM4eN87e+HU4MPz1xCh8/Cg98RM
-SMIQX4F0T6seycQCeTV858CdkaAI7NgvMscPHZz1393NMoYt80IaqOMoSf+zsxY0
-sdvLDICKTCzpOKcloNrNo5Y8nio2pi+W4/H3BV7xrDe8JmofF4GsHHf0LEdxd1Hw
-8DX0vqiAbgiKVP2zZTBomCUPEQOe8xGE/xyfvmyRXuEd1XQFZesZnSe6UKmCMDgW
-UoD0mYjQKKZaregbP4r3MLDz18WGGVvLDPWODgVtLbwiT9W2ARziz097d5S53hgz
-yQ6ycweXbSscaYQ23YLZ8bXy9WIOzZVaAp1t0+LMet515d44nRKfvqy08g/odIH6
-/4sfNEyif7DcE6AV6tJ2mG1Qdel8hA0MggYEvn7QldehVC4CVQGVU/yRMDgZ3JR5
-yJbgEoWihslZWsXFbKMt/pcV89OEIhjk1Q+swReQ1MBMuiXjz8DojU5F3gxQpFnb
-obAN27U=
------END CERTIFICATE-----
\ No newline at end of file
+MIIDojCCAooCFGZ4UJXBKG70aewILFtsy4mbvaYZMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNjI1WhcNMzQxMDA2MTAyNjI1WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMu3HXJvi2Q4hQnLL4v/sCyEr5x+ZtBcSi2yETMViaf2EStW
+UOs1A1pmCQbO7nadLQcWaX4tzefQCRrs1X4hIQuDIqRPNi6h6G1g5HEtqBWZhvwu
+hDbmFiX8/Vtw/P0/9sox2DzyLG0mjJUAYAbKtyC1kQalybVBtrSaazyyAyh6oOuU
+chAb7SmmNDsRB959TWM/mp+6yCcFGzCDKNBwlwthB6Uw92d3SfOyXEnZm8rPf0hV
+4ICL5iB+xEYBv1LKmznFK/4UAyKpxAygc5fxKVWwlSsq8MrES5ak0n6H71wViaXK
+BrH5yh9jEkK9XSeaUwg8C9eOOexyx/5JDY3TTE8CAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAUNddNiRUlJH0acJJv8ztXNWjNewd17tAk1BBHp6yyGAD8b52p6QbDAdS
+xO3WsSc2bqSy599jp4GshO27TMQsBRMfoggCG21Aj6sIs0Hd4shTE4T0GUBEBxC2
+/HReuD+cGIzzKMYlvK8RPSaGLPvPw5SryvmOnjD368V0KCHwT04Z14i4sMxlkd5q
+wB7fxTkVla9MR4uWObX62mJykmqT86chScJpldtBpRh8wrEa3Gt9FZoi/eqP0De8
+oCxmCZDrozGTZ4IIaNzchx3Ensh1RQwvvxd6ATerYdUjq4V2TlTksDRdCXtj+uNJ
+FnB32sUHiIouxudAsqDf8UL9/99RCw==
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa3k/client2.pem b/samples/net/wifi/test_certs/rsa3k/client2.pem
index 5386185fcf3..9e815474cd8 100644
--- a/samples/net/wifi/test_certs/rsa3k/client2.pem
+++ b/samples/net/wifi/test_certs/rsa3k/client2.pem
@@ -1,28 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIEsTCCAxmgAwIBAgIJAJfUB+ymBRUTMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU2WhcNMjkwODI0MDAyMjU2WjA9MQswCQYDVQQGEwJVUzEXMBUGA1UECgwO
-V2ktRmkgQWxsaWFuY2UxFTATBgNVBAMMDHVzZXItcnNhMzA3MjCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBAKbaPPkNgdG9pIXgX4DtXUWAFol2MhA1Znt7
-+uk24DOQwM10YkrNb8m25QOCrpO1/hGdqMiGmUD+HcDV0YukfrpErjyGOsFbkEum
-XRE+09kuawucjf9xtSePcWkWyy98GeaOE0IaXQoLqReCYo6lAumtdidwK+u3wMbu
-WigonwV0bHczGaLub0/8H2Ei7YwPRZUAX4Rz4xDLLjcwS2XXpsyS6L4xkpNY0T/y
-ilwJXETigQUzD1MJOhHn4hLq7AyET/I3QvHqEq6m1nRNi3hjtewhgd8Uncvjtuxt
-C5mHelWitNaWlCZRuzWfV/937xI1/b0yKnH6e8oE8mXNS2eojd/uWY5n9fjzQlFO
-9k4MzofN+VzX/8DpG+Am8/uhiVdNf5JkEkqRnTv20HkCheawLHDx48Ix/WRWOXFU
-tySjwsRrfQyMKtSoInrU8g2ESB37QmdXXhyxgAxkqHTYra/boc8bJnEBegnb/Hvn
-NbXnaN8tOQXp8TYQZzHsCH1S2Y2YzQIDAQABo4GTMIGQMAkGA1UdEwQCMAAwHQYD
-VR0OBBYEFNpIxeQyWBP8kE3g5lCfY7dW4aHdMB8GA1UdIwQYMBaAFLs7/OAtQSPp
-bjX5ehNx+w4s/GSWMCEGA1UdEQQaMBiBFnVzZXItcnNhMzA3MkB3MS1maS5vcmcw
-EwYDVR0lBAwwCgYIKwYBBQUHAwIwCwYDVR0PBAQDAgWgMA0GCSqGSIb3DQEBDAUA
-A4IBgQA+ZcZprt/VuxvlThQMVHW32jglsoFJtvM4eN87e+HU4MPz1xCh8/Cg98RM
-SMIQX4F0T6seycQCeTV858CdkaAI7NgvMscPHZz1393NMoYt80IaqOMoSf+zsxY0
-sdvLDICKTCzpOKcloNrNo5Y8nio2pi+W4/H3BV7xrDe8JmofF4GsHHf0LEdxd1Hw
-8DX0vqiAbgiKVP2zZTBomCUPEQOe8xGE/xyfvmyRXuEd1XQFZesZnSe6UKmCMDgW
-UoD0mYjQKKZaregbP4r3MLDz18WGGVvLDPWODgVtLbwiT9W2ARziz097d5S53hgz
-yQ6ycweXbSscaYQ23YLZ8bXy9WIOzZVaAp1t0+LMet515d44nRKfvqy08g/odIH6
-/4sfNEyif7DcE6AV6tJ2mG1Qdel8hA0MggYEvn7QldehVC4CVQGVU/yRMDgZ3JR5
-yJbgEoWihslZWsXFbKMt/pcV89OEIhjk1Q+swReQ1MBMuiXjz8DojU5F3gxQpFnb
-obAN27U=
------END CERTIFICATE-----
\ No newline at end of file
+MIIDojCCAooCFGZ4UJXBKG70aewILFtsy4mbvaYZMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNjI1WhcNMzQxMDA2MTAyNjI1WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMu3HXJvi2Q4hQnLL4v/sCyEr5x+ZtBcSi2yETMViaf2EStW
+UOs1A1pmCQbO7nadLQcWaX4tzefQCRrs1X4hIQuDIqRPNi6h6G1g5HEtqBWZhvwu
+hDbmFiX8/Vtw/P0/9sox2DzyLG0mjJUAYAbKtyC1kQalybVBtrSaazyyAyh6oOuU
+chAb7SmmNDsRB959TWM/mp+6yCcFGzCDKNBwlwthB6Uw92d3SfOyXEnZm8rPf0hV
+4ICL5iB+xEYBv1LKmznFK/4UAyKpxAygc5fxKVWwlSsq8MrES5ak0n6H71wViaXK
+BrH5yh9jEkK9XSeaUwg8C9eOOexyx/5JDY3TTE8CAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAUNddNiRUlJH0acJJv8ztXNWjNewd17tAk1BBHp6yyGAD8b52p6QbDAdS
+xO3WsSc2bqSy599jp4GshO27TMQsBRMfoggCG21Aj6sIs0Hd4shTE4T0GUBEBxC2
+/HReuD+cGIzzKMYlvK8RPSaGLPvPw5SryvmOnjD368V0KCHwT04Z14i4sMxlkd5q
+wB7fxTkVla9MR4uWObX62mJykmqT86chScJpldtBpRh8wrEa3Gt9FZoi/eqP0De8
+oCxmCZDrozGTZ4IIaNzchx3Ensh1RQwvvxd6ATerYdUjq4V2TlTksDRdCXtj+uNJ
+FnB32sUHiIouxudAsqDf8UL9/99RCw==
+-----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/rsa3k/server-key.pem b/samples/net/wifi/test_certs/rsa3k/server-key.pem
index c5e19c72c7c..5f032cad701 100644
--- a/samples/net/wifi/test_certs/rsa3k/server-key.pem
+++ b/samples/net/wifi/test_certs/rsa3k/server-key.pem
@@ -1,40 +1,30 @@
------BEGIN PRIVATE KEY-----
-MIIG/QIBADANBgkqhkiG9w0BAQEFAASCBucwggbjAgEAAoIBgQCxz8vr2/UJ40kU
-U6MNpdwyTm1SYOZ45bicgcCzScIG/1/KJGGnVHN9LmJ8BBTfyVO5EK7qrAD0gMrr
-Piy/J4zIw4iZvfbSX24nfsnItKGyBT1gpuDAzwBR4CqES+5JGXgx+yVoaBtHIRij
-xSdF0JQYHaX5tf44EJGF2QVtamfexIHpo1kCIslZnuWJsJi+0iiEl6rWvLiHsrkJ
-0YdBU57a1yMJNXWz/FJWpBUXNqKmFiQOtSdioJotlW2YsRMVH+vwoDCIbMD7/Z7t
-2DJQZu9cThGJFGHx49onoLpR3yj2Pm8KGa+eNVh+sL2BvK5tQEIzXZVIqmxJVAju
-WvuSma7pb55MScTwbqbEBDFLIs/ledkU2nyQjWfdiPUA0XHx0d9bF1u3SjGuMlc9
-5aTPTL96+6tq8nUumWU8pYz90Sz3CKKRgH0staa+JHZSPsT89OolbqAbLSzXwq/A
-KMMsV5xrebaFPu99+pFV8AiAhDijosLrQI4B9Jx2v8/89h2Ozb0CAwEAAQKCAYEA
-i0sJqL8q+o/+09mhRjPEh/RAV+RpKBRtxs0utET3ppuv4p8VkQvrXQlVRWm9IIKK
-/9M988DDDsdGL3sJesX01+G1xRq3nJ39oRsF4CEA+oB4UJrqPqDq0zkUlYcWKFW3
-fxALgfrsQ5B9yO3NkjePjETNnQ0hFbKFDaGxSsGslSrDys+YDsBJk9eSYYbiYboo
-25Yk0wwMUuGDa1mk51wmebFHVRN4HYNwzUbE7uZyDEIUBSGMtQqzPTpuHMu68zWJ
-RR8aljmZr5yR5uHNJXoOts/RGX9p0vfcfKrbBc56Rl+OaTrV5/yoTX3PLXHuTfib
-RJ8INT34HC2Y1giSkJyv8/AfsbdwnnJXcpSvX67C+MbfqCyZznkAtQBu8fovggbG
-7oJZaz9XcOFWYdArWb/XELXS+EL4chEL1R2o8NXegL0xbrD0vOYe2BMFnmRkLjQd
-0vm3NL9Hrc+F48SiHD64ef/i+aEsw02hLQX+DigmmnZzCTmCDtE5srzaqJcCBuzR
-AoHBANoxtX5OhZiXy8n+C1keE0/xQxK+SfSueqCv6XL47WtIZlErL48v1EwWxDId
-7fAGKvnIhPdbm8TqFSJ3V/Y0XOYPockA5T8vzeQHKhFh4GlHqSskx+B6Z/t7SJG1
-jQAV9ieB/YTQnYcBNb9sCUNDnl8PNibvq2pivu0m0VY8KgKZedfZ1oVkFKDiZ8Ns
-59Twy8Ps/rtUfPYy1mU/Rgse+wn5XE20nay9PCS/lsOHXJlWsICLjAHqCegc8j4M
-WR2EzwKBwQDQnt6pFR4K3lj/LIbeCaGp4RC26spekuZvgg9vsieSuw0qkx1LbG78
-I8suTkDWtSsBNHa3W6H5SSgs0S/DA5CZUxVgKj7xRo5+ZQOdF2LFr5UFbsUWa5nz
-o75VQQZ90c5oiEOfMZ893bPgxgNLMm6smoYRvRhdyT1EVo136xl10mq0kqshzzVg
-fCEuDegnPJqlSIkbwprz74dnGynffyyETezohAFBV1G/kGgQXmOYs9c4ZuKQgoWc
-3VHC5NkEP7MCgcAjP2J9W/vy8ZqnL9XveI9QG75lGb5iu4jtyl0hCJt5+EEnHZ3a
-OLTH8emR2wnj+2sX3M+2EeNxBQuS/MqF6GGVfLL7AJ0H/xX4nzupgTE6cKwgXxm2
-5q9Djd/kQfrcJ7ATI8mrmfPIqmZfXPmGFzdPTerGkXMUhY0oTFwG3UNAFkD7oKIp
-/Efk0Y5HoKE24gtYxEFGS9jAAOhnhLgw9blCHDlQCDxseklr+lNFlOldkAaFTYW5
-jXA6QerUITSIMzsCgcBZhpPOw30s9NYESztlNYTmverKVF+bzjaNS6cMK8vHr/Wq
-e49qupG2KjYbHQG+Iejej4ESloQf0kEnWm3Aplr7MShPKFHygHDN1NOEKnD8nKi6
-uBpj0LE0WORo+Yqrm8mUGkXKnyTTC70RjGgFcRMFhxpZqmg2dxGPrgTvnThD05Rv
-ATHnRGCHkz054kXp8Jv8qfAMtaqBXB0jJgkGHDEiZb5w2ZUgUTSHnJTL0XW0JhkJ
-3z0C/sAP3PolRMfMhvkCgcBYnh6w1UtwydPk68+vnc0+32L036dFwyUTcu9NTu70
-5UrJw4zKxiEPJnN02tiU2kjIc5VfqtQReSMcTpCWQWmrtAwPlnYpJOH/LToEL+x4
-t8GSWH37mMfkI4ZnNzabLHmYcMxtxT0pokKpqJoer/zB4b0FFv9bTEdZ5Xx9N4um
-EQlxmBsVk2K0268x7rky+JQWz4b5DqhAgH5mkxRPAZ1zn0G5rzyhkO6DSgA/WIiY
-6pTLxwpk9r34uvoqBzPSkss=
------END PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIjI78fcZSH7oCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDfF676hRrL290F0MgMDZiuBIIE
+0Hkz7skRV8Ox0SoX5N8GsOPfN4PS1cLyHgokY6dUhJPU5vUzOn9iSiGQSEzSguQ7
+11mssjRC2T45wB/95VK2EPtRw1f/6VOUR6RJnnGb0PV1Rydp/x5TZ6vzcXpakqly
+eljJR/20fIJClsZzhw0iu5la9fkF6G8WYFEkqex5jALSiN4qVLvkiqcTnh5+amem
+8+OCKgvgooKD2ids4/0GGfJRQSC6DFf3kuxNl+MMvmDXmz/vrD85ONnyXzKXDA3N
+3vRgL/YT6GzwIXb+7/c/tIMpnacxPAdbNOs3DY5ss4xcK68L5PwpM2BljzBa5dGw
+Smgf2VRaYRVzmrte5j280QjfrlHRU2cHaxm0GCu2AOTGwMXcSNYMXfDNuxc57oQJ
+vHXMeZD4K5lACbhYdZ5lJNFvv29YI7dZ7QOGu6nXlAuhZfbdc/cgT0som7eG8xpT
+pERllhQ5ych9sP9nAccN6VUsWgmlF73lbSptBek1ccYkp9LIYCteJUPl2qPcz6zl
+A7zrZ54f3Lg0fOm2pCtg+qKBiw1nd3MR/YbRCgyvudyZE2cCN/ZspWqxsavbGYOz
+JOfIFNnyAcOYtEv1n1BGLfMa1THW2bDV8XmHVHUtM0k4z250QAmLygWLY2166iUF
+qotBkvctKKdulzGdT4nVer1UEKTqcxhDf0dRiHN5spZtFrOee0uGIoQWHt2oecaK
+pJovW+i0qO/1DG5spfU2m1bz6jR2u6nxi340oRrMSoe1ELVg3l1/wmM8yzh07GuK
+pshzxwqAG/FnaKCvcKGUG2EfnAvOcbMgSa2w3GvyRkcDPn00arvX9nuXj0gkRDBi
+eoVMkKKTeeYSGQ4ik+ja3xkgHcxh5W8aoezLvBbmUq206cmhLwfnYMhnvFTs6EBK
+E0ENpCHwF/qoVBIzRCijG/eeCuf3a1YkJsWlvEeVrPeOmDFeDft3SSGOzHxE2A/7
+HWmHbWTm7dPOfgsU4zf+HglnBjN3kYU7StyM0EGxmB4lfB2BiWiL/3R13ERHQZfa
+oOqa4/hOFXOXfTQk6ufXtBx8L9BemBqh36zbs2xVvIizJKeRMruoRblWZkHhUKR8
+K5GA7FYkU9ZPPP0UPKsO94xzwfbevi+7nWeUZoqcqAUy8Jt5aD2QpvFVbPBBOz17
+PGaubeVn/Ry8swPvkpddtmJ4mgF+3SVctmzY+EE/oN1XS8wa+XeuaThzk89Lvrfa
+606nRWrNw3PSKjYoEEtRLhPeJCi9uOVenbOjtclio9mV5Sugwurolczvq8DAGpMG
+W4WgALgOWDjQAudiNH5dtcMGkBONbYywkJc7cT2OZFmzkCbchPPWlKGopuaFGAoU
+SPj7C9SenHmOWAFRX5jJrOZAuVqkdKN3ShWZUL+cDkOCCQlZ0E31u0m9yozY1MeO
+Sx42GtZaSGff37FGYeMZM2ztlutw2zmv2B1g52SBHTjCqQU/ud2Q6/U0kUzjbsdF
+/0KQY9wgZRdOvbnA2lBirN1rXzLWPdduOZ5QImfHfvToN+oOlEqVvvWG12DdA4e5
+y4Dumx00lfKEsGutjF3oKgE6jsjwqAwCoYEAFHTtsvA0hKPisQwNHZmpjGARvR56
+yMEmXynKvgyVGvVP2a9VdqBXSpstL24HfDIu+nlyEWGQ
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/rsa3k/server.pem b/samples/net/wifi/test_certs/rsa3k/server.pem
index 2b2032fe406..d8f82faf6dd 100644
--- a/samples/net/wifi/test_certs/rsa3k/server.pem
+++ b/samples/net/wifi/test_certs/rsa3k/server.pem
@@ -1,28 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIEyDCCAzCgAwIBAgIJAJfUB+ymBRUSMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAlVTMRQwEgYDVQQHDAtTYW50YSBDbGFyYTEXMBUGA1UECgwOV2ktRmkgQWxs
-aWFuY2UxHzAdBgNVBAMMFlN1aXRlIEIgUlNBIDNrIFJvb3QgQ0EwHhcNMTkwODI3
-MDAyMjU2WhcNMjkwODI0MDAyMjU2WjBJMQswCQYDVQQGEwJVUzEXMBUGA1UECgwO
-V2ktRmkgQWxsaWFuY2UxITAfBgNVBAMMGHJzYTMwNzIuc2VydmVyLncxLWZpLm9y
-ZzCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALHPy+vb9QnjSRRTow2l
-3DJObVJg5njluJyBwLNJwgb/X8okYadUc30uYnwEFN/JU7kQruqsAPSAyus+LL8n
-jMjDiJm99tJfbid+yci0obIFPWCm4MDPAFHgKoRL7kkZeDH7JWhoG0chGKPFJ0XQ
-lBgdpfm1/jgQkYXZBW1qZ97EgemjWQIiyVme5YmwmL7SKISXqta8uIeyuQnRh0FT
-ntrXIwk1dbP8UlakFRc2oqYWJA61J2Kgmi2VbZixExUf6/CgMIhswPv9nu3YMlBm
-71xOEYkUYfHj2iegulHfKPY+bwoZr541WH6wvYG8rm1AQjNdlUiqbElUCO5a+5KZ
-rulvnkxJxPBupsQEMUsiz+V52RTafJCNZ92I9QDRcfHR31sXW7dKMa4yVz3lpM9M
-v3r7q2rydS6ZZTyljP3RLPcIopGAfSy1pr4kdlI+xPz06iVuoBstLNfCr8AowyxX
-nGt5toU+7336kVXwCICEOKOiwutAjgH0nHa/z/z2HY7NvQIDAQABo4GeMIGbMAwG
-A1UdEwEB/wQCMAAwHQYDVR0OBBYEFONspF14yc8Y4OEAxOr7Yz27cW6xMB8GA1Ud
-IwQYMBaAFLs7/OAtQSPpbjX5ehNx+w4s/GSWMCYGA1UdEQEB/wQcMBqCGHJzYTMw
-NzIuc2VydmVyLncxLWZpLm9yZzAWBgNVHSUBAf8EDDAKBggrBgEFBQcDATALBgNV
-HQ8EBAMCBaAwDQYJKoZIhvcNAQEMBQADggGBAF6N1MxicmvDftBeaeoukI0Ri52F
-U0VjBZd3Mfcs8X7AOfYeUoOHnVw+TGLnkHLd3XUnkWdD88zrfSh5yl0VPN1b3zXW
-PSItGU6BCILqhgCFMwCiE/rSbdmddqdHLslcaAXC9/vZvBUn5UzB8lGHn54rU5UJ
-Kb75CtB9+5yVdcIjVMaJ9Kc+RSDE8TrgRFaP0sgUxYNgV5IWjlkgxo5VjtKcXjsn
-FXeSHAyIPhaAhi/eFDQdmeI/wI0q0mzSwESXE5JgN8adUaMSJwKxcP1YtHjYRhTi
-ztFpYzG0xe1ePnoiOSAU454QJNGJUcS68WDnEIQRRdfky0ffX5KAEfgHJNt6BdPg
-B4xNvLpteH+6lJQyLv12hpuOGjeMpLMmuXNhTh9J+rf1IZYTPToHrIEG2K4LpBBx
-0XFxbQP+8KCXyFJg14R/qQ002wJIyY85QtRr8z8XD+qwcZCh9Gv7nyjdFkJY2hae
-bJiYUtdUyQOqq39CwkHxaamck9cOnxZZIrrYRw==
+MIIDojCCAooCFCPQcj7ej5jhr6/mLlAoLYgfgsYcMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNTI5WhcNMzQxMDA2MTAyNTI5WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANcE/OPHQK/y1b6UsIktNK7WIZB528HECY7Bz18EGba0uHod
+91RbzHSJ1qI3iQyldI1UW/kY5oYjBW3lhLH0BkD/EsqvNYCV+3YzAM3ITtdOdEU9
+CqjgXttehQHfXvc7jQlF8Q2gYPUz2dDLo/gcTkz1d+mCr6nQUjT8Kq/nG54T0NnD
+k8udchjUlNaQsvx/WVs3TUYxMbWzQRtpJIbv99rAWq7YgQbkNZnSYC1VgrU/BiuQ
+0KrP6rfkxvBCGwIh2JXIL3FV4N8AsgGZvjXQ3zXKXwuPhxWdSmjKWlioVM3mha2A
+/1e1gX6nFY/uk46D60XWxcJ6tHGHoafU7EtN3zMCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAWwdTMphD0jxLtYO0iq/+fMtq2R96ZUN9wprZ7qg1evUNQjqLR4jKX306
+ZJX5uw+6r5Ve/k368qvcSF/sSfvBm8yd3JcegTl5t8T2/Aks8o3sfyuS0uyJC1rS
+zTrd7FmJG9YMosU1BqYobda64MXq7g+6MyrQoZ6fVdPvC6Sox3+a4fl9xjdm4CTY
+MsWqBJMe26LptvRIJ01/B6PjVTvsn/fxxj7rHmnJ/j63AIiBntm0vV/85cwYy/4o
+HlPH/Qjvn3hZjUlBcveiYat998F+s9gH2usvCkG3kly/n1/667LLCymmCHxtH8ka
+7tF3siO1EANureFY8qj6ZvlKeTkZ6g==
 -----END CERTIFICATE-----
diff --git a/samples/net/wifi/test_certs/server-key2.pem b/samples/net/wifi/test_certs/server-key2.pem
new file mode 100644
index 00000000000..5f032cad701
--- /dev/null
+++ b/samples/net/wifi/test_certs/server-key2.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIjI78fcZSH7oCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDfF676hRrL290F0MgMDZiuBIIE
+0Hkz7skRV8Ox0SoX5N8GsOPfN4PS1cLyHgokY6dUhJPU5vUzOn9iSiGQSEzSguQ7
+11mssjRC2T45wB/95VK2EPtRw1f/6VOUR6RJnnGb0PV1Rydp/x5TZ6vzcXpakqly
+eljJR/20fIJClsZzhw0iu5la9fkF6G8WYFEkqex5jALSiN4qVLvkiqcTnh5+amem
+8+OCKgvgooKD2ids4/0GGfJRQSC6DFf3kuxNl+MMvmDXmz/vrD85ONnyXzKXDA3N
+3vRgL/YT6GzwIXb+7/c/tIMpnacxPAdbNOs3DY5ss4xcK68L5PwpM2BljzBa5dGw
+Smgf2VRaYRVzmrte5j280QjfrlHRU2cHaxm0GCu2AOTGwMXcSNYMXfDNuxc57oQJ
+vHXMeZD4K5lACbhYdZ5lJNFvv29YI7dZ7QOGu6nXlAuhZfbdc/cgT0som7eG8xpT
+pERllhQ5ych9sP9nAccN6VUsWgmlF73lbSptBek1ccYkp9LIYCteJUPl2qPcz6zl
+A7zrZ54f3Lg0fOm2pCtg+qKBiw1nd3MR/YbRCgyvudyZE2cCN/ZspWqxsavbGYOz
+JOfIFNnyAcOYtEv1n1BGLfMa1THW2bDV8XmHVHUtM0k4z250QAmLygWLY2166iUF
+qotBkvctKKdulzGdT4nVer1UEKTqcxhDf0dRiHN5spZtFrOee0uGIoQWHt2oecaK
+pJovW+i0qO/1DG5spfU2m1bz6jR2u6nxi340oRrMSoe1ELVg3l1/wmM8yzh07GuK
+pshzxwqAG/FnaKCvcKGUG2EfnAvOcbMgSa2w3GvyRkcDPn00arvX9nuXj0gkRDBi
+eoVMkKKTeeYSGQ4ik+ja3xkgHcxh5W8aoezLvBbmUq206cmhLwfnYMhnvFTs6EBK
+E0ENpCHwF/qoVBIzRCijG/eeCuf3a1YkJsWlvEeVrPeOmDFeDft3SSGOzHxE2A/7
+HWmHbWTm7dPOfgsU4zf+HglnBjN3kYU7StyM0EGxmB4lfB2BiWiL/3R13ERHQZfa
+oOqa4/hOFXOXfTQk6ufXtBx8L9BemBqh36zbs2xVvIizJKeRMruoRblWZkHhUKR8
+K5GA7FYkU9ZPPP0UPKsO94xzwfbevi+7nWeUZoqcqAUy8Jt5aD2QpvFVbPBBOz17
+PGaubeVn/Ry8swPvkpddtmJ4mgF+3SVctmzY+EE/oN1XS8wa+XeuaThzk89Lvrfa
+606nRWrNw3PSKjYoEEtRLhPeJCi9uOVenbOjtclio9mV5Sugwurolczvq8DAGpMG
+W4WgALgOWDjQAudiNH5dtcMGkBONbYywkJc7cT2OZFmzkCbchPPWlKGopuaFGAoU
+SPj7C9SenHmOWAFRX5jJrOZAuVqkdKN3ShWZUL+cDkOCCQlZ0E31u0m9yozY1MeO
+Sx42GtZaSGff37FGYeMZM2ztlutw2zmv2B1g52SBHTjCqQU/ud2Q6/U0kUzjbsdF
+/0KQY9wgZRdOvbnA2lBirN1rXzLWPdduOZ5QImfHfvToN+oOlEqVvvWG12DdA4e5
+y4Dumx00lfKEsGutjF3oKgE6jsjwqAwCoYEAFHTtsvA0hKPisQwNHZmpjGARvR56
+yMEmXynKvgyVGvVP2a9VdqBXSpstL24HfDIu+nlyEWGQ
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/samples/net/wifi/test_certs/server2.pem b/samples/net/wifi/test_certs/server2.pem
new file mode 100644
index 00000000000..d8f82faf6dd
--- /dev/null
+++ b/samples/net/wifi/test_certs/server2.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDojCCAooCFCPQcj7ej5jhr6/mLlAoLYgfgsYcMA0GCSqGSIb3DQEBCwUAMIGS
+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGUmFkaXVzMRIwEAYDVQQHDAlTb21ld2hl
+cmUxFDASBgNVBAoMC0V4YW1wbGUgSW5jMSYwJAYDVQQDDB1FeGFtcGxlIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5v
+cmcwHhcNMjQxMDA4MTAyNTI5WhcNMzQxMDA2MTAyNTI5WjCBhzELMAkGA1UEBhMC
+RlIxDzANBgNVBAgMBlJhZGl1czESMBAGA1UEBwwJU29tZXdoZXJlMRQwEgYDVQQK
+DAtFeGFtcGxlIEluYzEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUub3JnMSAwHgYJ
+KoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANcE/OPHQK/y1b6UsIktNK7WIZB528HECY7Bz18EGba0uHod
+91RbzHSJ1qI3iQyldI1UW/kY5oYjBW3lhLH0BkD/EsqvNYCV+3YzAM3ITtdOdEU9
+CqjgXttehQHfXvc7jQlF8Q2gYPUz2dDLo/gcTkz1d+mCr6nQUjT8Kq/nG54T0NnD
+k8udchjUlNaQsvx/WVs3TUYxMbWzQRtpJIbv99rAWq7YgQbkNZnSYC1VgrU/BiuQ
+0KrP6rfkxvBCGwIh2JXIL3FV4N8AsgGZvjXQ3zXKXwuPhxWdSmjKWlioVM3mha2A
+/1e1gX6nFY/uk46D60XWxcJ6tHGHoafU7EtN3zMCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAWwdTMphD0jxLtYO0iq/+fMtq2R96ZUN9wprZ7qg1evUNQjqLR4jKX306
+ZJX5uw+6r5Ve/k368qvcSF/sSfvBm8yd3JcegTl5t8T2/Aks8o3sfyuS0uyJC1rS
+zTrd7FmJG9YMosU1BqYobda64MXq7g+6MyrQoZ6fVdPvC6Sox3+a4fl9xjdm4CTY
+MsWqBJMe26LptvRIJ01/B6PjVTvsn/fxxj7rHmnJ/j63AIiBntm0vV/85cwYy/4o
+HlPH/Qjvn3hZjUlBcveiYat998F+s9gH2usvCkG3kly/n1/667LLCymmCHxtH8ka
+7tF3siO1EANureFY8qj6ZvlKeTkZ6g==
+-----END CERTIFICATE-----
diff --git a/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/icmsg/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/multi_endpoint/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/ipc/ipc_service/static_vrings/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/logging/multidomain/sysbuild.conf b/samples/subsys/logging/multidomain/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/samples/subsys/logging/multidomain/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/app_nrf5340_bt.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/app_nrf5340_bt.overlay
new file mode 100644
index 00000000000..fcc2e240fd9
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/app_nrf5340_bt.overlay
@@ -0,0 +1,5 @@
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+};
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
new file mode 100644
index 00000000000..ddbd39f4bde
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
@@ -0,0 +1,46 @@
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+};
+
+/delete-node/ &boot_partition;
+/delete-node/ &slot0_partition;
+/delete-node/ &slot1_partition;
+
+/delete-node/ &slot0_ns_partition;
+/delete-node/ &slot1_ns_partition;
+
+/delete-node/ &storage_partition;
+
+&cpuapp_rram {
+	reg = < 0x0 DT_SIZE_K(1524) >;
+	partitions {
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x000000000 0x00014000>;
+		};
+		slot0_partition: partition@14000 {
+			label = "image-0";
+			reg = <0x000014000 0x0015A000>;
+		};
+		storage_partition: partition@16E000 {
+			label = "storage";
+			reg = < 0x16E000 0x9000 >;
+		};
+	};
+};
+
+&mx25r64 {
+	status = "okay";
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		slot1_partition: partition@0 {
+			label = "image-1";
+			reg = <0x000000000 0x0015A000>;
+		};
+	};
+};
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/pm_static_nrf5340_bt.yml b/samples/subsys/mgmt/mcumgr/smp_svr/pm_static_nrf5340_bt.yml
new file mode 100644
index 00000000000..7a48d51ec33
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/pm_static_nrf5340_bt.yml
@@ -0,0 +1,55 @@
+app:
+  address: 0x10200
+  region: flash_primary
+  size: 0xdfe00
+mcuboot:
+  address: 0x0
+  region: flash_primary
+  size: 0x10000
+mcuboot_pad:
+  address: 0x10000
+  region: flash_primary
+  size: 0x200
+mcuboot_primary:
+  address: 0x10000
+  orig_span: &id001
+  - mcuboot_pad
+  - app
+  region: flash_primary
+  size: 0xe0000
+  span: *id001
+mcuboot_primary_app:
+  address: 0x10200
+  orig_span: &id002
+  - app
+  region: flash_primary
+  size: 0xdfe00
+  span: *id002
+settings_storage:
+  address: 0xf0000
+  region: flash_primary
+  size: 0x10000
+mcuboot_primary_1:
+  address: 0x0
+  size: 0x40000
+  device: flash_ctrl
+  region: ram_flash
+mcuboot_secondary:
+  address: 0x00000
+  size: 0xe0000
+  device: MX25R64
+  region: external_flash
+mcuboot_secondary_1:
+  address: 0xe0000
+  size: 0x40000
+  device: MX25R64
+  region: external_flash
+external_flash:
+  address: 0x120000
+  size: 0x6e0000
+  device: MX25R64
+  region: external_flash
+pcd_sram:
+  address: 0x20000000
+  size: 0x2000
+  region: sram_primary
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf b/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
index 06a27644bac..925ac0c93a2 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/prj.conf
@@ -8,7 +8,7 @@ CONFIG_FLASH_MAP=y
 
 # Some command handlers require a large stack.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304
-CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_MAIN_STACK_SIZE=2176
 
 # Ensure an MCUboot-compatible binary is generated.
 CONFIG_BOOTLOADER_MCUBOOT=y
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/prj_nrf5340_bt.conf b/samples/subsys/mgmt/mcumgr/smp_svr/prj_nrf5340_bt.conf
new file mode 100644
index 00000000000..cb53d3e6beb
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/prj_nrf5340_bt.conf
@@ -0,0 +1,88 @@
+# Enable MCUmgr and dependencies.
+CONFIG_NET_BUF=y
+CONFIG_ZCBOR=y
+CONFIG_CRC=y
+CONFIG_MCUMGR=y
+CONFIG_STREAM_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_BT=y
+CONFIG_BT_PERIPHERAL=y
+
+# Some command handlers require a large stack.
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304
+CONFIG_MAIN_STACK_SIZE=2176
+
+# Ensure an MCUboot-compatible binary is generated.
+CONFIG_BOOTLOADER_MCUBOOT=y
+
+# Enable flash operations.
+CONFIG_FLASH=y
+
+# Required by the `taskstat` command.
+CONFIG_THREAD_MONITOR=y
+
+# Support for taskstat command
+CONFIG_MCUMGR_GRP_OS_TASKSTAT=y
+
+# Enable statistics and statistic names.
+CONFIG_STATS=y
+CONFIG_STATS_NAMES=y
+
+# Enable most core commands.
+CONFIG_FLASH=y
+CONFIG_IMG_MANAGER=y
+CONFIG_MCUMGR_GRP_IMG=y
+CONFIG_MCUMGR_GRP_OS=y
+CONFIG_MCUMGR_GRP_STAT=y
+
+# Enable logging
+CONFIG_LOG=y
+CONFIG_MCUBOOT_UTIL_LOG_LEVEL_WRN=y
+
+# Disable debug logging
+CONFIG_LOG_MAX_LEVEL=3
+
+# Allow for large Bluetooth data packets.
+CONFIG_BT_L2CAP_TX_MTU=498
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=502
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+
+# Enable the Bluetooth mcumgr transport (unauthenticated).
+CONFIG_MCUMGR_TRANSPORT_BT=y
+CONFIG_MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL=y
+
+# Enable the Shell mcumgr transport.
+CONFIG_BASE64=y
+CONFIG_CRC=y
+CONFIG_SHELL=y
+CONFIG_SHELL_BACKEND_SERIAL=y
+CONFIG_MCUMGR_TRANSPORT_SHELL=y
+
+# Enable the mcumgr Packet Reassembly feature over Bluetooth and its configuration dependencies.
+# MCUmgr buffer size is optimized to fit one SMP packet divided into five Bluetooth Write Commands,
+# transmitted with the maximum possible MTU value: 498 bytes.
+CONFIG_MCUMGR_TRANSPORT_BT_REASSEMBLY=y
+CONFIG_MCUMGR_TRANSPORT_NETBUF_SIZE=2475
+CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
+CONFIG_MCUMGR_TRANSPORT_WORKQUEUE_STACK_SIZE=4608
+
+# Enable the LittleFS file system.
+CONFIG_FILE_SYSTEM=y
+CONFIG_FILE_SYSTEM_LITTLEFS=y
+
+# Enable file system commands
+CONFIG_MCUMGR_GRP_FS=y
+
+# Enable the storage erase command.
+CONFIG_MCUMGR_GRP_ZBASIC=y
+CONFIG_MCUMGR_GRP_ZBASIC_STORAGE_ERASE=y
+
+# Disable Bluetooth ping support
+CONFIG_BT_CTLR_LE_PING=n
+
+# Disable shell commands that are not needed
+CONFIG_CLOCK_CONTROL_NRF_SHELL=n
+CONFIG_DEVICE_SHELL=n
+CONFIG_DEVMEM_SHELL=n
+CONFIG_FLASH_SHELL=n
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index 8ede9b77d07..dcdd8cfc76f 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -14,9 +14,12 @@ tests:
       - nrf52840dk/nrf52840
       - pinnacle_100_dvk
       - mg100
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
     integration_platforms:
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
+      - nrf54l15dk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.bt_static_svc:
     harness: bluetooth
     tags: bluetooth
@@ -170,6 +173,33 @@ tests:
       - mg100
     integration_platforms:
       - nrf52840dk/nrf52840
+  sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash:
+    extra_args:
+      - OVERLAY_CONFIG="overlay-bt.conf"
+      - DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
+      - SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15dk/nrf54l05/cpuapp
+    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
+  sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash.pure_dts:
+    extra_args:
+      - OVERLAY_CONFIG="overlay-bt.conf"
+      - DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - mcuboot_CONF_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf"
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay"
+      - SB_CONFIG_PARTITION_MANAGER=n
+    platform_allow:
+      - nrf54l15dk/nrf54l15/cpuapp
+      - nrf54l15dk/nrf54l10/cpuapp
+      - nrf54l15dk/nrf54l05/cpuapp
+    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
   sample.mcumgr.smp_svr.ram_load:
     extra_args: FILE_SUFFIX="ram_load"
     platform_allow:
@@ -192,3 +222,11 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52840dk/nrf52840
+  sample.mcumgr.smp_svr.bt.nrf5340dk.ext_flash:
+    sysbuild: true
+    extra_args:
+      - FILE_SUFFIX=nrf5340_bt
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild.cmake b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild.cmake
new file mode 100644
index 00000000000..f0a9f06df84
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild.cmake
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if(FILE_SUFFIX STREQUAL "nrf5340_bt")
+  if(SB_CONFIG_SOC_NRF5340_CPUAPP)
+    # nRF5340 with Bluetooth configuration, add partition manager configuration to MCUboot image
+    list(APPEND mcuboot_EXTRA_DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/app_nrf5340_bt.overlay)
+    list(REMOVE_DUPLICATES mcuboot_EXTRA_DTC_OVERLAY_FILE)
+    set(mcuboot_EXTRA_DTC_OVERLAY_FILE ${mcuboot_EXTRA_DTC_OVERLAY_FILE} CACHE INTERNAL "" FORCE)
+  else()
+    message(FATAL_ERROR "File suffix 'nrf5340_bt' can only be used on an nRF5340 CPUAPP board target")
+  endif()
+endif()
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf
new file mode 100644
index 00000000000..98260877332
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/hci_rpmsg.conf
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2022 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_BT_MAX_CONN=2
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=502
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild_nrf5340_bt.conf b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild_nrf5340_bt.conf
new file mode 100644
index 00000000000..16bcac179e8
--- /dev/null
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sysbuild_nrf5340_bt.conf
@@ -0,0 +1,8 @@
+# Enable MCUboot bootloader support
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_MCUBOOT_MODE_OVERWRITE_ONLY=y
+SB_CONFIG_NETCORE_HCI_IPC=y
+SB_CONFIG_SECURE_BOOT_NETCORE=y
+SB_CONFIG_NETCORE_APP_UPDATE=y
+SB_CONFIG_MCUBOOT_NRF53_MULTI_IMAGE_UPDATE=y
+SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
diff --git a/samples/subsys/usb/dfu/sysbuild.conf b/samples/subsys/usb/dfu/sysbuild.conf
new file mode 100644
index 00000000000..47f00ff3cff
--- /dev/null
+++ b/samples/subsys/usb/dfu/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
diff --git a/samples/sysbuild/hello_world/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/samples/sysbuild/hello_world/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
new file mode 100644
index 00000000000..ca2bc07e4f2
--- /dev/null
+++ b/samples/sysbuild/hello_world/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
diff --git a/samples/sysbuild/hello_world/sample.yaml b/samples/sysbuild/hello_world/sample.yaml
index cbc58e2a336..c8ca9cbe4c0 100644
--- a/samples/sysbuild/hello_world/sample.yaml
+++ b/samples/sysbuild/hello_world/sample.yaml
@@ -27,6 +27,11 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args: SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
 
+  sample.sysbuild.hello_world.nrf54h20dk_cpuapp_cpurad.iron:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp/iron
+    extra_args: SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad_iron.conf
+
   sample.sysbuild.hello_world.nrf54h20dk_cpuapp_cpuppr:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/sysbuild/hello_world/sysbuild.cmake b/samples/sysbuild/hello_world/sysbuild.cmake
index c7c2615c665..8f8fc49dbff 100644
--- a/samples/sysbuild/hello_world/sysbuild.cmake
+++ b/samples/sysbuild/hello_world/sysbuild.cmake
@@ -11,5 +11,17 @@ ExternalZephyrProject_Add(
   BOARD ${SB_CONFIG_REMOTE_BOARD}
 )
 
+if(SB_CONFIG_SOC_SERIES_NRF53X)
+  set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
+  set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)
+  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote)
+  set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
+else(SB_CONFIG_SOC_SERIES_NRF54LX)
+  set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUFLPR)
+  set_property(GLOBAL APPEND PROPERTY PM_CPUFLPR_IMAGES remote)
+  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUFLPR remote)
+  set(CPUFLPR_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
+endif()
+
 add_dependencies(${DEFAULT_IMAGE} remote)
 sysbuild_add_dependencies(FLASH ${DEFAULT_IMAGE} remote)
diff --git a/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad_iron.conf b/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad_iron.conf
new file mode 100644
index 00000000000..8d4a230adbe
--- /dev/null
+++ b/samples/sysbuild/hello_world/sysbuild/nrf54h20dk_nrf54h20_cpurad_iron.conf
@@ -0,0 +1 @@
+SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad/iron"
diff --git a/samples/tfm_integration/psa_crypto/prj.conf b/samples/tfm_integration/psa_crypto/prj.conf
index ad9de1f0797..1d5024f1242 100644
--- a/samples/tfm_integration/psa_crypto/prj.conf
+++ b/samples/tfm_integration/psa_crypto/prj.conf
@@ -39,6 +39,10 @@ CONFIG_MBEDTLS_ENTROPY_C=y
 CONFIG_MBEDTLS_ECP_C=y
 CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
 CONFIG_MBEDTLS_ECDSA_C=y
+CONFIG_MBEDTLS_MD=y
+CONFIG_MBEDTLS_RSA_C=y
+CONFIG_MBEDTLS_PKCS1_V15=y
+CONFIG_MBEDTLS_PKCS1_V21=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED=y
 CONFIG_MBEDTLS_PK_WRITE_C=y
 
diff --git a/samples/tfm_integration/psa_crypto/sample.yaml b/samples/tfm_integration/psa_crypto/sample.yaml
index ff5448cc5e6..0f69b98b93e 100644
--- a/samples/tfm_integration/psa_crypto/sample.yaml
+++ b/samples/tfm_integration/psa_crypto/sample.yaml
@@ -16,8 +16,6 @@ tests:
     platform_allow:
       - mps2/an521/cpu0/ns
       - v2m_musca_s1/musca_s1/ns
-      - nrf5340dk/nrf5340/cpuapp/ns
-      - nrf9160dk/nrf9160/ns
       - stm32l562e_dk/stm32l562xx/ns
       - bl5340_dvk/nrf5340/cpuapp/ns
     integration_platforms:
diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py
index 0c844793737..5fd67abecfa 100755
--- a/scripts/ci/check_compliance.py
+++ b/scripts/ci/check_compliance.py
@@ -458,6 +458,13 @@ def get_modules(self, modules_file, sysbuild_modules_file, settings_file):
         modules = [name for name in os.listdir(modules_dir) if
                    modules_dir / name / 'Kconfig']
 
+        nrf_modules_dir = ZEPHYR_BASE / Path('../nrf/modules')
+        nrf_modules = []
+        if os.path.exists(nrf_modules_dir):
+            nrf_modules = [name for name in os.listdir(nrf_modules_dir) if
+                           os.path.exists(os.path.join(nrf_modules_dir, name,
+                                                       'Kconfig'))]
+
         with open(modules_file, 'r') as fp_module_file:
             content = fp_module_file.read()
 
@@ -467,6 +474,15 @@ def get_modules(self, modules_file, sysbuild_modules_file, settings_file):
                     re.sub('[^a-zA-Z0-9]', '_', module).upper(),
                     modules_dir / module / 'Kconfig'
                 ))
+            for module in nrf_modules:
+                fp_module_file.write("ZEPHYR_{}_KCONFIG = {}\n".format(
+                    re.sub('[^a-zA-Z0-9]', '_', module).upper(),
+                    nrf_modules_dir / module / 'Kconfig'
+                ))
+                fp_module_file.write("NCS_{}_KCONFIG = {}\n".format(
+                    re.sub('[^a-zA-Z0-9]', '_', module).upper(),
+                    modules_dir / module / 'Kconfig'
+                ))
             fp_module_file.write(content)
 
     def get_kconfig_dts(self, kconfig_dts_file, settings_file):
@@ -1205,6 +1221,29 @@ class SysbuildKconfigCheck(KconfigCheck):
         "SUIT_MPI_GENERATE", # Used by nRF runners to program provisioning data
         "SUIT_MPI_RAD_AREA_PATH", # Used by nRF runners to program provisioning data
         # zephyr-keep-sorted-stop
+
+        # NCS-specific allowlist
+        # zephyr-keep-sorted-start re(^\s+")
+        "APP_CPUNET_RUN", # Used by sample
+        "APP_DFU", # Used by sample
+        "BT_FAST_PAIR", # Legacy/removed, used in migration documentation
+        "COMP_DATA_LAYOUT_ARRAY", # Used by test
+        "COMP_DATA_LAYOUT_MULTIPLE", # Used by test
+        "COMP_DATA_LAYOUT_SINGLE", # Used by test
+        "DTM_NO_DFE", # Used by DTM application
+        "DTM_TRANSPORT_HCI", # Used by DTM application
+        "INCLUDE_REMOTE_IMAGE", # Used by machine learning application
+        "ML_APP_INCLUDE_REMOTE_IMAGE", # Used by machine learning application
+        "ML_APP_REMOTE_BOARD", # Used by machine learning application
+        "MY_APP_IMAGE_ABC", # Used in documentation
+        "REMOTE_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING", # Used in tests
+        "SOC_FLASH_NRF_RADIO_SYNC_RPC", # Used in documentation
+        "SUIT_ENVELOPE_", # Used by jinja
+        "SUIT_ENVELOPE_SEQUENCE_NUM", # Legacy/removed, used in migration documentation
+        "SUIT_MPI_", # Used by jinja
+        "SUIT_RECOVERY_APPLICATION_CUSTOM", # Used in documentation
+        "SUPPORT_NETCORE_PERIPHERAL_RADIO_TEST", # Used by wifi radio test sample
+        # zephyr-keep-sorted-stop
     }
 
 
diff --git a/scripts/dts/gen_dts_cmake.py b/scripts/dts/gen_dts_cmake.py
index 47fd30b67b9..39496e74459 100755
--- a/scripts/dts/gen_dts_cmake.py
+++ b/scripts/dts/gen_dts_cmake.py
@@ -11,12 +11,13 @@
 
 The generated CMake file looks like this:
 
-  add_custom_target(devicetree_target)
-  set_target_properties(devicetree_target PROPERTIES
+  add_custom_target(${DEVICETREE_TARGET})
+  set_target_properties(${DEVICETREE_TARGET} PROPERTIES
                         "DT_PROP|/soc|compatible" "vnd,soc;")
   ...
 
-It defines a special CMake target, and saves various values in the
+It takes an input variable - DEVICETREE_TARGET - and creates a special
+CMake target with this name, which will contain various values in the
 devicetree as CMake target properties.
 
 Be careful:
@@ -170,15 +171,13 @@ def main():
         cmake_comp = f'DT_COMP|{comp}'
         cmake_props.append(f'"{cmake_comp}" "{cmake_path}"')
 
+    cmake_props = map(
+        'set_target_properties(${{DEVICETREE_TARGET}} PROPERTIES {})'.format,
+        cmake_props
+    )
     with open(args.cmake_out, "w", encoding="utf-8") as cmake_file:
-        print('add_custom_target(devicetree_target)', file=cmake_file)
-        print(file=cmake_file)
-
-        for prop in cmake_props:
-            print(
-                f'set_target_properties(devicetree_target PROPERTIES {prop})',
-                file=cmake_file
-            )
+        print('add_custom_target(${DEVICETREE_TARGET})\n', *cmake_props,
+              sep='\n', file=cmake_file)
 
 
 if __name__ == "__main__":
diff --git a/scripts/gitlint/zephyr_commit_rules.py b/scripts/gitlint/zephyr_commit_rules.py
index a2c9cd3cb7f..ef317e22684 100644
--- a/scripts/gitlint/zephyr_commit_rules.py
+++ b/scripts/gitlint/zephyr_commit_rules.py
@@ -78,7 +78,7 @@ class TitleMaxLengthRevert(LineRule):
     name = "title-max-length-no-revert"
     id = "UC5"
     target = CommitMessageTitle
-    options_spec = [IntOption('line-length', 75, "Max line length")]
+    options_spec = [IntOption('line-length', 120, "Max line length")]
     violation_message = "Commit title exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):
@@ -103,7 +103,7 @@ class MaxLineLengthExceptions(LineRule):
     name = "max-line-length-with-exceptions"
     id = "UC4"
     target = CommitMessageBody
-    options_spec = [IntOption('line-length', 75, "Max line length")]
+    options_spec = [IntOption('line-length', 120, "Max line length")]
     violation_message = "Commit message body line exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):
diff --git a/scripts/pylib/twister/twisterlib/hardwaremap.py b/scripts/pylib/twister/twisterlib/hardwaremap.py
index d3308b8cbe3..5c0c5eb1238 100644
--- a/scripts/pylib/twister/twisterlib/hardwaremap.py
+++ b/scripts/pylib/twister/twisterlib/hardwaremap.py
@@ -386,7 +386,7 @@ def save(self, hwm_file):
         boot_ids = []
 
         # use existing map
-        self.detected = natsorted(self.detected, key=lambda x: x.serial or '')
+        self.detected.sort(key=lambda x: x.serial or '')
         if os.path.exists(hwm_file):
             with open(hwm_file) as yaml_file:
                 hwm = yaml.load(yaml_file, Loader=SafeLoader)
diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml
new file mode 100644
index 00000000000..20c4f9248ea
--- /dev/null
+++ b/scripts/quarantine.yaml
@@ -0,0 +1,88 @@
+# The configurations resulting as a product of scenarios and platforms
+# will be skipped if quarantine is used. More details here:
+# https://docs.zephyrproject.org/latest/guides/test/twister.html#quarantine
+
+- scenarios:
+    - testing.ztest.busy_sim
+    - testing.ztest.busy_sim_nrf52840dk_pin
+  platforms:
+    - nrf52840dk_nrf52840
+
+# Already reported, but will not be fixed (look at the discussion):
+# https://github.com/zephyrproject-rtos/zephyr/issues/44947
+- scenarios:
+    - libraries.cmsis_dsp.matrix.unary_f64
+  platforms:
+    - nrf5340dk_nrf5340_cpunet
+    - qemu_cortex_m3
+  comment: "Flash overflows"
+
+# Already reported, but will not be fixed (look at the discussion):
+# https://github.com/zephyrproject-rtos/zephyr/issues/44947
+- scenarios:
+    - libraries.cmsis_dsp.matrix.binary_f16
+    - libraries.cmsis_dsp.matrix.binary_f16.fpu
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+  comment: "Flash overflows"
+
+# Already reported, but will not be fixed (look at the discussion):
+# https://github.com/zephyrproject-rtos/zephyr/issues/44947
+- scenarios:
+    - libraries.cmsis_dsp.matrix.binary_q15
+    - libraries.cmsis_dsp.matrix.binary_q15.fpu
+    - libraries.cmsis_dsp.matrix.unary_f32
+    - libraries.cmsis_dsp.matrix.unary_f32.fpu
+    - libraries.cmsis_dsp.matrix.unary_f64
+    - libraries.cmsis_dsp.matrix.unary_f64.fpu
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+    - nrf9160dk_nrf9160_ns
+  comment: "Flash overflows"
+
+# libsdl2-dev package should be added into docker image
+- scenarios:
+    - sample.boards.nrf.nrf_led_matrix
+    - sample.display.lvgl.gui
+  platforms:
+    - native_posix
+  comment: "libsdl2-dev package not available"
+
+- scenarios:
+    - sample.net.sockets.echo_server.usbnet
+    - sample.net.sockets.echo_server.usbnet_composite
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+  comment: "Ram/flash overflows, also in the upstream"
+
+- scenarios:
+    - sample.net.zperf.netusb_ecm
+    - sample.net.zperf.netusb_eem
+    - sample.net.zperf.netusb_rndis
+  platforms:
+    - nrf52833dk_nrf52833
+    - nrf5340dk_nrf5340_cpuapp_ns
+  comment: "Ram/flash overflows, also in the upstream"
+
+- scenarios:
+    - net.mqtt.tls
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+    - nrf9160dk_nrf9160_ns
+  comment: "Ram/flash overflows, also in the upstream"
+
+- scenarios:
+    - kernel.common.picolibc
+    - libraries.picolibc
+    - libraries.libc.picolibc.mem_alloc
+    - libraries.picolibc.sprintf_new
+  platforms:
+    - nrf52dk_nrf52832
+  comment: "Ram overflows, also in the upstream"
+
+- scenarios:
+    - sample.psa_crypto
+  platforms:
+    - nrf5340dk_nrf5340_cpuapp_ns
+    - nrf9160dk_nrf9160_ns
+  comment: "Due to using sdk-zephyr manifest instead of nrf. Should be fixed after the change"
diff --git a/scripts/requirements-run-test.txt b/scripts/requirements-run-test.txt
index d3a4be91673..08ff89b0c54 100644
--- a/scripts/requirements-run-test.txt
+++ b/scripts/requirements-run-test.txt
@@ -7,7 +7,6 @@ pyocd>=0.35.0
 
 # used by twister for board/hardware map
 tabulate
-natsort
 
 # used by mcuboot
 cbor>=1.0.0
diff --git a/scripts/west_commands/build.py b/scripts/west_commands/build.py
index d3c159db2fc..1c2e0be28a1 100644
--- a/scripts/west_commands/build.py
+++ b/scripts/west_commands/build.py
@@ -631,7 +631,12 @@ def _run_cmake(self, board, origin, cmake_opts):
         if user_args:
             cmake_opts.extend(shlex.split(user_args))
 
-        config_sysbuild = config_getboolean('sysbuild', False)
+        config_sysbuild = config_getboolean('sysbuild', None)
+
+        if config_sysbuild is None:
+            # If no option is set, then enable sysbuild globally
+            config_sysbuild = True
+
         if self.args.sysbuild or (config_sysbuild and not self.args.no_sysbuild):
             cmake_opts.extend(['-S{}'.format(SYSBUILD_PROJ_DIR),
                                '-DAPP_DIR:PATH={}'.format(self.source_dir)])
diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
index ec45fbdef5d..4f5be601694 100644
--- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
+++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
@@ -512,6 +512,8 @@ function(ExternalZephyrProject_Cmake)
   endif()
   load_cache(IMAGE ${ZCMAKE_APPLICATION} BINARY_DIR ${BINARY_DIR})
   import_kconfig(CONFIG_ ${BINARY_DIR}/zephyr/.config TARGET ${ZCMAKE_APPLICATION})
+  set(DEVICETREE_TARGET ${ZCMAKE_APPLICATION}_devicetree_target)
+  include(${BINARY_DIR}/zephyr/dts.cmake)
 
   # This custom target informs CMake how the BYPRODUCTS are generated if a target
   # depends directly on the BYPRODUCT instead of depending on the image target.
@@ -763,3 +765,86 @@ function(sysbuild_images_order variable dependency_type)
   topological_sort(TARGETS ${SIS_IMAGES} PROPERTY_NAME ${property_name} RESULT sorted)
   set(${variable} ${sorted} PARENT_SCOPE)
 endfunction()
+
+# Internal macro for defining the sysbuild_dt_* CMake extensions, used to
+# retrieve devicetree information from a Zephyr based build system.
+#
+# It takes a dt_* function <name> and adds common wrapper code, which
+# adds an `IMAGE` argument to select the devicetree of a given <image>,
+# and forwards all other arguments to the original function, including
+# the sole return variable <var> - a common trait of the dt_* API.
+#
+# For additional documentation of each dt_* CMake extension,
+# see section 4.1. of cmake/modules/extensions.cmake.
+#
+macro(sysbuild_dt_function name)
+  function(sysbuild_${name} var)
+    cmake_parse_arguments(PARSE_ARGV 1 SBDT "" "IMAGE" "")
+    zephyr_check_arguments_required_all("sysbuild_${name}" SBDT IMAGE)
+
+    set(DEVICETREE_TARGET ${SBDT_IMAGE}_devicetree_target)
+    if(NOT TARGET ${SBDT_IMAGE} OR NOT TARGET ${DEVICETREE_TARGET})
+      message(FATAL_ERROR "sysbuild_${name}(...) image '${SBDT_IMAGE}' "
+                          "does not exist or its devicetree is not loaded yet"
+      )
+    endif()
+
+    cmake_language(CALL ${name} ${var} ${SBDT_UNPARSED_ARGUMENTS})
+    set(${var} "${${var}}" PARENT_SCOPE)
+  endfunction()
+endmacro()
+
+# Usage:
+#   sysbuild_dt_nodelabel(<var> IMAGE <image> NODELABEL <label>)
+#
+sysbuild_dt_function(dt_nodelabel)
+
+# Usage:
+#   sysbuild_dt_alias(<var> IMAGE <image> PROPERTY <prop>)
+#
+sysbuild_dt_function(dt_alias)
+
+# Usage:
+#   sysbuild_dt_node_exists(<var> IMAGE <image> PATH <path>)
+#
+sysbuild_dt_function(dt_node_exists)
+
+# Usage:
+#   sysbuild_dt_node_has_status(<var> IMAGE <image> PATH <path> STATUS <status>)
+#
+sysbuild_dt_function(dt_node_has_status)
+
+# Usage:
+#   sysbuild_dt_prop(<var> IMAGE <image> PATH <path> PROPERTY <prop> [INDEX <idx>])
+#
+sysbuild_dt_function(dt_prop)
+
+# Usage:
+#   sysbuild_dt_comp_path(<var> IMAGE <image> COMPATIBLE <compatible> [INDEX <idx>])
+#
+sysbuild_dt_function(dt_comp_path)
+
+# Usage:
+#   sysbuild_dt_num_regs(<var> IMAGE <image> PATH <path>)
+#
+sysbuild_dt_function(dt_num_regs)
+
+# Usage:
+#   sysbuild_dt_reg_addr(<var> IMAGE <image> PATH <path> [INDEX <idx>] [NAME <name>])
+#
+sysbuild_dt_function(dt_reg_addr)
+
+# Usage:
+#   sysbuild_dt_reg_size(<var> IMAGE <image> PATH <path> [INDEX <idx>] [NAME <name>])
+#
+sysbuild_dt_function(dt_reg_size)
+
+# Usage:
+#   sysbuild_dt_has_chosen(<var> IMAGE <image> PROPERTY <prop>)
+#
+sysbuild_dt_function(dt_has_chosen)
+
+# Usage:
+#   sysbuild_dt_chosen(<var> IMAGE <image> PROPERTY <prop>)
+#
+sysbuild_dt_function(dt_chosen)
diff --git a/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay b/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
index 04bf83ef44d..a57a0e82ba6 100644
--- a/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
+++ b/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay
@@ -2,6 +2,10 @@
 	status = "okay";
 };
 
+&bt_hci_sdc {
+	status = "disabled";
+};
+
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
diff --git a/snippets/wifi-enterprise/wifi-enterprise.conf b/snippets/wifi-enterprise/wifi-enterprise.conf
index dbac5ee6387..4de1130cf69 100644
--- a/snippets/wifi-enterprise/wifi-enterprise.conf
+++ b/snippets/wifi-enterprise/wifi-enterprise.conf
@@ -7,6 +7,15 @@ CONFIG_NET_BUF_VARIABLE_DATA_SIZE=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_HEAP_SIZE=70000
 
+#For use with Wi-Fi Credentials
+CONFIG_WIFI_CREDENTIALS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
+CONFIG_NVS=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_NVS=y
+
 # For use with TLS credentials
 CONFIG_TLS_CREDENTIALS_SHELL=y
 CONFIG_BASE64=y
diff --git a/soc/nordic/common/Kconfig.peripherals b/soc/nordic/common/Kconfig.peripherals
index f5d7a52c698..b9f582375d6 100644
--- a/soc/nordic/common/Kconfig.peripherals
+++ b/soc/nordic/common/Kconfig.peripherals
@@ -13,10 +13,12 @@ config HAS_HW_NRF_BPROT
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_BPROT))
 
 config HAS_HW_NRF_CC310
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310))
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310)) || \
+		 ($(dt_nodelabel_enabled,psa_rng) && SOC_SERIES_NRF91X)
 
 config HAS_HW_NRF_CC312
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312))
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312)) || \
+		 ($(dt_nodelabel_enabled,psa_rng) && SOC_NRF5340_CPUAPP)
 
 config HAS_HW_NRF_CCM
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CCM))
@@ -387,6 +389,15 @@ config HAS_HW_NRF_SWI4
 config HAS_HW_NRF_SWI5
 	def_bool $(dt_nodelabel_enabled_with_compat,swi5,$(DT_COMPAT_NORDIC_NRF_SWI))
 
+config HAS_HW_NRF_TDM
+	def_bool $(dt_nodelabel_enabled_with_compat,tdm,$(DT_COMPAT_NORDIC_NRF_TDM))
+
+config HAS_HW_NRF_TDM130
+	def_bool $(dt_nodelabel_enabled_with_compat,tdm130,$(DT_COMPAT_NORDIC_NRF_TDM))
+
+config HAS_HW_NRF_TDM131
+	def_bool $(dt_nodelabel_enabled_with_compat,tdm131,$(DT_COMPAT_NORDIC_NRF_TDM))
+
 config HAS_HW_NRF_TEMP
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_TEMP))
 
diff --git a/soc/nordic/common/dmm.c b/soc/nordic/common/dmm.c
index cfb3f3ad25f..874060c77b8 100644
--- a/soc/nordic/common/dmm.c
+++ b/soc/nordic/common/dmm.c
@@ -283,7 +283,7 @@ int dmm_buffer_in_release(void *region, void *user_buffer, size_t user_length, v
 	return 0;
 }
 
-int dmm_init(void)
+static int dmm_init(void)
 {
 	struct dmm_heap *dh;
 
@@ -295,3 +295,10 @@ int dmm_init(void)
 
 	return 0;
 }
+
+/*
+ * dmm_init relies on kheap, initialized in PRE_KERNEL_1 at
+ * CONFIG_KERNEL_INIT_PRIORITY_OBJECTS. To enable early device use of
+ * dmm, we initialize immediately after kheap.
+ */
+SYS_INIT(dmm_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/soc/nordic/common/dmm.h b/soc/nordic/common/dmm.h
index 34b517c92df..69b63c51696 100644
--- a/soc/nordic/common/dmm.h
+++ b/soc/nordic/common/dmm.h
@@ -163,14 +163,6 @@ int dmm_buffer_in_prepare(void *region, void *user_buffer, size_t user_length, v
  */
 int dmm_buffer_in_release(void *region, void *user_buffer, size_t user_length, void *buffer_in);
 
-/**
- * @brief Initialize DMM.
- *
- * @retval 0 If succeeded.
- * @retval -errno Negative errno code on failure.
- */
-int dmm_init(void);
-
 /** @endcond */
 
 #else
@@ -210,11 +202,6 @@ static ALWAYS_INLINE int dmm_buffer_in_release(void *region, void *user_buffer,
 	return 0;
 }
 
-static ALWAYS_INLINE int dmm_init(void)
-{
-	return 0;
-}
-
 #endif
 
 #ifdef __cplusplus
diff --git a/soc/nordic/nrf53/Kconfig b/soc/nordic/nrf53/Kconfig
index 33c938384cc..5ec26603056 100644
--- a/soc/nordic/nrf53/Kconfig
+++ b/soc/nordic/nrf53/Kconfig
@@ -165,12 +165,32 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
+config  NRF_TRUSTZONE_FLASH_REGION_SIZE
+	hex
+	default NRF_SPU_FLASH_REGION_SIZE
+	help
+	  Define the flash region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
+
 config NRF_SPU_RAM_REGION_SIZE
 	hex
 	default 0x2000
 	help
 	  RAM region size for the NRF_SPU peripheral
 
+config  NRF_TRUSTZONE_RAM_REGION_SIZE
+	hex
+	default NRF_SPU_RAM_REGION_SIZE
+	help
+	  Define the RAM region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
+
 config SOC_NRF_GPIO_FORWARDER_FOR_NRF5340
 	bool "Forward GPIO pins to network core"
 	depends on NRF_SOC_SECURE_SUPPORTED
diff --git a/soc/nordic/nrf54h/CMakeLists.txt b/soc/nordic/nrf54h/CMakeLists.txt
index 23c1cab1e77..c5f1aa93af4 100644
--- a/soc/nordic/nrf54h/CMakeLists.txt
+++ b/soc/nordic/nrf54h/CMakeLists.txt
@@ -18,3 +18,4 @@ zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
 
 add_subdirectory(bicr)
 add_subdirectory(gpd)
+add_subdirectory(ironside/se)
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
index 0373e00d07b..8e3a72373fc 100644
--- a/soc/nordic/nrf54h/Kconfig
+++ b/soc/nordic/nrf54h/Kconfig
@@ -7,6 +7,8 @@ config SOC_SERIES_NRF54HX
 	select HAS_NRFS
 	select HAS_NRFX
 	select HAS_NORDIC_DRIVERS
+	select SOC_EARLY_INIT_HOOK if ARM
+	select SOC_LATE_INIT_HOOK if SOC_NRF54H20_CPURAD_ENABLE
 	select NRF_PLATFORM_HALTIUM
 
 config SOC_NRF54H20_CPUAPP_COMMON
@@ -65,6 +67,16 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select HAS_PM
 	select HAS_POWEROFF
 
+config SOC_NRF54H20_CPURAD_ENABLE
+	bool "Boot the nRF54H20 Radio core"
+	default y if NRF_802154_SER_HOST
+	depends on SOC_NRF54H20_CPUAPP
+	select NRF_IRONSIDE_CPUCONF_SERVICE
+	help
+	  This will at application boot time enable clock to the
+	  Radiocore, and also power will be requested to the Radiocore
+	  subsystem. The Radiocore will then start executing instructions.
+
 config SOC_NRF54H20_CPURAD
 	select SOC_NRF54H20_CPURAD_COMMON
 
@@ -74,8 +86,9 @@ config SOC_NRF54H20_CPUPPR
 config SOC_NRF54H20_CPUFLPR
 	select RISCV_CORE_NORDIC_VPR
 
-rsource "bicr/Kconfig"
-rsource "gpd/Kconfig"
-
 config SOC_NRF54H20_IRON
 	select EXPERIMENTAL if MCUBOOT
+
+rsource "bicr/Kconfig"
+rsource "gpd/Kconfig"
+rsource "ironside/se/Kconfig"
diff --git a/soc/nordic/nrf54h/ironside/se/CMakeLists.txt b/soc/nordic/nrf54h/ironside/se/CMakeLists.txt
new file mode 100644
index 00000000000..5254d6e37b3
--- /dev/null
+++ b/soc/nordic/nrf54h/ironside/se/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT ironside_se_boot_report.c)
+zephyr_include_directories(include)
diff --git a/soc/nordic/nrf54h/ironside/se/Kconfig b/soc/nordic/nrf54h/ironside/se/Kconfig
new file mode 100644
index 00000000000..1e43127b555
--- /dev/null
+++ b/soc/nordic/nrf54h/ironside/se/Kconfig
@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT
+	bool "Nordic IRONside SE boot report"
+	default y if SOC_NRF54H20_CPUAPP
+	depends on SOC_NRF54H20_IRON
+	help
+	  This option enables parsing of the Boot Report populated by Nordic IRONside SE.
+
+config SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT_MAGIC
+	hex
+	default 0x4d69546f
+	help
+	  Constant used to check if an Nordic IRONside SE boot report has been written.
diff --git a/soc/nordic/nrf54h/ironside/se/include/nrf/ironside_se_boot_report.h b/soc/nordic/nrf54h/ironside/se/include/nrf/ironside_se_boot_report.h
new file mode 100644
index 00000000000..0843edd67e1
--- /dev/null
+++ b/soc/nordic/nrf54h/ironside/se/include/nrf/ironside_se_boot_report.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_SOC_NORDIC_NRF54H_IRONSIDE_SE_BOOT_REPORT_INCLUDE_NRF_IRONSIDE_SE_BOOT_REPORT_H_
+#define ZEPHYR_SOC_NORDIC_NRF54H_IRONSIDE_SE_BOOT_REPORT_INCLUDE_NRF_IRONSIDE_SE_BOOT_REPORT_H_
+
+#include <stdint.h>
+#include <stddef.h>
+
+#define IRONSIDE_SE_BOOT_REPORT_LOCAL_DOMAIN_CONTEXT_SIZE (16UL) /* Size in bytes */
+#define IRONSIDE_SE_BOOT_REPORT_RANDOM_DATA_SIZE (32UL) /* Size in bytes */
+
+/** @brief UICR error description contained in the boot report. */
+struct ironside_se_boot_report_uicr_error {
+	/** The type of error. A value of 0 indicates no error */
+	uint32_t error_type;
+	/** Error descriptions specific to each type of UICR error */
+	union {
+		/** RFU */
+		struct {
+			uint32_t rfu[4];
+		} rfu;
+	} description;
+};
+
+/** @brief IRONside boot report. */
+struct ironside_se_boot_report {
+	/** Magic value used to identify valid boot report */
+	uint32_t magic;
+	/** Firmware version of IRONside SE. 8bit MAJOR.MINOR.PATCH.SEQNUM */
+	uint32_t ironside_se_version_int;
+	/** Human readable extraversion of IRONside SE */
+	char ironside_se_extraversion[12];
+	/** Firmware version of IRONside SE recovery firmware. 8bit MAJOR.MINOR.PATCH.SEQNUM */
+	uint32_t ironside_se_recovery_version_int;
+	/** Human readable extraversion of IRONside SE recovery firmware */
+	char ironside_se_recovery_extraversion[12];
+	/** Copy of SICR.UROT.UPDATE.STATUS.*/
+	uint32_t ironside_update_status;
+	/** See @ref ironside_se_boot_report_uicr_error */
+	struct ironside_se_boot_report_uicr_error uicr_error_description;
+	/** Data passed from booting local domain to local domain being booted */
+	uint8_t local_domain_context[IRONSIDE_SE_BOOT_REPORT_LOCAL_DOMAIN_CONTEXT_SIZE];
+	/** CSPRNG data */
+	uint8_t random_data[IRONSIDE_SE_BOOT_REPORT_RANDOM_DATA_SIZE];
+	/** Reserved for Future Use */
+	uint32_t rfu[64];
+};
+
+/**
+ * @brief Get a pointer to the IRONside boot report.
+ *
+ * @param[out] report Will be set to point to the IRONside boot report.
+ *
+ * @return non-negative value if success, negative value otherwise.
+ * @retval -EFAULT if the magic field in the report is incorrect.
+ * @retval -EINVAL if @ref report is NULL.
+ */
+int ironside_se_boot_report_get(const struct ironside_se_boot_report **report);
+
+#endif /* ZEPHYR_SOC_NORDIC_NRF54H_IRONSIDE_SE_BOOT_REPORT_INCLUDE_NRF_IRONSIDE_SE_BOOT_REPORT_H_ */
diff --git a/soc/nordic/nrf54h/ironside/se/ironside_se_boot_report.c b/soc/nordic/nrf54h/ironside/se/ironside_se_boot_report.c
new file mode 100644
index 00000000000..d3f3c777c72
--- /dev/null
+++ b/soc/nordic/nrf54h/ironside/se/ironside_se_boot_report.c
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <zephyr/devicetree.h>
+#include <nrf/ironside_se_boot_report.h>
+
+#define IRONSIDE_SE_BOOT_REPORT_ADDR  DT_REG_ADDR(DT_NODELABEL(cpuapp_ironside_se_boot_report))
+#define IRONSIDE_SE_BOOT_REPORT_MAGIC CONFIG_SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT_MAGIC
+
+int ironside_se_boot_report_get(const struct ironside_se_boot_report **report)
+{
+	const struct ironside_se_boot_report *tmp_report =
+		(const struct ironside_se_boot_report *)IRONSIDE_SE_BOOT_REPORT_ADDR;
+
+	if (tmp_report->magic != IRONSIDE_SE_BOOT_REPORT_MAGIC) {
+		return -EINVAL;
+	}
+
+	*report = tmp_report;
+
+	return 0;
+}
diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 56e5e080233..1ec5da4aa19 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -167,12 +167,12 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 	nvic_suspend(&backup_data.nvic_context);
 	mpu_suspend(&backup_data.mpu_context);
 	ret = arch_pm_s2ram_suspend(system_off);
+	/* Cache is powered down so power up is needed even if s2ram failed. */
+	nrf_power_up_cache();
 	if (ret < 0) {
 		return ret;
 	}
 
-	nrf_power_up_cache();
-
 	mpu_resume(&backup_data.mpu_context);
 	nvic_resume(&backup_data.nvic_context);
 	scb_resume(&backup_data.scb_context);
@@ -180,48 +180,23 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
 	return ret;
 }
 
-void __attribute__((naked)) pm_s2ram_mark_set(void)
+void pm_s2ram_mark_set(void)
 {
 	/* empty */
-	__asm__ volatile("bx	lr\n");
 }
 
-bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
+bool pm_s2ram_mark_check_and_clear(void)
 {
-	__asm__ volatile(
-		/* Set return value to 0 */
-		"mov	r0, #0\n"
-
-		/* Load and check RESETREAS register */
-		"ldr	r3, [%[resetinfo_addr], %[resetreas_offs]]\n"
-		"cmp	r3, %[resetreas_unretained_mask]\n"
-
-		"bne	exit\n"
+	bool restore_valid;
+	uint32_t reset_reason = nrf_resetinfo_resetreas_local_get(NRF_RESETINFO);
 
-		/* Clear RESETREAS register */
-		"str	r0, [%[resetinfo_addr], %[resetreas_offs]]\n"
-
-		/* Load RESTOREVALID register */
-		"ldr	r3, [%[resetinfo_addr], %[restorevalid_offs]]\n"
-
-		/* Clear RESTOREVALID */
-		"str	r0, [%[resetinfo_addr], %[restorevalid_offs]]\n"
-
-		/* Check RESTOREVALID register */
-		"cmp	r3, %[restorevalid_present_mask]\n"
-		"bne	exit\n"
-
-		/* Set return value to 1 */
-		"mov	r0, #1\n"
+	if (reset_reason != NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK) {
+		return false;
+	}
+	nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
 
-		"exit:\n"
-		"bx	lr\n"
-		:
-		: [resetinfo_addr] "r"(NRF_RESETINFO),
-		  [resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
-		  [resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
-		  [restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
-		  [restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
+	restore_valid = nrf_resetinfo_restore_valid_check(NRF_RESETINFO);
+	nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
 
-		: "r0", "r1", "r3", "r4", "memory");
+	return restore_valid ? true : false;
 }
diff --git a/soc/nordic/nrf54h/soc.c b/soc/nordic/nrf54h/soc.c
index 6dc8100e00c..cbd0809713b 100644
--- a/soc/nordic/nrf54h/soc.c
+++ b/soc/nordic/nrf54h/soc.c
@@ -21,7 +21,7 @@
 #include <hal/nrf_nfct.h>
 #include <soc/nrfx_coredep.h>
 #include <soc_lrcconf.h>
-#include <dmm.h>
+#include <zephyr/drivers/firmware/nrf_ironside/cpuconf.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
@@ -43,6 +43,8 @@ sys_snode_t soc_node;
 				      ADDRESS_DOMAIN_Msk |                     \
 				      ADDRESS_BUS_Msk)))
 
+#define DT_NODELABEL_CPURAD_SLOT0_PARTITION DT_NODELABEL(cpurad_slot0_partition)
+
 static void power_domain_init(void)
 {
 	/*
@@ -126,10 +128,8 @@ bool z_arm_on_enter_cpu_idle(void)
 }
 #endif
 
-static int nordicsemi_nrf54h_init(void)
+void soc_early_init_hook(void)
 {
-	int err;
-
 	sys_cache_instr_enable();
 	sys_cache_data_enable();
 
@@ -137,11 +137,6 @@ static int nordicsemi_nrf54h_init(void)
 
 	trim_hsfll();
 
-	err = dmm_init();
-	if (err < 0) {
-		return err;
-	}
-
 #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(ccm030))
 	/* DMASEC is set to non-secure by default, which prevents CCM from
 	 * accessing secure memory. Change DMASEC to secure.
@@ -156,13 +151,33 @@ static int nordicsemi_nrf54h_init(void)
 	    DT_PROP_OR(DT_NODELABEL(nfct), nfct_pins_as_gpios, 0)) {
 		nrf_nfct_pad_config_enable_set(NRF_NFCT, false);
 	}
+}
 
-	return 0;
+#if defined(CONFIG_SOC_NRF54H20_CPURAD_ENABLE)
+void soc_late_init_hook(void)
+{
+	int err;
+
+	/* The msg will be used for communication prior to IPC
+	 * communication being set up. But at this moment no such
+	 * communication is required.
+	 */
+	uint8_t *msg = NULL;
+	size_t msg_size = 0;
+
+	void *radiocore_address =
+		(void *)(DT_REG_ADDR(DT_GPARENT(DT_NODELABEL_CPURAD_SLOT0_PARTITION)) +
+				 DT_REG_ADDR(DT_NODELABEL_CPURAD_SLOT0_PARTITION));
+
+	/* Don't wait as this is not yet supported. */
+	bool cpu_wait = false;
+
+	err = ironside_cpuconf(NRF_PROCESSOR_RADIOCORE, radiocore_address, cpu_wait, msg, msg_size);
+	__ASSERT(err == 0, "err was %d", err);
 }
+#endif
 
 void arch_busy_wait(uint32_t time_us)
 {
 	nrfx_coredep_delay_us(time_us);
 }
-
-SYS_INIT(nordicsemi_nrf54h_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/soc/nordic/nrf54l/CMakeLists.txt b/soc/nordic/nrf54l/CMakeLists.txt
index cebbda571b6..d986fe9c20d 100644
--- a/soc/nordic/nrf54l/CMakeLists.txt
+++ b/soc/nordic/nrf54l/CMakeLists.txt
@@ -6,3 +6,12 @@ zephyr_library_sources(
   ../validate_rram_partitions.c
   )
 zephyr_include_directories(.)
+
+# We need a buffer in memory in a static location which can be used by
+# the KMU peripheral. The KMU has a static destination address, we chose
+# this address to be 0x20000000, which is the first address in the SRAM.
+if(NOT CONFIG_BUILD_WITH_TFM AND CONFIG_PSA_NEED_CRACEN_KMU_DRIVER AND CONFIG_XIP)
+# Exclamation mark is printable character with the lowest number in ASCII table.
+# We are sure that this file will be included first.
+zephyr_linker_sources(RAM_SECTIONS SORT_KEY ! kmu_push_area_section.ld)
+endif()
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
index 019487126b5..69f075333b8 100644
--- a/soc/nordic/nrf54l/Kconfig
+++ b/soc/nordic/nrf54l/Kconfig
@@ -56,10 +56,18 @@ config SOC_NRF54L20_ENGA_CPUFLPR
 if SOC_SERIES_NRF54LX
 
 config SOC_NRF54LX_SKIP_CLOCK_CONFIG
-	bool "Skip clock frequency configuration in system initialization"
+	bool
+	prompt "Skip clock frequency configuration in system initialization" if TRUSTED_EXECUTION_SECURE
+	default y if TRUSTED_EXECUTION_NONSECURE
 	help
-	  With this option, the CPU clock frequency is not set during system initialization.
-	  The CPU runs with the default, hardware-selected frequency.
+	  With this option, the CPU clock frequency is not set during this
+	  Zephyr image's system initialization. The CPU runs with either
+	  the HW reset values, or with the configuration set by an image
+	  earlier in the boot chain.
+
+	  Note that for security reasons it is not supported to configure
+	  the clock peripheral (NRF_OSCILLATORS) from the non-secure
+	  domain.
 
 config SOC_NRF54LX_DISABLE_FICR_TRIMCNF
 	bool "Disable trimming of the device"
diff --git a/soc/nordic/nrf54l/kmu_push_area_section.ld b/soc/nordic/nrf54l/kmu_push_area_section.ld
new file mode 100644
index 00000000000..e8c8cd9f09a
--- /dev/null
+++ b/soc/nordic/nrf54l/kmu_push_area_section.ld
@@ -0,0 +1,19 @@
+# This section must be loaded first of all the
+# custom sections because we want it to be placed
+# at the top address of RAM.
+SECTION_PROLOGUE(NRF_KMU_RESERVED_PUSH_SECTION,(NOLOAD) ,)
+{
+    __nrf_kmu_reserved_push_area = .;
+    *(.nrf_kmu_reserved_push_area)
+    __nrf_kmu_reserved_push_area_end = .;
+} GROUP_NOLOAD_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
+
+# It doesn't seem to be possible to enforce placing a section
+# at a specific address in memory using the Zephyr SECTION macros.
+# So this assert is necessary to avoid accidentatly moving this
+# section to a different address.
+ASSERT(__nrf_kmu_reserved_push_area == RAM_ADDR, "Error:  \
+ The section NRF_KMU_RESERVED_PUSH_SECTION needs to be    \
+ placed on the top RAM address but it is not, please edit \
+ your linker scripts to make sure that it is placed on    \
+ the to RAM address.")
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index 737a0fbaa97..239094f3501 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -17,7 +17,6 @@
 
 #include <zephyr/devicetree.h>
 #include <zephyr/kernel.h>
-#include <zephyr/devicetree.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/cache.h>
@@ -50,16 +49,20 @@ static inline void power_and_clock_configuration(void)
  */
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	uint32_t xosc32ktrim = NRF_FICR->XOSC32KTRIM;
-
-	uint32_t offset_k =
-		(xosc32ktrim & FICR_XOSC32KTRIM_OFFSET_Msk) >> FICR_XOSC32KTRIM_OFFSET_Pos;
-
+	/* The SLOPE field is in the two's complement form, hence this special
+	 * handling. Ideally, it would result in just one SBFX instruction for
+	 * extracting the slope value, at least gcc is capable of producing such
+	 * output, but since the compiler apparently tries first to optimize
+	 * additions and subtractions, it generates slightly less than optimal
+	 * code.
+	 */
 	uint32_t slope_field_k =
 		(xosc32ktrim & FICR_XOSC32KTRIM_SLOPE_Msk) >> FICR_XOSC32KTRIM_SLOPE_Pos;
 	uint32_t slope_mask_k = FICR_XOSC32KTRIM_SLOPE_Msk >> FICR_XOSC32KTRIM_SLOPE_Pos;
 	uint32_t slope_sign_k = (slope_mask_k - (slope_mask_k >> 1));
 	int32_t slope_k = (int32_t)(slope_field_k ^ slope_sign_k) - (int32_t)slope_sign_k;
-
+	uint32_t offset_k =
+		(xosc32ktrim & FICR_XOSC32KTRIM_OFFSET_Msk) >> FICR_XOSC32KTRIM_OFFSET_Pos;
 	/* As specified in the nRF54L15 PS:
 	 * CAPVALUE = round( (2*CAPACITANCE - 12) * (FICR->XOSC32KTRIM.SLOPE + 0.765625 * 2^9)/(2^9)
 	 *            + FICR->XOSC32KTRIM.OFFSET/(2^6) );
@@ -67,29 +70,22 @@ static inline void power_and_clock_configuration(void)
 	 * value between 4 pF and 18 pF in 0.5 pF steps.
 	 */
 
-	/* Encoding of desired capacitance (single ended) to value required for INTCAP core
-	 * calculation: (CAP_VAL - 4 pF)* 0.5
-	 * That translate to ((CAP_VAL_FEMTO_F - 4000fF) * 2UL) / 1000UL
-	 *
-	 * NOTE: The desired capacitance value is used in encoded from in INTCAP calculation formula
-	 *       That is different than in case of HFXO.
-	 */
-	uint32_t cap_val_encoded = (((DT_PROP(LFXO_NODE, load_capacitance_femtofarad) - 4000UL)
-				     * 2UL) / 1000UL);
+	uint32_t lfxo_intcap_femto_f = DT_PROP(LFXO_NODE, load_capacitance_femtofarad);
 
 	/* Calculation of INTCAP code before rounding. Min that calculations here are done on
 	 * values multiplied by 2^9, e.g. 0.765625 * 2^9 = 392.
 	 * offset_k should be divided by 2^6, but to add it to value shifted by 2^9 we have to
-	 * multiply it be 2^3.
+	 * multiply it be 2^3. Capacitance value passed to the formula is in femto Farads to
+	 * avoid floating point data type. Hence, offset_k needs to be multiplied by 1000.
 	 */
-	uint32_t mid_val = (2UL * cap_val_encoded - 12UL) * (uint32_t)(slope_k + 392UL)
-			   + (offset_k << 3UL);
+	uint32_t lfxo_intcap_mid_val = (2UL * lfxo_intcap_femto_f - 12000UL)
+			* (uint32_t)(slope_k + 392UL) + (offset_k << 3UL) * 1000UL;
 
-	/* Get integer part of the INTCAP code */
-	uint32_t lfxo_intcap = mid_val >> 9UL;
+	/* Get integer part of the INTCAP by dividing by 2^9 and convert to pico Farads. */
+	uint32_t lfxo_intcap = lfxo_intcap_mid_val / 512000UL;
 
-	/* Round based on fractional part */
-	if ((mid_val & BIT_MASK(9)) > (BIT_MASK(9) / 2)) {
+	/* Round based on fractional part. */
+	if (lfxo_intcap_mid_val % 512000UL >= 256000UL) {
 		lfxo_intcap++;
 	}
 
@@ -107,11 +103,11 @@ static inline void power_and_clock_configuration(void)
 	 * additions and subtractions, it generates slightly less than optimal
 	 * code.
 	 */
-	uint32_t slope_field =
+	uint32_t slope_field_m =
 		(xosc32mtrim & FICR_XOSC32MTRIM_SLOPE_Msk) >> FICR_XOSC32MTRIM_SLOPE_Pos;
-	uint32_t slope_mask = FICR_XOSC32MTRIM_SLOPE_Msk >> FICR_XOSC32MTRIM_SLOPE_Pos;
-	uint32_t slope_sign = (slope_mask - (slope_mask >> 1));
-	int32_t slope_m = (int32_t)(slope_field ^ slope_sign) - (int32_t)slope_sign;
+	uint32_t slope_mask_m = FICR_XOSC32MTRIM_SLOPE_Msk >> FICR_XOSC32MTRIM_SLOPE_Pos;
+	uint32_t slope_sign_m = (slope_mask_m - (slope_mask_m >> 1));
+	int32_t slope_m = (int32_t)(slope_field_m ^ slope_sign_m) - (int32_t)slope_sign_m;
 	uint32_t offset_m =
 		(xosc32mtrim & FICR_XOSC32MTRIM_OFFSET_Msk) >> FICR_XOSC32MTRIM_OFFSET_Pos;
 	/* As specified in the nRF54L15 PS:
@@ -121,22 +117,19 @@ static inline void power_and_clock_configuration(void)
 	 * holding any value between 4.0 pF and 17.0 pF in 0.25 pF steps.
 	 */
 
-	/* NOTE 1: Requested HFXO internal capacitance in femto Faradas is used directly in formula
-	 *         to calculate INTCAP code. That is different than in case of LFXO.
-	 *
-	 * NOTE 2: PS formula uses piko Farads, the implementation of the formula uses femto Farads
-	 *         to avoid use of floating point data type.
-	 */
-	uint32_t cap_val_femto_f = DT_PROP(HFXO_NODE, load_capacitance_femtofarad);
+	uint32_t hfxo_intcap_femto_f = DT_PROP(HFXO_NODE, load_capacitance_femtofarad);
 
-	uint32_t mid_val_intcap = (((cap_val_femto_f - 5500UL) * (uint32_t)(slope_m + 791UL))
-		 + (offset_m << 2UL) * 1000UL) >> 8UL;
+	/* Capacitance value passed to the formula is in femto Farads to
+	 * avoid floating point data type. Hence, offset_m needs to be multiplied by 1000.
+	 */
+	uint32_t hfxo_intcap_mid_val = (((hfxo_intcap_femto_f - 5500UL)
+			* (uint32_t)(slope_m + 791UL)) + (offset_m << 2UL) * 1000UL) >> 8UL;
 
-	/* Convert the calculated value to piko Farads */
-	uint32_t hfxo_intcap = mid_val_intcap / 1000;
+	/* Convert the calculated value to piko Farads. */
+	uint32_t hfxo_intcap = hfxo_intcap_mid_val / 1000;
 
-	/* Round based on fractional part */
-	if (mid_val_intcap % 1000 >= 500) {
+	/* Round based on fractional part. */
+	if (hfxo_intcap_mid_val % 1000 >= 500) {
 		hfxo_intcap++;
 	}
 
diff --git a/soc/nordic/nrf91/Kconfig b/soc/nordic/nrf91/Kconfig
index ed38eff73a2..9f55cdd77ed 100644
--- a/soc/nordic/nrf91/Kconfig
+++ b/soc/nordic/nrf91/Kconfig
@@ -24,6 +24,16 @@ config NRF_SPU_FLASH_REGION_SIZE
 	help
 	  FLASH region size for the NRF_SPU peripheral
 
+config  NRF_TRUSTZONE_FLASH_REGION_SIZE
+	hex
+	default NRF_SPU_FLASH_REGION_SIZE
+	help
+	  Define the flash region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
+
 config NRF_SPU_RAM_REGION_SIZE
 	hex
 	default 0x2000
@@ -34,4 +44,14 @@ config NRF_ENABLE_ICACHE
 	bool "Instruction cache (I-Cache)"
 	default y
 
+config  NRF_TRUSTZONE_RAM_REGION_SIZE
+	hex
+	default NRF_SPU_RAM_REGION_SIZE
+	help
+	  Define the RAM region size from a TrustZone perspective.
+	  This is used when we set the security attributes(S/NSC/NS) of a region
+	  in TrustZone enabled devices.
+	  In practice this option defines the granularity of the security attributes,
+	  i.e. the smallest region that can be set to secure or non-secure.
+
 endif # SOC_SERIES_NRF91X
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index 6ba7af359a9..60726163581 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -143,10 +143,12 @@ config BT_CTLR
 	  the HAS_BT_CTLR option.
 
 config BT_LL_SW_SPLIT
-	bool "Software-based Bluetooth LE Link Layer"
+	bool "Software-based Bluetooth LE Link Layer [EXPERIMENTAL]"
 	default y
 	depends on DT_HAS_ZEPHYR_BT_HCI_LL_SW_SPLIT_ENABLED
 	select HAS_BT_CTLR
+	select EXPERIMENTAL
+	select ENTROPY_GENERATOR
 	help
 	  Use Zephyr software Bluetooth LE Link Layer ULL LLL split implementation.
 
@@ -887,7 +889,7 @@ endif # BT_CTLR_SYNC_PERIODIC
 config BT_CTLR_SYNC_TRANSFER_SENDER
 	bool "Periodic Advertising Sync Transfer sender"
 	depends on BT_CTLR_SYNC_TRANSFER_SENDER_SUPPORT
-	select BT_TICKER_LAZY_GET
+	select BT_TICKER_LAZY_GET if BT_LL_SW_SPLIT
 	default BT_PER_ADV_SYNC_TRANSFER_SENDER
 	help
 	  Enable support for the Periodic Advertising Sync Transfer control procedure
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index d3e1f77b355..f93ea59f38e 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -62,7 +62,7 @@ static struct {
 /* FIXME: This could probably use a chosen entropy device instead on relying on
  * the nodelabel being the same as for the old nrf rng.
  */
-static const struct device *const dev_entropy = DEVICE_DT_GET(DT_NODELABEL(rng));
+static const struct device *const dev_entropy = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
 #endif /* CONFIG_ENTROPY_HAS_DRIVER */
 
 static int init_reset(void);
diff --git a/subsys/bluetooth/crypto/Kconfig b/subsys/bluetooth/crypto/Kconfig
index 0856daf9d9a..0f46a0f59a0 100644
--- a/subsys/bluetooth/crypto/Kconfig
+++ b/subsys/bluetooth/crypto/Kconfig
@@ -8,6 +8,7 @@ config BT_CRYPTO
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
 	select PSA_WANT_ALG_ECB_NO_PADDING
+	imply MBEDTLS_CIPHER_AES_ENABLED if !BUILD_WITH_TFM
 	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables the Bluetooth Cryptographic Toolbox.
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index e77bd9220a2..58c65bd909d 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -184,9 +184,6 @@ config BT_HOST_CRYPTO
 config BT_HOST_CRYPTO_PRNG
 	bool "Use PSA crypto API library for random number generation"
 	default y
-	select PSA_WANT_ALG_SHA_256
-	select PSA_WANT_KEY_TYPE_HMAC
-	select PSA_WANT_ALG_HMAC
 	depends on BT_HOST_CRYPTO
 	help
 	  When selected, will use PSA Crypto API library for random number generation.
diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index a04241a3e94..221bc413c4b 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -38,6 +38,23 @@ config BT_ATT_RETRY_ON_SEC_ERR
 	  If an ATT request fails due to insufficient security, the host will
 	  try to elevate the security level and retry the ATT request.
 
+config BT_ATT_SENT_CB_AFTER_TX
+	bool "Delay ATT sent callback until data transmission is done by controller [EXPERIMENTAL]"
+	select EXPERIMENTAL
+	help
+	  By default, the BLE stack calls sent callback for ATT data when the
+	  data is passed to BLE controller for transmission. Enabling this
+	  Kconfig option delays calling the sent callback until data
+	  transmission is finished by BLE controller (the callback is called
+	  upon receiving the Number of Completed Packets HCI Event).
+
+	  The feature is not available in Zephyr RTOS (it's specific to NCS
+	  Zephyr fork). It is a temporary solution allowing to control flow of
+	  GATT notifications with HID reports for HID use-case.
+
+	  Enabling this option may require increasing CONFIG_BT_CONN_TX_MAX in
+	  configuration, because ATT would use additional TX contexts.
+
 config BT_EATT
 	bool "Enhanced ATT Bearers support [EXPERIMENTAL]"
 	depends on BT_L2CAP_ECRED
diff --git a/subsys/bluetooth/host/Kconfig.l2cap b/subsys/bluetooth/host/Kconfig.l2cap
index 2841e7d8a12..34e862378c5 100644
--- a/subsys/bluetooth/host/Kconfig.l2cap
+++ b/subsys/bluetooth/host/Kconfig.l2cap
@@ -52,7 +52,7 @@ config BT_L2CAP_DYNAMIC_CHANNEL
 	  allowing the creation of dynamic L2CAP Channels.
 
 config BT_L2CAP_ECRED
-	bool "L2CAP Enhanced Credit Based Flow Control support"
+	bool "L2CAP Enhanced Credit Based Flow Control support [EXPERIMENTAL]"
 	depends on BT_L2CAP_DYNAMIC_CHANNEL
 	help
 	  This option enables support for LE Connection oriented Channels with
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index b2cfbfee722..335032918fe 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -327,6 +327,13 @@ static void att_disconnect(struct bt_att_chan *chan)
 	}
 }
 
+static void chan_sent_cb(struct bt_conn *conn, void *user_data, int err)
+{
+	struct net_buf *nb = user_data;
+
+	net_buf_unref(nb);
+}
+
 /* In case of success the ownership of the buffer is transferred to the stack
  * which takes care of releasing it when it completes transmitting to the
  * controller.
@@ -420,7 +427,15 @@ static int chan_send(struct bt_att_chan *chan, struct net_buf *buf)
 
 	data->att_chan = chan;
 
-	err = bt_l2cap_send_pdu(&chan->chan, buf, NULL, NULL);
+	if (IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX)) {
+		err = bt_l2cap_send_pdu(&chan->chan, buf, chan_sent_cb, net_buf_ref(buf));
+		if (err) {
+			net_buf_unref(buf);
+		}
+	} else {
+		err = bt_l2cap_send_pdu(&chan->chan, buf, NULL, NULL);
+	}
+
 	if (err) {
 		if (err == -ENOBUFS) {
 			LOG_ERR("Ran out of TX buffers or contexts.");
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index f75147d6e53..4f8725663ee 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -706,7 +706,17 @@ static int send_buf(struct bt_conn *conn, struct net_buf *buf,
 
 	uint16_t frag_len = MIN(conn_mtu(conn), len);
 
-	__ASSERT_NO_MSG(buf->ref == 1);
+	/* If ATT sent callback is delayed until data transmission is done by BLE controller, the
+	 * transmitted buffer may have an additional reference. The reference is used to extend
+	 * lifetime of the net buffer until the data transmission is confirmed by ACK of the remote.
+	 *
+	 * send_buf function can be called multiple times, if buffer has to be fragmented over HCI.
+	 * In that case, the callback is provided as an argument only for the last transmitted
+	 * fragment. The `buf->ref == 1` check is skipped because it's impossible to properly
+	 * validate number of references for the sent fragments if buffers may have the additional
+	 * reference.
+	 */
+	__ASSERT_NO_MSG(IS_ENABLED(CONFIG_BT_ATT_SENT_CB_AFTER_TX) || (buf->ref == 1));
 
 	if (buf->len > frag_len) {
 		LOG_DBG("keep %p around", buf);
diff --git a/subsys/bluetooth/host/cs.c b/subsys/bluetooth/host/cs.c
index da0d3726023..7b84bbafe62 100644
--- a/subsys/bluetooth/host/cs.c
+++ b/subsys/bluetooth/host/cs.c
@@ -618,6 +618,10 @@ int bt_le_cs_start_test(const struct bt_le_cs_test_param *params)
 
 	cp->override_parameters_length = override_parameters_length;
 
+	struct bt_hci_cmd_hdr *hdr = (struct bt_hci_cmd_hdr *)buf->data;
+
+	hdr->param_len += override_parameters_length;
+
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_CS_TEST, buf, NULL);
 }
 #endif /* CONFIG_BT_CHANNEL_SOUNDING_TEST */
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index c1ee3ecc2cf..0f7017269ef 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -735,13 +735,17 @@ int bt_l2cap_send_pdu(struct bt_l2cap_le_chan *le_chan, struct net_buf *pdu,
 		return -ENOTCONN;
 	}
 
-	if (pdu->ref != 1) {
+	/* Allow for an additional buffer reference if callback is provided. This can be used to
+	 * extend lifetime of the net buffer until the data transmission is confirmed by ACK of the
+	 * remote.
+	 */
+	if (pdu->ref > 1 + (cb ? 1 : 0)) {
 		/* The host may alter the buf contents when fragmenting. Higher
 		 * layers cannot expect the buf contents to stay intact. Extra
 		 * refs suggests a silent data corruption would occur if not for
 		 * this error.
 		 */
-		LOG_ERR("Expecting 1 ref, got %d", pdu->ref);
+		LOG_ERR("Expecting up to %d refs, got %d", cb ? 2 : 1, pdu->ref);
 		return -EINVAL;
 	}
 
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index b876e88dae6..8a7e572f782 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -59,12 +59,16 @@ choice BT_MESH_ADV
 
 menuconfig BT_MESH_ADV_LEGACY
 	bool "Legacy advertising"
+	depends on BT_LL_SW_SPLIT
 	help
 	  Use legacy advertising commands for mesh sending. Legacy
-	  advertising is significantly slower than the extended advertising, but
-	  is supported by all controllers.
+	  advertising is significantly slower than the extended advertising.
 
-	  WARNING: The legacy advertiser can occasionally do more message
+	  WARNING: This feature is not supported in NCS. The legacy advertiser will not work
+	  with SDC, as attempting to start an advertisement during the scanner duty cycle
+	  will result in an error. The Zephyr Link Layer can be used experimentally as an
+	  alternative.
+	  The legacy advertiser can occasionally do more message
 	  retransmissions than requested because of limitations of HCI
 	  interface API.
 
@@ -210,6 +214,17 @@ config BT_MESH_ADV_EXT_FRIEND_SEPARATE
 	  messages as close to the start of the ReceiveWindow as possible,
 	  thus reducing the scanning time on the Low Power node.
 
+config BT_MESH_ADV_EXT_ACCEPT_EXT_ADV_PACKETS
+	bool "Reject or accept extended advertising packets"
+	depends on BT_LL_SOFTDEVICE
+	help
+	  Configure the scanner and initiator to either reject or accept extended
+	  advertising packets by the SoftDevice Controller. This is set to false
+	  by default, to prevent loss of scan time when receiving a pointer packet
+	  while scanning for Bluetooth Mesh packets. Set to true if extended
+	  advertising packets are to be received by the SoftDevice Controller for
+	  purposes other than Bluetooth Mesh.
+
 endif # BT_MESH_ADV_EXT
 
 endchoice
@@ -1700,7 +1715,7 @@ config BT_MESH_LPN_INIT_POLL_TIMEOUT
 config BT_MESH_LPN_SCAN_LATENCY
 	int "Latency for enabling scanning"
 	range 0 50
-	default 15
+	default 2
 	help
 	  Latency in milliseconds that it takes to enable scanning. This
 	  is in practice how much time in advance before the Receive Window
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index 7641ba33224..02dffc35413 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -13,6 +13,9 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/mesh.h>
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+#include <sdc_hci_vs.h>
+#endif
 
 #include "common/bt_str.h"
 
@@ -149,6 +152,28 @@ static inline struct bt_mesh_ext_adv *gatt_adv_get(void)
 	}
 }
 
+static int set_adv_randomness(uint8_t handle, int rand_us)
+{
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+	struct net_buf *buf;
+	sdc_hci_cmd_vs_set_adv_randomness_t *cmd_params;
+
+	buf = bt_hci_cmd_create(SDC_HCI_OPCODE_CMD_VS_SET_ADV_RANDOMNESS, sizeof(*cmd_params));
+	if (!buf) {
+		LOG_ERR("Could not allocate command buffer");
+		return -ENOMEM;
+	}
+
+	cmd_params = net_buf_add(buf, sizeof(*cmd_params));
+	cmd_params->adv_handle = handle;
+	cmd_params->rand_us = rand_us;
+
+	return bt_hci_cmd_send_sync(SDC_HCI_OPCODE_CMD_VS_SET_ADV_RANDOMNESS, buf, NULL);
+#else
+	return 0;
+#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */
+}
+
 static int adv_start(struct bt_mesh_ext_adv *ext_adv,
 		     const struct bt_le_adv_param *param,
 		     struct bt_le_ext_adv_start_param *start,
@@ -489,6 +514,18 @@ void bt_mesh_adv_init(void)
 				   K_PRIO_COOP(MESH_WORKQ_PRIORITY), NULL);
 		k_thread_name_set(&bt_mesh_workq.thread, "BT MESH WQ");
 	}
+
+#if defined(CONFIG_BT_LL_SOFTDEVICE)
+	const sdc_hci_cmd_vs_scan_accept_ext_adv_packets_set_t cmd_params = {
+		.accept_ext_adv_packets = IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_ACCEPT_EXT_ADV_PACKETS),
+	};
+
+	int err = sdc_hci_cmd_vs_scan_accept_ext_adv_packets_set(&cmd_params);
+
+	if (err) {
+		LOG_ERR("Failed to set accept_ext_adv_packets: %d", err);
+	}
+#endif
 }
 
 static struct bt_mesh_ext_adv *adv_instance_find(struct bt_le_ext_adv *instance)
@@ -541,6 +578,15 @@ int bt_mesh_adv_enable(void)
 		if (err) {
 			return err;
 		}
+
+		if (IS_ENABLED(CONFIG_BT_LL_SOFTDEVICE) &&
+		    IS_ENABLED(CONFIG_BT_MESH_ADV_EXT_FRIEND_SEPARATE) &&
+		    advs[i].tags == BT_MESH_ADV_TAG_BIT_FRIEND) {
+			err = set_adv_randomness(advs[i].instance->handle, 0);
+			if (err) {
+				LOG_ERR("Failed to set zero randomness: %d", err);
+			}
+		}
 	}
 
 	return 0;
diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index 5683d23a87a..2984efe0906 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -49,6 +49,48 @@ enum IMAGE_INDEXES {
 	IMAGE_INDEX_2
 };
 
+#if USE_PARTITION_MANAGER
+#include <pm_config.h>
+
+#if CONFIG_MCUBOOT_APPLICATION_IMAGE_NUMBER != -1
+/* Sysbuild */
+#ifdef CONFIG_MCUBOOT
+/* lib is part of MCUboot -> operate on the primary application slot */
+#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#else
+/* TODO: Add firmware loader support */
+/* lib is part of the app -> operate on active slot */
+#if defined(CONFIG_NCS_IS_VARIANT_IMAGE)
+#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_SECONDARY_ID
+#else
+#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#endif
+#endif /* CONFIG_MCUBOOT */
+#else
+/* Legacy child/parent */
+#if CONFIG_BUILD_WITH_TFM
+	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
+#else
+	#define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE)
+#endif
+
+#ifdef CONFIG_MCUBOOT
+	/* lib is part of MCUboot -> operate on the primary application slot */
+	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#else
+	/* lib is part of the App -> operate on active slot */
+#if (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_PRIMARY_ADDRESS
+	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_PRIMARY_ID
+#elif (PM_ADDRESS - PM_ADDRESS_OFFSET) == PM_MCUBOOT_SECONDARY_ADDRESS
+	#define ACTIVE_SLOT_FLASH_AREA_ID	PM_MCUBOOT_SECONDARY_ID
+#else
+	#error Missing partition definitions.
+#endif
+#endif /* CONFIG_MCUBOOT */
+#endif /* CONFIG_MCUBOOT_APPLICATION_IMAGE_NUMBER != -1 */
+
+#else
+
 #if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)
 /* For RAM LOAD mode, the active image must be fetched from the bootloader */
 #define ACTIVE_SLOT_FLASH_AREA_ID boot_fetch_active_slot()
@@ -58,6 +100,8 @@ enum IMAGE_INDEXES {
 #define ACTIVE_SLOT_FLASH_AREA_ID DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_code_partition))
 #endif
 
+#endif /* USE_PARTITION_MANAGER */
+
 /*
  * Raw (on-flash) representation of the v1 image header.
  */
diff --git a/subsys/dfu/boot/mcuboot_shell.c b/subsys/dfu/boot/mcuboot_shell.c
index be4e558713f..e167bc1e39b 100644
--- a/subsys/dfu/boot/mcuboot_shell.c
+++ b/subsys/dfu/boot/mcuboot_shell.c
@@ -20,6 +20,16 @@
 #endif
 #endif
 
+#if USE_PARTITION_MANAGER
+#include <flash_map_pm.h>
+
+#ifdef CONFIG_NCS_IS_VARIANT_IMAGE
+#define ACTIVE_IMAGE_ID PM_MCUBOOT_SECONDARY_ID
+#else
+#define ACTIVE_IMAGE_ID PM_MCUBOOT_PRIMARY_ID
+#endif
+#endif
+
 struct area_desc {
 	const char *name;
 	unsigned int id;
@@ -93,6 +103,35 @@ static int cmd_mcuboot_erase(const struct shell *sh, size_t argc,
 	id = strtoul(argv[1], NULL, 0);
 
 	/* Check if this is the parent (MCUboot) or own slot and if so, deny the request */
+#if USE_PARTITION_MANAGER
+#ifdef PM_MCUBOOT_ID
+	if (id == PM_MCUBOOT_ID || id == PM_MCUBOOT_PAD_ID) {
+		shell_error(sh, "Cannot erase boot partition");
+		return -EACCES;
+	}
+#endif
+
+#ifdef PM_APP_ID
+	if (id == PM_APP_ID) {
+		shell_error(sh, "Cannot erase this area");
+		return -EACCES;
+	}
+#endif
+
+#ifdef PM_MCUBOOT_PRIMARY_APP_ID
+	if (id == PM_MCUBOOT_PRIMARY_APP_ID) {
+		shell_error(sh, "Cannot erase this area");
+		return -EACCES;
+	}
+#endif
+
+#ifdef ACTIVE_IMAGE_ID
+	if (id == ACTIVE_IMAGE_ID) {
+		shell_error(sh, "Cannot erase active partitions");
+		return -EACCES;
+	}
+#endif
+#else
 #if FIXED_PARTITION_EXISTS(boot_partition)
 	if (id == FIXED_PARTITION_ID(boot_partition)) {
 		shell_error(sh, "Cannot erase boot partition");
@@ -105,6 +144,7 @@ static int cmd_mcuboot_erase(const struct shell *sh, size_t argc,
 		shell_error(sh, "Cannot erase active partitions");
 		return -EACCES;
 	}
+#endif
 #endif
 
 	err = boot_erase_img_bank(id);
diff --git a/subsys/fs/littlefs_fs.c b/subsys/fs/littlefs_fs.c
index 7cd05d5be33..554a9b289ac 100644
--- a/subsys/fs/littlefs_fs.c
+++ b/subsys/fs/littlefs_fs.c
@@ -1100,7 +1100,12 @@ struct fs_mount_t FS_FSTAB_ENTRY(DT_DRV_INST(inst)) = { \
 	.type = FS_LITTLEFS, \
 	.mnt_point = DT_INST_PROP(inst, mount_point), \
 	.fs_data = &fs_data_##inst, \
-	.storage_dev = (void *)DT_FIXED_PARTITION_ID(FS_PARTITION(inst)), \
+	.storage_dev = (void *) \
+		COND_CODE_1(USE_PARTITION_MANAGER, \
+			    (COND_CODE_1(FIXED_PARTITION_EXISTS(littlefs_storage), \
+					 (FIXED_PARTITION_ID(littlefs_storage)), \
+					 (FIXED_PARTITION_ID(storage)))), \
+			    (DT_FIXED_PARTITION_ID(FS_PARTITION(inst)))), \
 	.flags = FSTAB_ENTRY_DT_MOUNT_FLAGS(DT_DRV_INST(inst)), \
 };
 
diff --git a/subsys/fs/nvs/Kconfig b/subsys/fs/nvs/Kconfig
index 48915c2f048..21798932f52 100644
--- a/subsys/fs/nvs/Kconfig
+++ b/subsys/fs/nvs/Kconfig
@@ -29,6 +29,15 @@ config NVS_LOOKUP_CACHE_SIZE
 	  Number of entries in Non-volatile Storage lookup cache.
 	  It is recommended that it be a power of 2.
 
+config NVS_LOOKUP_CACHE_FOR_SETTINGS
+	bool "Non-volatile Storage lookup cache optimized for settings"
+	depends on NVS_LOOKUP_CACHE
+	help
+	  Use the lookup cache hash function that results in the least number of
+	  collissions and, in turn, the best NVS performance provided that the NVS
+	  is used as the settings backend only. This option should NOT be enabled
+	  if the NVS is also written to directly, outside the settings layer.
+
 config NVS_DATA_CRC
 	bool "Non-volatile Storage CRC protection on the data"
 	help
diff --git a/subsys/fs/nvs/nvs.c b/subsys/fs/nvs/nvs.c
index 2c7c4ff5606..5b1b3056c9d 100644
--- a/subsys/fs/nvs/nvs.c
+++ b/subsys/fs/nvs/nvs.c
@@ -13,6 +13,11 @@
 #include <zephyr/sys/crc.h>
 #include "nvs_priv.h"
 
+#ifdef CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS
+#include <zephyr/sys/util.h>
+#include <settings/settings_nvs.h>
+#endif
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_nvs, CONFIG_NVS_LOG_LEVEL);
 
@@ -21,6 +26,45 @@ static int nvs_ate_valid(struct nvs_fs *fs, const struct nvs_ate *entry);
 
 #ifdef CONFIG_NVS_LOOKUP_CACHE
 
+#ifdef CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS
+
+static inline size_t nvs_lookup_cache_pos(uint16_t id)
+{
+	/*
+	 * 1. The NVS settings backend uses up to (NVS_NAME_ID_OFFSET - 1) NVS IDs to
+	      store keys and equal number of NVS IDs to store values.
+	 * 2. For each key-value pair, the value is stored at NVS ID greater by exactly
+	 *    NVS_NAME_ID_OFFSET than NVS ID that holds the key.
+	 * 3. The backend tries to minimize the range of NVS IDs used to store keys.
+	 *    That is, NVS IDs are allocated sequentially, and freed NVS IDs are reused
+	 *    before allocating new ones.
+	 *
+	 * Therefore, to assure the least number of collisions in the lookup cache,
+	 * the least significant bit of the hash indicates whether the given NVS ID
+	 * represents a key or a value, and remaining bits of the hash are set to
+	 * the ordinal number of the key-value pair. Consequently, the hash function
+	 * provides the following mapping:
+	 *
+	 * 1st settings key   => hash 0
+	 * 1st settings value => hash 1
+	 * 2nd settings key   => hash 2
+	 * 2nd settings value => hash 3
+	 * ...
+	 */
+	BUILD_ASSERT(IS_POWER_OF_TWO(NVS_NAMECNT_ID), "NVS_NAMECNT_ID is not power of 2");
+	BUILD_ASSERT(IS_POWER_OF_TWO(NVS_NAME_ID_OFFSET), "NVS_NAME_ID_OFFSET is not power of 2");
+
+	uint16_t key_value_bit;
+	uint16_t key_value_ord;
+
+	key_value_bit = (id >> LOG2(NVS_NAME_ID_OFFSET)) & 1;
+	key_value_ord = id & (NVS_NAME_ID_OFFSET - 1);
+
+	return ((key_value_ord << 1) | key_value_bit) % CONFIG_NVS_LOOKUP_CACHE_SIZE;
+}
+
+#else /* CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static inline size_t nvs_lookup_cache_pos(uint16_t id)
 {
 	uint16_t hash;
@@ -36,6 +80,8 @@ static inline size_t nvs_lookup_cache_pos(uint16_t id)
 	return hash % CONFIG_NVS_LOOKUP_CACHE_SIZE;
 }
 
+#endif /* CONFIG_NVS_LOOKUP_CACHE_FOR_SETTINGS */
+
 static int nvs_lookup_cache_rebuild(struct nvs_fs *fs)
 {
 	int rc;
diff --git a/subsys/fs/zms/Kconfig b/subsys/fs/zms/Kconfig
index aed3a398f2d..65dcdd875ff 100644
--- a/subsys/fs/zms/Kconfig
+++ b/subsys/fs/zms/Kconfig
@@ -50,6 +50,15 @@ config ZMS_CUSTOM_BLOCK_SIZE
 	help
 	  Changes the internal buffer size of ZMS
 
+config ZMS_LOOKUP_CACHE_FOR_SETTINGS
+	bool "ZMS Storage lookup cache optimized for settings"
+	depends on ZMS_LOOKUP_CACHE && SETTINGS_ZMS
+	help
+	  Use the lookup cache hash function that results in the least number of
+	  collissions and, in turn, the best ZMS performance provided that the ZMS
+	  is used as the settings backend only. This option should NOT be enabled
+	  if the ZMS is also written to directly, outside the settings layer.
+
 config ZMS_NO_DOUBLE_WRITE
 	bool "Avoid writing the same data again in the storage"
 	help
diff --git a/subsys/fs/zms/zms.c b/subsys/fs/zms/zms.c
index 95cfc788b09..efbf6e2cc84 100644
--- a/subsys/fs/zms/zms.c
+++ b/subsys/fs/zms/zms.c
@@ -12,6 +12,9 @@
 #include <zephyr/fs/zms.h>
 #include <zephyr/sys/crc.h>
 #include "zms_priv.h"
+#ifdef CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS
+#include <settings/settings_zms.h>
+#endif
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_zms, CONFIG_ZMS_LOG_LEVEL);
@@ -28,15 +31,41 @@ static int zms_ate_valid_different_sector(struct zms_fs *fs, const struct zms_at
 
 static inline size_t zms_lookup_cache_pos(uint32_t id)
 {
-	uint32_t hash;
+	uint32_t hash = id;
+
+#ifdef CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS
+	/*
+	 * 1. Settings subsystem is storing the name ID and the linked list node ID
+	 *    with only one bit difference at BIT(0).
+	 * 2. Settings subsystem is also storing the name ID and the data ID in two
+	 *    different ZMS entries at an exact offset of ZMS_DATA_ID_OFFSET.
+	 *
+	 * Therefore, to assure the least number of collisions in the lookup cache,
+	 * the BIT(0) of the hash indicates whether the given ZMS ID represents a
+	 * linked list entry or not, the BIT(1) indicates whether the ZMS ID is a name
+	 * or data and the remaining bits of the hash are set to a truncated part of the
+	 * original hash generated by Settings.
+	 */
+
+	BUILD_ASSERT(IS_POWER_OF_TWO(ZMS_DATA_ID_OFFSET), "ZMS_NAME_ID_OFFSET is not power of 2");
 
+	uint32_t key_value_bit;
+	uint32_t key_value_hash;
+	uint32_t key_value_ll;
+
+	key_value_bit = (id >> LOG2(ZMS_DATA_ID_OFFSET)) & 1;
+	key_value_hash = (id & ZMS_HASH_MASK) >> (CONFIG_SETTINGS_ZMS_MAX_COLLISIONS_BITS + 1);
+	key_value_ll = id & BIT(0);
+
+	hash = (key_value_hash << 2) | (key_value_bit << 1) | key_value_ll;
+#else
 	/* 32-bit integer hash function found by https://github.com/skeeto/hash-prospector. */
-	hash = id;
 	hash ^= hash >> 16;
 	hash *= 0x7feb352dU;
 	hash ^= hash >> 15;
 	hash *= 0x846ca68bU;
 	hash ^= hash >> 16;
+#endif /* CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS */
 
 	return hash % CONFIG_ZMS_LOOKUP_CACHE_SIZE;
 }
@@ -1433,8 +1462,6 @@ ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len)
 {
 	int rc;
 	size_t data_size;
-	uint64_t wlk_addr;
-	uint64_t rd_addr;
 	uint32_t gc_count;
 	uint32_t required_space = 0U; /* no space, appropriate for delete ate */
 
@@ -1455,19 +1482,19 @@ ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len)
 		return -EINVAL;
 	}
 
+#ifdef CONFIG_ZMS_NO_DOUBLE_WRITE
 	/* find latest entry with same id */
 #ifdef CONFIG_ZMS_LOOKUP_CACHE
-	wlk_addr = fs->lookup_cache[zms_lookup_cache_pos(id)];
+	uint64_t wlk_addr = fs->lookup_cache[zms_lookup_cache_pos(id)];
 
 	if (wlk_addr == ZMS_LOOKUP_CACHE_NO_ADDR) {
 		goto no_cached_entry;
 	}
 #else
 	wlk_addr = fs->ate_wra;
-#endif
-	rd_addr = wlk_addr;
+#endif /* CONFIG_ZMS_LOOKUP_CACHE */
+	uint64_t rd_addr = wlk_addr;
 
-#ifdef CONFIG_ZMS_NO_DOUBLE_WRITE
 	/* Search for a previous valid ATE with the same ID */
 	struct zms_ate wlk_ate;
 	int prev_found = zms_find_ate_with_id(fs, id, wlk_addr, fs->ate_wra, &wlk_ate, &rd_addr);
@@ -1511,11 +1538,11 @@ ssize_t zms_write(struct zms_fs *fs, uint32_t id, const void *data, size_t len)
 			return 0;
 		}
 	}
-#endif
-
 #ifdef CONFIG_ZMS_LOOKUP_CACHE
 no_cached_entry:
-#endif
+#endif /* CONFIG_ZMS_LOOKUP_CACHE */
+#endif /* CONFIG_ZMS_NO_DOUBLE_WRITE */
+
 	/* calculate required space if the entry contains data */
 	if (data_size) {
 		/* Leave space for delete ate */
diff --git a/subsys/ipc/ipc_service/backends/Kconfig.icbmsg b/subsys/ipc/ipc_service/backends/Kconfig.icbmsg
index e31b5cadd77..3a34c63c06c 100644
--- a/subsys/ipc/ipc_service/backends/Kconfig.icbmsg
+++ b/subsys/ipc/ipc_service/backends/Kconfig.icbmsg
@@ -23,6 +23,14 @@ config IPC_SERVICE_BACKEND_ICBMSG_NUM_EP
 	  backend. The number of endpoints are applied to all the instances,
 	  so this value should be maximum number among all the instances.
 
+config IPC_SERVICE_BACKEND_ICBMSG_EP_BOUND_WORK_Q_STACK_SIZE
+	int "Workqueue stack size"
+	default 1024 if NO_OPTIMIZATIONS
+	default 512
+	help
+	  Workqueue stack size for bounding processing
+	  (this configuration is not optimized).
+
 module = IPC_SERVICE_BACKEND_ICBMSG
 module-str = ICMSG backend with separate buffers
 module-help = Sets log level for ICMsg backend with buffers
diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 46ecfe1233f..312642aafeb 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -118,7 +118,8 @@ LOG_MODULE_REGISTER(ipc_icbmsg,
 #define FLAG_EPT_COUNT_MASK 0xFFFF
 
 /** Workqueue stack size for bounding processing (this configuration is not optimized). */
-#define EP_BOUND_WORK_Q_STACK_SIZE (512U)
+#define EP_BOUND_WORK_Q_STACK_SIZE \
+	(CONFIG_IPC_SERVICE_BACKEND_ICBMSG_EP_BOUND_WORK_Q_STACK_SIZE)
 
 /** Workqueue priority for bounding processing. */
 #define EP_BOUND_WORK_Q_PRIORITY (CONFIG_SYSTEM_WORKQUEUE_PRIORITY)
diff --git a/subsys/ipc/rpmsg_service/rpmsg_backend.h b/subsys/ipc/rpmsg_service/rpmsg_backend.h
index a74e46b8520..9996e1d74d9 100644
--- a/subsys/ipc/rpmsg_service/rpmsg_backend.h
+++ b/subsys/ipc/rpmsg_service/rpmsg_backend.h
@@ -13,8 +13,35 @@
 extern "C" {
 #endif
 
+#if CONFIG_PARTITION_MANAGER_ENABLED
+
+#include "pm_config.h"
+
+#if defined(PM_RPMSG_NRF53_SRAM_ADDRESS) || defined(PM__RPMSG_NRF53_SRAM_ADDRESS)
+
+#if defined(PM_RPMSG_NRF53_SRAM_ADDRESS)
+#define VDEV_START_ADDR PM_RPMSG_NRF53_SRAM_ADDRESS
+#define VDEV_SIZE PM_RPMSG_NRF53_SRAM_SIZE
+#else
+/* The current image is a child image in a different domain than the image
+ * which defined the required values. To reach the values of the parent domain
+ * we use the 'PM__' variant of the define.
+ */
+#define VDEV_START_ADDR PM__RPMSG_NRF53_SRAM_ADDRESS
+#define VDEV_SIZE PM__RPMSG_NRF53_SRAM_SIZE
+#endif /* defined(PM_RPMSG_NRF53_SRAM_ADDRESS) */
+
+#else
 #define VDEV_START_ADDR		DT_REG_ADDR(DT_CHOSEN(zephyr_ipc_shm))
 #define VDEV_SIZE		DT_REG_SIZE(DT_CHOSEN(zephyr_ipc_shm))
+#endif /* defined(PM_RPMSG_NRF53_SRAM_ADDRESS) || defined(PM__RPMSG_NRF53_SRAM_ADDRESS) */
+
+#else
+
+#define VDEV_START_ADDR		DT_REG_ADDR(DT_CHOSEN(zephyr_ipc_shm))
+#define VDEV_SIZE		DT_REG_SIZE(DT_CHOSEN(zephyr_ipc_shm))
+
+#endif /* CONFIG_PARTITION_MANAGER_ENABLED */
 
 #define VDEV_STATUS_ADDR	VDEV_START_ADDR
 #define VDEV_STATUS_SIZE	0x400
diff --git a/subsys/jwt/Kconfig b/subsys/jwt/Kconfig
index 367ba43d225..052908a7775 100644
--- a/subsys/jwt/Kconfig
+++ b/subsys/jwt/Kconfig
@@ -20,6 +20,10 @@ config JWT_SIGN_RSA_LEGACY
 	bool "Use RSA signature (RS-256). Use Mbed TLS as crypto library."
 	depends on CSPRNG_AVAILABLE
 	select MBEDTLS
+	select MBEDTLS_MD
+	select MBEDTLS_RSA_C
+	select MBEDTLS_PKCS1_V15
+	select MBEDTLS_PKCS1_V21
 	select MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 
 config JWT_SIGN_RSA_PSA
diff --git a/subsys/mgmt/mcumgr/CMakeLists.txt b/subsys/mgmt/mcumgr/CMakeLists.txt
index 39d4a4ca8ce..3bb21e16f79 100644
--- a/subsys/mgmt/mcumgr/CMakeLists.txt
+++ b/subsys/mgmt/mcumgr/CMakeLists.txt
@@ -16,3 +16,12 @@ add_subdirectory(transport)
 add_subdirectory_ifdef(CONFIG_SMP_CLIENT    smp_client)
 
 zephyr_library_link_libraries(mgmt_mcumgr)
+
+if(CONFIG_MCUMGR_GRP_IMG_NRF5340_BOOTUTIL_HOOK)
+  zephyr_include_directories(
+    ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/bootutil/include
+    ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/zephyr/include
+  )
+
+  zephyr_library_sources(bootutil_hooks/nrf53_hooks.c)
+endif()
diff --git a/subsys/mgmt/mcumgr/Kconfig b/subsys/mgmt/mcumgr/Kconfig
index 49bd17f4669..c45cb7f81d6 100644
--- a/subsys/mgmt/mcumgr/Kconfig
+++ b/subsys/mgmt/mcumgr/Kconfig
@@ -6,6 +6,7 @@ menuconfig MCUMGR
 	bool "mcumgr Support"
 	depends on NET_BUF
 	depends on ZCBOR
+	imply BOOT_IMAGE_ACCESS_HOOKS if SOC_NRF5340_CPUAPP && MCUMGR_GRP_IMG && MCUBOOT_NETWORK_CORE_IMAGE_NUMBER > -1
 	help
 	  This option enables the mcumgr management library.
 
diff --git a/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
new file mode 100644
index 00000000000..b372ce4e494
--- /dev/null
+++ b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include "bootutil/bootutil_public.h"
+
+int boot_read_swap_state_primary_slot_hook(int image_index, struct boot_swap_state *state)
+{
+	if (image_index == CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER) {
+		/* Pretend that primary slot of the network core update image is unpopulated */
+		state->magic = BOOT_MAGIC_UNSET;
+		state->swap_type = BOOT_SWAP_TYPE_NONE;
+		state->image_num = image_index;
+		state->copy_done = BOOT_FLAG_UNSET;
+		state->image_ok = BOOT_FLAG_UNSET;
+
+		/* Prevent bootutil from trying to obtain true info */
+		return 0;
+	}
+
+	return BOOT_HOOK_REGULAR;
+}
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
index 0a006370cea..9cb32a46e02 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
@@ -216,6 +216,22 @@ config MCUMGR_GRP_IMG_SLOT_INFO_HOOKS
 	  This will enable the slot info function hooks which can be used to add additional
 	  information to responses.
 
+config MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
+	bool "QSPI XIP Split image mode"
+	depends on MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
+	help
+	  This option should not be selected by users and should automatically be selected by
+	  sysbuild if needed. This enables selecting the correct slot when running a QSPI XIP
+	  split image application in DirectXIP mode.
+
+config MCUMGR_GRP_IMG_NRF5340_BOOTUTIL_HOOK
+	bool "nRF5340 network core bootutil hook"
+	depends on SOC_NRF5340_CPUAPP && BOOT_IMAGE_ACCESS_HOOKS && MCUBOOT_NETWORK_CORE_IMAGE_NUMBER > -1
+	default y
+	help
+	  This option will enable a bootutil hook that populates the network core update image
+	  slot with dummy data to allow for uploading a firmware update to the network core.
+
 module = MCUMGR_GRP_IMG
 module-str = mcumgr_grp_img
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h b/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
index 133a1abf054..d584467ee2b 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h
@@ -18,6 +18,14 @@
 extern "C" {
 #endif
 
+#ifdef CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512
+#define IMAGE_TLV_SHA		IMAGE_TLV_SHA512
+#define IMAGE_SHA_LEN		64
+#else
+#define IMAGE_TLV_SHA		IMAGE_TLV_SHA256
+#define IMAGE_SHA_LEN		32
+#endif
+
 /**
  * @brief Ensures the spare slot (slot 1) is fully erased.
  *
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
index a5a06e3d9f5..8fb938e7e9a 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
@@ -43,6 +43,23 @@
 
 #if !defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)
 
+#if USE_PARTITION_MANAGER
+#include <flash_map_pm.h>
+
+#ifdef PM_MCUBOOT_SECONDARY_PAD_SIZE
+BUILD_ASSERT(PM_MCUBOOT_PAD_SIZE == PM_MCUBOOT_SECONDARY_PAD_SIZE);
+#endif
+
+#if CONFIG_BUILD_WITH_TFM
+  #define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE + PM_TFM_SIZE)
+#else
+  #define PM_ADDRESS_OFFSET (PM_MCUBOOT_PAD_SIZE)
+#endif
+
+#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)	\
+	(FIXED_PARTITION_OFFSET(label) == (PM_ADDRESS - PM_ADDRESS_OFFSET))
+
+#else /* ! USE_PARTITION_MANAGER */
 #ifndef CONFIG_FLASH_LOAD_OFFSET
 #error MCUmgr requires application to be built with CONFIG_FLASH_LOAD_OFFSET set \
 	to be able to figure out application running slot.
@@ -50,6 +67,7 @@
 
 #define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)	\
 	 (FIXED_PARTITION_OFFSET(label) == CONFIG_FLASH_LOAD_OFFSET)
+#endif /* USE_PARTITION_MANAGER */
 
 BUILD_ASSERT(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
 	     "struct image_header not required size");
@@ -213,6 +231,12 @@ int img_mgmt_active_slot(int image)
 	/* Multi image does not support DirectXIP or RAM load currently */
 #if CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1
 	slot = (image << 1);
+
+#if CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
+	if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {
+		slot += 1;
+	}
+#endif
 #elif defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)
 	/* RAM load requires querying bootloader */
 	int rc;
@@ -319,7 +343,7 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 		if (tlv.it_type == 0xff && tlv.it_len == 0xffff) {
 			return IMG_MGMT_ERR_INVALID_TLV;
 		}
-		if (tlv.it_type != IMAGE_TLV_SHA256 || tlv.it_len != IMAGE_HASH_LEN) {
+		if (tlv.it_type != IMAGE_TLV_SHA || tlv.it_len != IMAGE_SHA_LEN) {
 			/* Non-hash TLV.  Skip it. */
 			data_off += sizeof(tlv) + tlv.it_len;
 			continue;
@@ -333,10 +357,10 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 
 		data_off += sizeof(tlv);
 		if (hash != NULL) {
-			if (data_off + IMAGE_HASH_LEN > data_end) {
+			if (data_off + IMAGE_SHA_LEN > data_end) {
 				return IMG_MGMT_ERR_TLV_INVALID_SIZE;
 			}
-			rc = img_mgmt_read(image_slot, data_off, hash, IMAGE_HASH_LEN);
+			rc = img_mgmt_read(image_slot, data_off, hash, IMAGE_SHA_LEN);
 			if (rc != 0) {
 				return rc;
 			}
@@ -379,13 +403,13 @@ int
 img_mgmt_find_by_hash(uint8_t *find, struct image_version *ver)
 {
 	int i;
-	uint8_t hash[IMAGE_HASH_LEN];
+	uint8_t hash[IMAGE_SHA_LEN];
 
 	for (i = 0; i < 2 * CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER; i++) {
 		if (img_mgmt_read_info(i, ver, hash, NULL) != 0) {
 			continue;
 		}
-		if (!memcmp(hash, find, IMAGE_HASH_LEN)) {
+		if (!memcmp(hash, find, IMAGE_SHA_LEN)) {
 			return i;
 		}
 	}
@@ -695,7 +719,7 @@ img_mgmt_upload_good_rsp(struct smp_streamer *ctxt)
 static int
 img_mgmt_upload_log(bool is_first, bool is_last, int status)
 {
-	uint8_t hash[IMAGE_HASH_LEN];
+	uint8_t hash[IMAGE_SHA_LEN];
 	const uint8_t *hashp;
 	int rc;
 
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
index 98b6aee42aa..db2bec057f6 100644
--- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
+++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
@@ -419,8 +419,8 @@ static bool img_mgmt_state_encode_slot(struct smp_streamer *ctxt, uint32_t slot,
 	zcbor_state_t *zse = ctxt->writer->zs;
 	uint32_t flags;
 	char vers_str[IMG_MGMT_VER_MAX_STR_LEN];
-	uint8_t hash[IMAGE_HASH_LEN]; /* SHA256 hash */
-	struct zcbor_string zhash = { .value = hash, .len = IMAGE_HASH_LEN };
+	uint8_t hash[IMAGE_SHA_LEN];
+	struct zcbor_string zhash = { .value = hash, .len = IMAGE_SHA_LEN};
 	struct image_version ver;
 	bool ok;
 	int rc = img_mgmt_read_info(slot, &ver, hash, &flags);
@@ -726,14 +726,14 @@ img_mgmt_state_write(struct smp_streamer *ctxt)
 					     IMG_MGMT_ERR_INVALID_HASH);
 			goto end;
 		}
-	} else if (zhash.len != IMAGE_HASH_LEN) {
+	} else if (zhash.len != IMAGE_SHA_LEN) {
 		/* The img_mgmt_find_by_hash does exact length compare
 		 * so just fail here.
 		 */
 		ok = smp_add_cmd_err(zse, MGMT_GROUP_ID_IMAGE, IMG_MGMT_ERR_INVALID_HASH);
 		goto end;
 	} else {
-		uint8_t hash[IMAGE_HASH_LEN];
+		uint8_t hash[IMAGE_SHA_LEN];
 
 		memcpy(hash, zhash.value, zhash.len);
 
diff --git a/subsys/net/l2/ppp/ppp_l2.c b/subsys/net/l2/ppp/ppp_l2.c
index b9edd2629ce..5521d76470e 100644
--- a/subsys/net/l2/ppp/ppp_l2.c
+++ b/subsys/net/l2/ppp/ppp_l2.c
@@ -238,6 +238,19 @@ static int ppp_up(struct net_if *iface)
 	return 0;
 }
 
+static void ppp_lcp_close_async(struct ppp_context *ctx)
+{
+	if (ppp_lcp == NULL) {
+		ppp_change_phase(ctx, PPP_DEAD);
+	}
+
+	if (ctx->phase == PPP_DEAD) {
+		return;
+	}
+
+	ppp_lcp->close(ctx, "L2 Disabled");
+}
+
 static int ppp_lcp_close(struct ppp_context *ctx)
 {
 	if (ppp_lcp == NULL) {
@@ -486,6 +499,10 @@ static void net_ppp_mgmt_evt_handler(struct net_mgmt_event_callback *cb, uint32_
 	if ((mgmt_event == NET_EVENT_IF_DOWN) && (!net_if_is_carrier_ok(iface))) {
 		ppp_lcp_lower_down_async(ctx);
 	}
+	if ((mgmt_event == NET_EVENT_IF_DOWN && net_if_is_carrier_ok(iface) &&
+	     net_if_is_dormant(iface))) {
+		ppp_lcp_close_async(ctx);
+	}
 }
 
 void net_ppp_init(struct net_if *iface)
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
index a33cee5aecf..c3816e5949f 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
@@ -22,10 +22,15 @@ int mqtt_client_tls_connect(struct mqtt_client *client)
 {
 	const struct sockaddr *broker = client->broker;
 	struct mqtt_sec_config *tls_config = &client->transport.tls.config;
+	int type = SOCK_STREAM;
 	int ret;
 
+	if (tls_config->set_native_tls) {
+		type |= SOCK_NATIVE_TLS;
+	}
+
 	client->transport.tls.sock = zsock_socket(broker->sa_family,
-						  SOCK_STREAM, IPPROTO_TLS_1_2);
+						  type, IPPROTO_TLS_1_2);
 	if (client->transport.tls.sock < 0) {
 		return -errno;
 	}
@@ -91,6 +96,16 @@ int mqtt_client_tls_connect(struct mqtt_client *client)
 		}
 	}
 
+	if (tls_config->session_cache == TLS_SESSION_CACHE_ENABLED) {
+		ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS,
+				       TLS_SESSION_CACHE,
+				       &tls_config->session_cache,
+				       sizeof(tls_config->session_cache));
+		if (ret < 0) {
+			goto error;
+		}
+	}
+
 	if (tls_config->cert_nocopy != TLS_CERT_NOCOPY_NONE) {
 		ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS,
 				       TLS_CERT_NOCOPY, &tls_config->cert_nocopy,
diff --git a/subsys/net/lib/sockets/Kconfig b/subsys/net/lib/sockets/Kconfig
index 596adef4ab2..0f4a27e655a 100644
--- a/subsys/net/lib/sockets/Kconfig
+++ b/subsys/net/lib/sockets/Kconfig
@@ -116,6 +116,10 @@ config NET_SOCKETS_SOCKOPT_TLS
 	imply TLS_CREDENTIALS
 	select MBEDTLS if NET_NATIVE
 	imply MBEDTLS_TLS_VERSION_1_2 if !NET_L2_OPENTHREAD
+	imply MBEDTLS_MD if !NET_L2_OPENTHREAD
+	imply MBEDTLS_RSA_C if !NET_L2_OPENTHREAD
+	imply MBEDTLS_PKCS1_V15 if !NET_L2_OPENTHREAD
+	imply MBEDTLS_PKCS1_V21 if !NET_L2_OPENTHREAD
 	imply MBEDTLS_KEY_EXCHANGE_RSA_ENABLED if !NET_L2_OPENTHREAD
 	imply MBEDTLS_CIPHER_AES_ENABLED if !NET_L2_OPENTHREAD
 	imply PSA_WANT_KEY_TYPE_AES if !NET_L2_OPENTHREAD && PSA_CRYPTO_CLIENT
diff --git a/subsys/net/lib/wifi_credentials/Kconfig b/subsys/net/lib/wifi_credentials/Kconfig
index f50e210b080..d0843d689a2 100644
--- a/subsys/net/lib/wifi_credentials/Kconfig
+++ b/subsys/net/lib/wifi_credentials/Kconfig
@@ -73,6 +73,32 @@ config WIFI_CREDENTIALS_CONNECT_STORED_CONNECTION_TIMEOUT
 	help
 	   Wait period before falling back to the next entry in the list of stored SSIDs.
 
+
+if WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+
+config WIFI_CREDENTIALS_RUNTIME_CERTIFICATES
+	bool "Provide Wi-Fi enterprise security certificates at run-time"
+	select TLS_CREDENTIALS
+	select TLS_CREDENTIALS_SHELL
+	select BASE64
+	default y if WIFI_SHELL_RUNTIME_CERTIFICATES
+	help
+	  This option enables providing Wi-Fi enterprise security certificates at run-time.
+	  Uses the TLS credentials subsystem to store and manage the certificates.
+
+if WIFI_CREDENTIALS_RUNTIME_CERTIFICATES
+
+config HEAP_MEM_POOL_ADD_SIZE_WIFI_CERT
+	int "Wi-Fi enterprise security certificates memory pool size"
+	# STA - 6 certs and each assume 1500 bytes
+	default 12000
+	help
+	   The size of the memory pool used by the Wi-Fi enterprise security certificates.
+
+endif # WIFI_CREDENTIALS_RUNTIME_CERTIFICATES
+
+endif # WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+
 endif # WIFI_CREDENTIALS_CONNECT_STORED
 
 endif # WIFI_CREDENTIALS
diff --git a/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c b/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c
index 4a51de48e12..c5b8c2a88a3 100644
--- a/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c
+++ b/subsys/net/lib/wifi_credentials/wifi_credentials_shell.c
@@ -22,10 +22,33 @@
 
 #include <zephyr/net/wifi_credentials.h>
 
+LOG_MODULE_REGISTER(wifi_credentials_shell, CONFIG_WIFI_CREDENTIALS_LOG_LEVEL);
+
 #define MAX_BANDS_STR_LEN 64
 #define MACSTR "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx"
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+#ifdef CONFIG_WIFI_CREDENTIALS_RUNTIME_CERTIFICATES
+#include <zephyr/net/tls_credentials.h>
+enum wifi_enterprise_cert_sec_tags {
+	WIFI_CERT_CA_SEC_TAG = 0x1020001,
+	WIFI_CERT_CLIENT_KEY_SEC_TAG,
+	WIFI_CERT_SERVER_KEY_SEC_TAG,
+	WIFI_CERT_CLIENT_SEC_TAG,
+	WIFI_CERT_SERVER_SEC_TAG,
+	/* Phase 2 */
+	WIFI_CERT_CA_P2_SEC_TAG,
+	WIFI_CERT_CLIENT_KEY_P2_SEC_TAG,
+	WIFI_CERT_CLIENT_P2_SEC_TAG,
+};
+
+struct wifi_cert_data {
+	enum tls_credential_type type;
+	uint32_t sec_tag;
+	uint8_t **data;
+	size_t *len;
+};
+#else
 static const char ca_cert_test[] = {
 	#include <wifi_enterprise_test_certs/ca.pem.inc>
 	'\0'
@@ -52,25 +75,184 @@ static const char client_cert2_test[] = {
 static const char client_key2_test[] = {
 	#include <wifi_enterprise_test_certs/client-key2.pem.inc>
 	'\0'};
+#endif /* CONFIG_WIFI_CREDENTIALS_RUNTIME_CERTIFICATES */
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
 
 #if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-static int cmd_wifi_set_enterprise_creds(const struct shell *sh, struct net_if *iface)
+#ifdef CONFIG_WIFI_CREDENTIALS_RUNTIME_CERTIFICATES
+
+struct wifi_enterprise_creds_params enterprise_creds_params;
+
+static int process_certificates(struct wifi_cert_data *certs, size_t cert_count)
+{
+	for (size_t i = 0; i < cert_count; i++) {
+		int err;
+		size_t len = 0;
+		uint8_t *cert_tmp;
+
+		err = tls_credential_get(certs[i].sec_tag, certs[i].type, NULL, &len);
+		if (err != -EFBIG) {
+			LOG_ERR("Failed to get credential tag: %d length, err: %d",
+				certs[i].sec_tag, err);
+			return err;
+		}
+
+		cert_tmp = k_malloc(len);
+		if (!cert_tmp) {
+			LOG_ERR("Failed to allocate memory for credential tag: %d",
+				certs[i].sec_tag);
+			return -ENOMEM;
+		}
+
+		err = tls_credential_get(certs[i].sec_tag, certs[i].type, cert_tmp, &len);
+		if (err) {
+			LOG_ERR("Failed to get credential tag: %d", certs[i].sec_tag);
+			k_free(cert_tmp);
+			return err;
+		}
+
+		*certs[i].data = cert_tmp;
+		*certs[i].len = len;
+	}
+
+	return 0;
+}
+
+static void set_enterprise_creds_params(struct wifi_enterprise_creds_params *params,
+					bool is_ap)
+{
+	struct wifi_cert_data certs_common[] = {
+		{
+			.type = TLS_CREDENTIAL_CA_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CA_SEC_TAG,
+			.data = &params->ca_cert,
+			.len = &params->ca_cert_len,
+		},
+	};
+
+	struct wifi_cert_data certs_sta[] = {
+		{
+			.type = TLS_CREDENTIAL_PRIVATE_KEY,
+			.sec_tag = WIFI_CERT_CLIENT_KEY_SEC_TAG,
+			.data = &params->client_key,
+			.len = &params->client_key_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CLIENT_SEC_TAG,
+			.data = &params->client_cert,
+			.len = &params->client_cert_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_CA_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CA_P2_SEC_TAG,
+			.data = &params->ca_cert2,
+			.len = &params->ca_cert2_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PRIVATE_KEY,
+			.sec_tag = WIFI_CERT_CLIENT_KEY_P2_SEC_TAG,
+			.data = &params->client_key2,
+			.len = &params->client_key2_len,
+		},
+		{
+			.type = TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
+			.sec_tag = WIFI_CERT_CLIENT_P2_SEC_TAG,
+			.data = &params->client_cert2,
+			.len = &params->client_cert2_len,
+		},
+	};
+
+	memset(params, 0, sizeof(*params));
+
+	/* Process common certificates */
+	if (process_certificates(certs_common, ARRAY_SIZE(certs_common)) != 0) {
+		goto cleanup;
+	}
+
+	/* Process STA-specific certificates */
+	if (!is_ap) {
+		if (process_certificates(certs_sta, ARRAY_SIZE(certs_sta)) != 0) {
+			goto cleanup;
+		}
+	}
+
+	memcpy(&enterprise_creds_params, params, sizeof(*params));
+	return;
+
+cleanup:
+	for (size_t i = 0; i < ARRAY_SIZE(certs_common); i++) {
+		if (certs_common[i].data) {
+			k_free(*certs_common[i].data);
+			*certs_common[i].data = NULL;
+		}
+	}
+
+	if (!is_ap) {
+		for (size_t i = 0; i < ARRAY_SIZE(certs_sta); i++) {
+			if (certs_sta[i].data) {
+				k_free(*certs_sta[i].data);
+				*certs_sta[i].data = NULL;
+			}
+		}
+	}
+
+}
+
+static void clear_enterprise_creds_params(struct wifi_enterprise_creds_params *params)
+{
+	if (params == NULL) {
+		return;
+	}
+
+	const uint8_t *certs[] = {
+		params->ca_cert,
+		params->client_cert,
+		params->client_key,
+		params->ca_cert2,
+		params->client_cert2,
+		params->client_key2,
+	};
+
+	for (size_t i = 0; i < ARRAY_SIZE(certs); i++) {
+		k_free((void *)certs[i]);
+	}
+	memset(params, 0, sizeof(*params));
+}
+#else
+static void set_enterprise_creds_params(struct wifi_enterprise_creds_params *params,
+					 bool is_ap)
+{
+	params->ca_cert = (uint8_t *)ca_cert_test;
+	params->ca_cert_len = ARRAY_SIZE(ca_cert_test);
+
+	if (!is_ap) {
+		params->client_cert = (uint8_t *)client_cert_test;
+		params->client_cert_len = ARRAY_SIZE(client_cert_test);
+		params->client_key = (uint8_t *)client_key_test;
+		params->client_key_len = ARRAY_SIZE(client_key_test);
+		params->ca_cert2 = (uint8_t *)ca_cert2_test;
+		params->ca_cert2_len = ARRAY_SIZE(ca_cert2_test);
+		params->client_cert2 = (uint8_t *)client_cert2_test;
+		params->client_cert2_len = ARRAY_SIZE(client_cert2_test);
+		params->client_key2 = (uint8_t *)client_key2_test;
+		params->client_key2_len = ARRAY_SIZE(client_key2_test);
+
+		return;
+	}
+}
+#endif /* CONFIG_WIFI_CREDENTIALS_RUNTIME_CERTIFICATES */
+
+static int wifi_set_enterprise_creds(const struct shell *sh, struct net_if *iface,
+				     bool is_ap)
 {
 	struct wifi_enterprise_creds_params params = {0};
 
-	params.ca_cert = (uint8_t *)ca_cert_test;
-	params.ca_cert_len = ARRAY_SIZE(ca_cert_test);
-	params.client_cert = (uint8_t *)client_cert_test;
-	params.client_cert_len = ARRAY_SIZE(client_cert_test);
-	params.client_key = (uint8_t *)client_key_test;
-	params.client_key_len = ARRAY_SIZE(client_key_test);
-	params.ca_cert2 = (uint8_t *)ca_cert2_test;
-	params.ca_cert2_len = ARRAY_SIZE(ca_cert2_test);
-	params.client_cert2 = (uint8_t *)client_cert2_test;
-	params.client_cert2_len = ARRAY_SIZE(client_cert2_test);
-	params.client_key2 = (uint8_t *)client_key2_test;
-	params.client_key2_len = ARRAY_SIZE(client_key2_test);
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	clear_enterprise_creds_params(&enterprise_creds_params);
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+
+	set_enterprise_creds_params(&params, is_ap);
 
 	if (net_mgmt(NET_REQUEST_WIFI_ENTERPRISE_CREDS, iface, &params, sizeof(params))) {
 		shell_warn(sh, "Set enterprise credentials failed\n");
@@ -340,7 +522,7 @@ static int cmd_add_network(const struct shell *sh, size_t argc, char *argv[])
 	}
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
-	struct net_if *iface = net_if_get_first_by_type(&NET_L2_GET_NAME(ETHERNET));
+	struct net_if *iface = net_if_get_wifi_sta();
 
 	/* Load the enterprise credentials if needed */
 	if (creds.header.type == WIFI_SECURITY_TYPE_EAP_TLS ||
@@ -348,7 +530,7 @@ static int cmd_add_network(const struct shell *sh, size_t argc, char *argv[])
 	    creds.header.type == WIFI_SECURITY_TYPE_EAP_PEAP_GTC ||
 	    creds.header.type == WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2 ||
 	    creds.header.type == WIFI_SECURITY_TYPE_EAP_PEAP_TLS) {
-		cmd_wifi_set_enterprise_creds(sh, iface);
+		wifi_set_enterprise_creds(sh, iface, 0);
 	}
 #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
 
@@ -368,6 +550,12 @@ static int cmd_delete_network(const struct shell *sh, size_t argc, char *argv[])
 	}
 
 	shell_print(sh, "\tDeleting network ssid: \"%s\", ssid_len: %d", argv[1], strlen(argv[1]));
+
+#ifdef CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES
+	/* Clear the certificates */
+	clear_enterprise_creds_params(&enterprise_creds_params);
+#endif /* CONFIG_WIFI_SHELL_RUNTIME_CERTIFICATES */
+
 	return wifi_credentials_delete_by_ssid(argv[1], strlen(argv[1]));
 }
 
@@ -381,7 +569,11 @@ static int cmd_list_networks(const struct shell *sh, size_t argc, char *argv[])
 
 static int cmd_auto_connect(const struct shell *sh, size_t argc, char *argv[])
 {
-	struct net_if *iface = net_if_get_first_by_type(&NET_L2_GET_NAME(ETHERNET));
+	struct net_if *iface = net_if_get_wifi_sta();
+
+#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
+	wifi_set_enterprise_creds(sh, iface, 0);
+#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
 	int rc = net_mgmt(NET_REQUEST_WIFI_CONNECT_STORED, iface, NULL, 0);
 
 	if (rc) {
diff --git a/subsys/settings/Kconfig b/subsys/settings/Kconfig
index a59b618759e..fdb3c4bb3ce 100644
--- a/subsys/settings/Kconfig
+++ b/subsys/settings/Kconfig
@@ -47,6 +47,25 @@ config SETTINGS_ZMS
 	help
 	  Use ZMS as settings storage backend.
 
+if SETTINGS_ZMS
+
+config SETTINGS_ZMS_LL_CACHE
+	bool "ZMS linked list lookup cache"
+	help
+	  Enable ZMS lookup cache for linked list, used to reduce the
+	  Settings load time by having most linked list elements already
+	  in cache.
+
+config SETTINGS_ZMS_LL_CACHE_SIZE
+	int "ZMS linked list lookup cache size"
+	default 128
+	range 1 $(UINT32_MAX)
+	depends on SETTINGS_ZMS_LL_CACHE
+	help
+	  Number of entries in Settings ZMS linked list cache.
+
+endif # SETTINGS_ZMS
+
 config SETTINGS_FCB
 	bool "FCB"
 	depends on FCB
@@ -171,6 +190,26 @@ config SETTINGS_ZMS_MAX_COLLISIONS_BITS
 	  The maximum number of hash collisions needs to be well sized depending
 	  on the data that is going to be stored in ZMS and its hash values
 
+config SETTINGS_ZMS_NO_LL_DELETE
+	bool "Disable deletion of Linked list hashes"
+	help
+	  For some applications, the Settings delete operation is too long for
+	  ZMS because of the linked list update.
+	  As a tradeoff for performance the linked list is not updated. As a
+	  result, some nodes will be unused and will occupy some space in the
+	  storage.
+	  These nodes will be used again when the same Settings element that has
+	  been deleted is created again.
+
+config SETTINGS_ZMS_LOAD_SUBTREE_PATH
+	bool "Load only subtree path if provided"
+	help
+	  Loads first the key defined by the subtree path.
+	  If the callback handler returns a zero value it will
+	  continue to look for all the keys under that subtree path.
+	  If the callback handler returns a non negative value, it
+	  returns immeditaley.
+
 config SETTINGS_SHELL
 	bool "Settings shell"
 	depends on SHELL
diff --git a/subsys/settings/include/settings/settings_zms.h b/subsys/settings/include/settings/settings_zms.h
index 9b9939815c2..76ca92f6d11 100644
--- a/subsys/settings/include/settings/settings_zms.h
+++ b/subsys/settings/include/settings/settings_zms.h
@@ -63,24 +63,34 @@ extern "C" {
 
 /* some useful macros */
 #define ZMS_NAME_ID_FROM_LL_NODE(x) (x & ~BIT(0))
+#define ZMS_LL_NODE_FROM_NAME_ID(x) (x | BIT(0))
 #define ZMS_UPDATE_COLLISION_NUM(x, y)                                                             \
 	((x & ~ZMS_COLLISIONS_MASK) | ((y << 1) & ZMS_COLLISIONS_MASK))
-#define ZMS_COLLISION_NUM(x) ((x & ZMS_COLLISIONS_MASK) >> 1)
+#define ZMS_COLLISION_NUM(x)     ((x & ZMS_COLLISIONS_MASK) >> 1)
+#define ZMS_NAME_ID_FROM_HASH(x) ((x & ZMS_HASH_TOTAL_MASK) | BIT(31))
+#define ZMS_DATA_ID_FROM_HASH(x) (ZMS_NAME_ID_FROM_HASH(x) + ZMS_DATA_ID_OFFSET)
+#define ZMS_DATA_ID_FROM_NAME(x) (x + ZMS_DATA_ID_OFFSET)
+#define ZMS_DATA_ID_FROM_LL_NODE(x) (ZMS_NAME_ID_FROM_LL_NODE(x) + ZMS_DATA_ID_OFFSET)
+
+struct settings_hash_linked_list {
+	uint32_t previous_hash;
+	uint32_t next_hash;
+};
 
 struct settings_zms {
 	struct settings_store cf_store;
 	struct zms_fs cf_zms;
 	const struct device *flash_dev;
+#if CONFIG_SETTINGS_ZMS_LL_CACHE
+	struct settings_hash_linked_list ll_cache[CONFIG_SETTINGS_ZMS_LL_CACHE_SIZE];
+	uint32_t ll_cache_next;
+	bool ll_has_changed;
+#endif /* CONFIG_SETTINGS_ZMS_LL_CACHE */
 	uint32_t last_hash_id;
 	uint32_t second_to_last_hash_id;
 	uint8_t hash_collision_num;
 };
 
-struct settings_hash_linked_list {
-	uint32_t previous_hash;
-	uint32_t next_hash;
-};
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/subsys/settings/src/settings_store.c b/subsys/settings/src/settings_store.c
index b697f993d94..b8f8d847541 100644
--- a/subsys/settings/src/settings_store.c
+++ b/subsys/settings/src/settings_store.c
@@ -88,6 +88,122 @@ int settings_load_subtree_direct(
 	return 0;
 }
 
+struct default_param {
+	void *buf;
+	size_t buf_len;
+	size_t *val_len;
+};
+
+/* Default callback to set a Key/Value pair */
+static int settings_set_default_cb(const char *name, size_t len, settings_read_cb read_cb,
+				   void *cb_arg, void *param)
+{
+	int rc = 0;
+	const char *next;
+	size_t name_len;
+	struct default_param *dest = (struct default_param *)param;
+
+	name_len = settings_name_next(name, &next);
+	if (name_len == 0) {
+		rc = read_cb(cb_arg, dest->buf, MIN(dest->buf_len, len));
+		*dest->val_len = len;
+	}
+
+	return rc;
+}
+
+/* Default callback to get the value's length of the Key defined by name. Returns 0 if Key
+ * doesn't exist.
+ */
+static int settings_get_val_len_default_cb(const char *name, size_t len,
+					   [[maybe_unused]] settings_read_cb read_cb,
+					   [[maybe_unused]] void *cb_arg, void *param)
+{
+	const char *next;
+	size_t name_len;
+	size_t *val_len = (size_t *)param;
+
+	name_len = settings_name_next(name, &next);
+	if (name_len == 0) {
+		*val_len = len;
+	}
+
+	return 0;
+}
+
+/* Gets the value's size if the Key defined by name is in the persistent storage,
+ * if not found returns 0.
+ */
+ssize_t settings_get_val_len(const char *name)
+{
+	struct settings_store *cs;
+	int rc = 0;
+	size_t val_len = 0;
+
+	/*
+	 * for every config store that supports this function
+	 * get the value's length.
+	 */
+	k_mutex_lock(&settings_lock, K_FOREVER);
+	SYS_SLIST_FOR_EACH_CONTAINER(&settings_load_srcs, cs, cs_next) {
+		if (cs->cs_itf->csi_get_val_len) {
+			val_len = cs->cs_itf->csi_get_val_len(cs, name);
+		} else {
+			const struct settings_load_arg arg = {
+				.subtree = name,
+				.cb = &settings_get_val_len_default_cb,
+				.param = &val_len
+			};
+			rc = cs->cs_itf->csi_load(cs, &arg);
+		}
+	}
+	k_mutex_unlock(&settings_lock);
+
+	if (rc >= 0) {
+		return val_len;
+	}
+
+	return rc;
+}
+
+/* Load a single key/value from persistent storage */
+ssize_t settings_load_one(const char *name, void *buf, size_t buf_len)
+{
+	struct settings_store *cs;
+	size_t val_len = 0;
+	int rc = 0;
+
+	/*
+	 * for every config store that supports this function
+	 * load config
+	 */
+	k_mutex_lock(&settings_lock, K_FOREVER);
+	SYS_SLIST_FOR_EACH_CONTAINER(&settings_load_srcs, cs, cs_next) {
+		if (cs->cs_itf->csi_load_one) {
+			rc = cs->cs_itf->csi_load_one(cs, name, (char *)buf, buf_len);
+			val_len = (rc >= 0) ? rc : 0;
+		} else {
+			struct default_param param = {
+				.buf = buf,
+				.buf_len = buf_len,
+				.val_len = &val_len
+			};
+			const struct settings_load_arg arg = {
+				.subtree = name,
+				.cb = &settings_set_default_cb,
+				.param = &param
+			};
+			rc = cs->cs_itf->csi_load(cs, &arg);
+		}
+	}
+	k_mutex_unlock(&settings_lock);
+
+	if (rc >= 0) {
+		return val_len;
+	}
+	return rc;
+}
+
 /*
  * Append a single value to persisted config. Don't store duplicate value.
  */
diff --git a/subsys/settings/src/settings_zms.c b/subsys/settings/src/settings_zms.c
index 9d588bc588d..b3250074486 100644
--- a/subsys/settings/src/settings_zms.c
+++ b/subsys/settings/src/settings_zms.c
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L /* for strnlen() */
+
 #include <errno.h>
 #include <string.h>
 
@@ -27,14 +30,19 @@ struct settings_zms_read_fn_arg {
 };
 
 static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg);
+static ssize_t settings_zms_load_one(struct settings_store *cs, const char *name, char *buf,
+				     size_t buf_len);
 static int settings_zms_save(struct settings_store *cs, const char *name, const char *value,
 			     size_t val_len);
 static void *settings_zms_storage_get(struct settings_store *cs);
 static int settings_zms_get_last_hash_ids(struct settings_zms *cf);
+static ssize_t settings_zms_get_val_len(struct settings_store *cs, const char *name);
 
 static struct settings_store_itf settings_zms_itf = {.csi_load = settings_zms_load,
+						     .csi_load_one = settings_zms_load_one,
 						     .csi_save = settings_zms_save,
-						     .csi_storage_get = settings_zms_storage_get};
+						     .csi_storage_get = settings_zms_storage_get,
+						     .csi_get_val_len = settings_zms_get_val_len};
 
 static ssize_t settings_zms_read_fn(void *back_end, void *data, size_t len)
 {
@@ -61,6 +69,7 @@ static int settings_zms_dst(struct settings_zms *cf)
 	return 0;
 }
 
+#ifndef CONFIG_SETTINGS_ZMS_NO_LL_DELETE
 static int settings_zms_unlink_ll_node(struct settings_zms *cf, uint32_t name_hash)
 {
 	int rc = 0;
@@ -68,11 +77,39 @@ static int settings_zms_unlink_ll_node(struct settings_zms *cf, uint32_t name_ha
 	struct settings_hash_linked_list settings_update_element;
 
 	/* let's update the linked list */
-	rc = zms_read(&cf->cf_zms, name_hash | 1, &settings_element,
+	rc = zms_read(&cf->cf_zms, ZMS_LL_NODE_FROM_NAME_ID(name_hash), &settings_element,
 		      sizeof(struct settings_hash_linked_list));
 	if (rc < 0) {
 		return rc;
 	}
+
+	/* update the previous element */
+	if (settings_element.previous_hash) {
+		rc = zms_read(&cf->cf_zms, settings_element.previous_hash, &settings_update_element,
+			      sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
+		if (!settings_element.next_hash) {
+			/* we are deleting the last element of the linked list,
+			 * let's update the second_to_last_hash_id
+			 */
+			cf->second_to_last_hash_id = settings_update_element.previous_hash;
+		}
+		settings_update_element.next_hash = settings_element.next_hash;
+		rc = zms_write(&cf->cf_zms, settings_element.previous_hash,
+			       &settings_update_element, sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+
+	/* Now delete the current linked list element */
+	rc = zms_delete(&cf->cf_zms, ZMS_LL_NODE_FROM_NAME_ID(name_hash));
+	if (rc < 0) {
+		return rc;
+	}
+
 	/* update the next element */
 	if (settings_element.next_hash) {
 		rc = zms_read(&cf->cf_zms, settings_element.next_hash, &settings_update_element,
@@ -96,29 +133,10 @@ static int settings_zms_unlink_ll_node(struct settings_zms *cf, uint32_t name_ha
 		 */
 		cf->last_hash_id = settings_element.previous_hash;
 	}
-	/* update the previous element */
-	if (settings_element.previous_hash) {
-		rc = zms_read(&cf->cf_zms, settings_element.previous_hash, &settings_update_element,
-			      sizeof(struct settings_hash_linked_list));
-		if (rc < 0) {
-			return rc;
-		}
-		if (!settings_element.next_hash) {
-			/* we are deleting the last element of the linked list,
-			 * let's update the second_to_last_hash_id
-			 */
-			cf->second_to_last_hash_id = settings_update_element.previous_hash;
-		}
-		settings_update_element.next_hash = settings_element.next_hash;
-		rc = zms_write(&cf->cf_zms, settings_element.previous_hash,
-			       &settings_update_element, sizeof(struct settings_hash_linked_list));
-		if (rc < 0) {
-			return rc;
-		}
-	}
 
-	return rc;
+	return 0;
 }
+#endif /* CONFIG_SETTINGS_ZMS_NO_LL_DELETE */
 
 static int settings_zms_delete(struct settings_zms *cf, uint32_t name_hash)
 {
@@ -126,24 +144,165 @@ static int settings_zms_delete(struct settings_zms *cf, uint32_t name_hash)
 
 	rc = zms_delete(&cf->cf_zms, name_hash);
 	if (rc >= 0) {
-		rc = zms_delete(&cf->cf_zms, name_hash + ZMS_DATA_ID_OFFSET);
+		rc = zms_delete(&cf->cf_zms, ZMS_DATA_ID_FROM_NAME(name_hash));
 	}
 	if (rc < 0) {
 		return rc;
 	}
 
+#ifndef CONFIG_SETTINGS_ZMS_NO_LL_DELETE
+#ifdef CONFIG_SETTINGS_ZMS_LL_CACHE
+	cf->ll_has_changed = true;
+#endif
 	rc = settings_zms_unlink_ll_node(cf, name_hash);
-	if (rc < 0) {
-		return rc;
+#endif /* CONFIG_SETTINGS_ZMS_NO_LL_DELETE */
+
+	return rc;
+}
+
+#ifdef CONFIG_SETTINGS_ZMS_LOAD_SUBTREE_PATH
+/* Loads first the key which is defined by the name found in "subtree" root.
+ * If the key is not found or further keys under the same subtree are needed
+ * by the caller, returns 0.
+ */
+static int settings_zms_load_subtree(struct settings_store *cs, const struct settings_load_arg *arg)
+{
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+	struct settings_zms_read_fn_arg read_fn_arg;
+	char name[SETTINGS_FULL_NAME_LEN];
+	ssize_t rc1;
+	ssize_t rc2;
+	uint32_t name_hash;
+
+	name_hash = sys_hash32(arg->subtree, strnlen(arg->subtree, SETTINGS_FULL_NAME_LEN)) &
+		    ZMS_HASH_MASK;
+	for (int i = 0; i <= cf->hash_collision_num; i++) {
+		name_hash = ZMS_UPDATE_COLLISION_NUM(name_hash, i);
+		/* Get the name entry from ZMS */
+		rc1 = zms_read(&cf->cf_zms, ZMS_NAME_ID_FROM_HASH(name_hash), &name,
+			       sizeof(name) - 1);
+		/* get the length of data and verify that it exists */
+		rc2 = zms_get_data_length(&cf->cf_zms, ZMS_DATA_ID_FROM_HASH(name_hash));
+		if ((rc1 <= 0) || (rc2 <= 0)) {
+			/* Name or data doesn't exist */
+			continue;
+		}
+		/* Found a name, this might not include a trailing \0 */
+		name[rc1] = '\0';
+		if (strcmp(arg->subtree, name)) {
+			/* Names are not equal let's continue to the next collision hash
+			 * if it exists.
+			 */
+			continue;
+		}
+		/* At this steps the names are equal, let's set the handler */
+		read_fn_arg.fs = &cf->cf_zms;
+		read_fn_arg.id = ZMS_DATA_ID_FROM_HASH(name_hash);
+
+		/* We should return here as there is no need to look for the next
+		 * hash collision
+		 */
+		return settings_call_set_handler(arg->subtree, rc2, settings_zms_read_fn,
+						 &read_fn_arg, arg);
 	}
 
-	/* Now delete the current linked list element */
-	rc = zms_delete(&cf->cf_zms, name_hash | 1);
-	if (rc < 0) {
-		return rc;
+	return 0;
+}
+#endif /* CONFIG_SETTINGS_ZMS_LOAD_SUBTREE_PATH */
+
+/* Search for the name_hash that corresponds to name.
+ * If no hash that corresponds to name is found in the persistent storage,
+ * returns 0.
+ */
+static uint32_t settings_zms_find_hash_from_name(struct settings_zms *cf, const char *name)
+{
+	uint32_t name_hash = 0;
+	int rc = 0;
+	char r_name[SETTINGS_FULL_NAME_LEN];
+
+	name_hash = sys_hash32(name, strnlen(name, SETTINGS_FULL_NAME_LEN)) & ZMS_HASH_MASK;
+	for (int i = 0; i <= cf->hash_collision_num; i++) {
+		name_hash = ZMS_UPDATE_COLLISION_NUM(name_hash, i);
+		/* Get the name entry from ZMS */
+		rc = zms_read(&cf->cf_zms, ZMS_NAME_ID_FROM_HASH(name_hash), r_name,
+			      sizeof(r_name) - 1);
+		if (rc <= 0) {
+			/* Name doesn't exist */
+			continue;
+		}
+		/* Found a name, this might not include a trailing \0 */
+		r_name[rc] = '\0';
+		if (strcmp(name, r_name)) {
+			/* Names are not equal let's continue to the next collision hash
+			 * if it exists.
+			 */
+			continue;
+		}
+		/* At this step names are equal, we found the corresponding hash */
+		return name_hash;
 	}
 
-	return rc;
+	return 0;
+}
+
+static ssize_t settings_zms_load_one(struct settings_store *cs, const char *name, char *buf,
+				     size_t buf_len)
+{
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+	uint32_t name_hash = 0;
+	ssize_t rc = 0;
+	uint32_t value_id;
+
+	/* verify that name is not NULL */
+	if (!name || !buf) {
+		return -EINVAL;
+	}
+
+	name_hash = settings_zms_find_hash_from_name(cf, name);
+	if (name_hash) {
+		/* we found a name_hash corresponding to name */
+		value_id = ZMS_DATA_ID_FROM_HASH(name_hash);
+		rc = zms_read(&cf->cf_zms, value_id, buf, buf_len);
+
+		return (rc == buf_len) ? zms_get_data_length(&cf->cf_zms, value_id) : rc;
+	}
+
+	return 0;
+}
+
+/* Gets the next linked list node either from cache (if enabled) or from persistent
+ * storage if cache is full or cache is not enabled.
+ * It updates as well the next cache index and the next linked list node ID.
+ */
+static int settings_zms_get_next_ll(struct settings_zms *cf, uint32_t *ll_hash_id,
+				    [[maybe_unused]] uint32_t *ll_cache_index)
+{
+	struct settings_hash_linked_list settings_element;
+	int ret = 0;
+
+#ifdef CONFIG_SETTINGS_ZMS_LL_CACHE
+	if (*ll_cache_index < cf->ll_cache_next) {
+		settings_element = cf->ll_cache[*ll_cache_index];
+		*ll_cache_index = *ll_cache_index + 1;
+	} else if (*ll_hash_id == cf->second_to_last_hash_id) {
+		/* The last ll node is not stored in the cache as it is already
+		 * in the cf->last_hash_id.
+		 */
+		settings_element.next_hash = cf->last_hash_id;
+	} else {
+#endif
+		ret = zms_read(&cf->cf_zms, *ll_hash_id, &settings_element,
+			       sizeof(struct settings_hash_linked_list));
+		if (ret < 0) {
+			return ret;
+		}
+#ifdef CONFIG_SETTINGS_ZMS_LL_CACHE
+	}
+#endif
+	/* update next ll_hash_id */
+	*ll_hash_id = settings_element.next_hash;
+
+	return 0;
 }
 
 static int settings_zms_load(struct settings_store *cs, const struct settings_load_arg *arg)
@@ -151,21 +310,41 @@ static int settings_zms_load(struct settings_store *cs, const struct settings_lo
 	int ret = 0;
 	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
 	struct settings_zms_read_fn_arg read_fn_arg;
-	struct settings_hash_linked_list settings_element;
-	char name[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
+	char name[SETTINGS_FULL_NAME_LEN];
 	ssize_t rc1;
 	ssize_t rc2;
 	uint32_t ll_hash_id;
+	uint32_t prev_ll_hash_id;
+	uint32_t ll_cache_index = 0;
 
-	ret = zms_read(&cf->cf_zms, ZMS_LL_HEAD_HASH_ID, &settings_element,
-		       sizeof(struct settings_hash_linked_list));
+#ifdef CONFIG_SETTINGS_ZMS_LOAD_SUBTREE_PATH
+	/* If arg->subtree is not null we must first load settings in that subtree */
+	if (arg->subtree != NULL) {
+		ret = settings_zms_load_subtree(cs, arg);
+		if (ret) {
+			return ret;
+		}
+	}
+#endif /* CONFIG_SETTINGS_ZMS_LOAD_SUBTREE_PATH */
+
+#ifdef CONFIG_SETTINGS_ZMS_LL_CACHE
+	if (cf->ll_has_changed) {
+		/* reload the linked list in cache */
+		ret = settings_zms_get_last_hash_ids(cf);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+#endif
+
+	/* If subtree is NULL then we must load all found Settings */
+	ll_hash_id = ZMS_LL_HEAD_HASH_ID;
+	ret = settings_zms_get_next_ll(cf, &ll_hash_id, &ll_cache_index);
 	if (ret < 0) {
 		return ret;
 	}
-	ll_hash_id = settings_element.next_hash;
 
 	while (ll_hash_id) {
-
 		/* In the ZMS backend, each setting item is stored in two ZMS
 		 * entries one for the setting's name and one with the
 		 * setting's value.
@@ -173,40 +352,43 @@ static int settings_zms_load(struct settings_store *cs, const struct settings_lo
 		rc1 = zms_read(&cf->cf_zms, ZMS_NAME_ID_FROM_LL_NODE(ll_hash_id), &name,
 			       sizeof(name) - 1);
 		/* get the length of data and verify that it exists */
-		rc2 = zms_get_data_length(&cf->cf_zms, ZMS_NAME_ID_FROM_LL_NODE(ll_hash_id) +
-							       ZMS_DATA_ID_OFFSET);
+		rc2 = zms_get_data_length(&cf->cf_zms, ZMS_DATA_ID_FROM_LL_NODE(ll_hash_id));
+
+		/* updated the next linked list node in case the called handler will
+		 * delete this settings entry.
+		 */
+		prev_ll_hash_id = ll_hash_id;
+		ret = settings_zms_get_next_ll(cf, &ll_hash_id, &ll_cache_index);
+		if (ret < 0) {
+			return ret;
+		}
 
 		if ((rc1 <= 0) || (rc2 <= 0)) {
-			/* Settings item is not stored correctly in the ZMS.
-			 * ZMS entry for its name or value is either missing
-			 * or deleted. Clean dirty entries to make space for
-			 * future settings item.
+			/* In case we are not updating the linked list, this is an empty mode
+			 * Just continue
+			 */
+#ifndef CONFIG_SETTINGS_ZMS_NO_LL_DELETE
+			/* Otherwise, Settings item is not stored correctly in the ZMS.
+			 * ZMS entry's name or value is either missing or deleted.
+			 * Clean dirty entries to make space for future settings items.
 			 */
-			ret = settings_zms_delete(cf, ZMS_NAME_ID_FROM_LL_NODE(ll_hash_id));
+			ret = settings_zms_delete(cf, ZMS_NAME_ID_FROM_LL_NODE(prev_ll_hash_id));
 			if (ret < 0) {
 				return ret;
 			}
+#endif /* CONFIG_SETTINGS_ZMS_NO_LL_DELETE */
 			continue;
 		}
 
 		/* Found a name, this might not include a trailing \0 */
 		name[rc1] = '\0';
 		read_fn_arg.fs = &cf->cf_zms;
-		read_fn_arg.id = ZMS_NAME_ID_FROM_LL_NODE(ll_hash_id) + ZMS_DATA_ID_OFFSET;
+		read_fn_arg.id = ZMS_DATA_ID_FROM_LL_NODE(prev_ll_hash_id);
 
-		ret = settings_call_set_handler(name, rc2, settings_zms_read_fn, &read_fn_arg,
-						(void *)arg);
+		ret = settings_call_set_handler(name, rc2, settings_zms_read_fn, &read_fn_arg, arg);
 		if (ret) {
-			break;
-		}
-
-		/* update next ll_hash_id */
-		ret = zms_read(&cf->cf_zms, ll_hash_id, &settings_element,
-			       sizeof(struct settings_hash_linked_list));
-		if (ret < 0) {
 			return ret;
 		}
-		ll_hash_id = settings_element.next_hash;
 	}
 
 	return ret;
@@ -217,7 +399,7 @@ static int settings_zms_save(struct settings_store *cs, const char *name, const
 {
 	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
 	struct settings_hash_linked_list settings_element;
-	char rdname[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
+	char rdname[SETTINGS_FULL_NAME_LEN];
 	uint32_t name_hash;
 	uint32_t collision_num = 0;
 	bool delete;
@@ -233,7 +415,7 @@ static int settings_zms_save(struct settings_store *cs, const char *name, const
 	/* Find out if we are doing a delete */
 	delete = ((value == NULL) || (val_len == 0));
 
-	name_hash = sys_hash32(name, strlen(name)) & ZMS_HASH_MASK;
+	name_hash = sys_hash32(name, strnlen(name, SETTINGS_FULL_NAME_LEN)) & ZMS_HASH_MASK;
 	/* MSB is always 1 */
 	name_hash |= BIT(31);
 
@@ -302,17 +484,25 @@ static int settings_zms_save(struct settings_store *cs, const char *name, const
 	}
 
 	/* write the value */
-	rc = zms_write(&cf->cf_zms, name_hash + ZMS_DATA_ID_OFFSET, value, val_len);
+	rc = zms_write(&cf->cf_zms, ZMS_DATA_ID_FROM_NAME(name_hash), value, val_len);
 	if (rc < 0) {
 		return rc;
 	}
 
 	/* write the name if required */
 	if (write_name) {
-		rc = zms_write(&cf->cf_zms, name_hash, name, strlen(name));
-		if (rc < 0) {
+		/* First let's update the linked list */
+#ifdef CONFIG_SETTINGS_ZMS_NO_LL_DELETE
+		/* verify that the ll_node doesn't exist otherwise do not update it */
+		rc = zms_read(&cf->cf_zms, ZMS_LL_NODE_FROM_NAME_ID(name_hash), &settings_element,
+			      sizeof(struct settings_hash_linked_list));
+		if (rc >= 0) {
+			goto no_ll_update;
+		} else if (rc != -ENOENT) {
 			return rc;
 		}
+		/* else the LL node doesn't exist let's update it */
+#endif /* CONFIG_SETTINGS_ZMS_NO_LL_DELETE */
 		/* write linked list structure element */
 		settings_element.next_hash = 0;
 		/* Verify first that the linked list last element is not broken.
@@ -326,13 +516,14 @@ static int settings_zms_save(struct settings_store *cs, const char *name, const
 			}
 		}
 		settings_element.previous_hash = cf->last_hash_id;
-		rc = zms_write(&cf->cf_zms, name_hash | 1, &settings_element,
+		rc = zms_write(&cf->cf_zms, ZMS_LL_NODE_FROM_NAME_ID(name_hash), &settings_element,
 			       sizeof(struct settings_hash_linked_list));
 		if (rc < 0) {
 			return rc;
 		}
+
 		/* Now update the previous linked list element */
-		settings_element.next_hash = name_hash | 1;
+		settings_element.next_hash = ZMS_LL_NODE_FROM_NAME_ID(name_hash);
 		settings_element.previous_hash = cf->second_to_last_hash_id;
 		rc = zms_write(&cf->cf_zms, cf->last_hash_id, &settings_element,
 			       sizeof(struct settings_hash_linked_list));
@@ -340,7 +531,71 @@ static int settings_zms_save(struct settings_store *cs, const char *name, const
 			return rc;
 		}
 		cf->second_to_last_hash_id = cf->last_hash_id;
-		cf->last_hash_id = name_hash | 1;
+		cf->last_hash_id = ZMS_LL_NODE_FROM_NAME_ID(name_hash);
+#ifdef CONFIG_SETTINGS_ZMS_LL_CACHE
+		if (cf->ll_cache_next < CONFIG_SETTINGS_ZMS_LL_CACHE_SIZE) {
+			cf->ll_cache[cf->ll_cache_next] = settings_element;
+			cf->ll_cache_next = cf->ll_cache_next + 1;
+		}
+#endif
+#ifdef CONFIG_SETTINGS_ZMS_NO_LL_DELETE
+no_ll_update:
+#endif /* CONFIG_SETTINGS_ZMS_NO_LL_DELETE */
+		/* Now let's write the name */
+		rc = zms_write(&cf->cf_zms, name_hash, name, strnlen(name, SETTINGS_FULL_NAME_LEN));
+		if (rc < 0) {
+			return rc;
+		}
+	}
+	return 0;
+}
+
+static ssize_t settings_zms_get_val_len(struct settings_store *cs, const char *name)
+{
+	struct settings_zms *cf = CONTAINER_OF(cs, struct settings_zms, cf_store);
+	uint32_t name_hash = 0;
+
+	/* verify that name is not NULL */
+	if (!name) {
+		return -EINVAL;
+	}
+
+	name_hash = settings_zms_find_hash_from_name(cf, name);
+	if (name_hash) {
+		return zms_get_data_length(&cf->cf_zms, ZMS_DATA_ID_FROM_HASH(name_hash));
+	}
+
+	return 0;
+}
+
+/* This function inits the linked list head if it doesn't exist or recover it
+ * if the ll_last_hash_id is different than the head hash ID
+ */
+static int settings_zms_init_or_recover_ll(struct settings_zms *cf, uint32_t ll_last_hash_id)
+{
+	struct settings_hash_linked_list settings_element;
+	int rc = 0;
+
+	if (ll_last_hash_id == ZMS_LL_HEAD_HASH_ID) {
+		/* header doesn't exist */
+		settings_element.previous_hash = 0;
+		settings_element.next_hash = 0;
+		rc = zms_write(&cf->cf_zms, ZMS_LL_HEAD_HASH_ID, &settings_element,
+			       sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
+		cf->last_hash_id = ZMS_LL_HEAD_HASH_ID;
+		cf->second_to_last_hash_id = 0;
+	} else {
+		/* let's recover it by keeping all nodes until the last one */
+		settings_element.previous_hash = cf->second_to_last_hash_id;
+		settings_element.next_hash = 0;
+		rc = zms_write(&cf->cf_zms, cf->last_hash_id, &settings_element,
+			       sizeof(struct settings_hash_linked_list));
+		if (rc < 0) {
+			return rc;
+		}
 	}
 
 	return 0;
@@ -350,28 +605,53 @@ static int settings_zms_get_last_hash_ids(struct settings_zms *cf)
 {
 	struct settings_hash_linked_list settings_element;
 	uint32_t ll_last_hash_id = ZMS_LL_HEAD_HASH_ID;
+	uint32_t previous_ll_hash_id = 0;
 	int rc = 0;
 
+#ifdef CONFIG_SETTINGS_ZMS_LL_CACHE
+	cf->ll_cache_next = 0;
+#endif
 	cf->hash_collision_num = 0;
 	do {
 		rc = zms_read(&cf->cf_zms, ll_last_hash_id, &settings_element,
 			      sizeof(settings_element));
 		if (rc == -ENOENT) {
-			/* header doesn't exist or linked list broken, reinitialize the header */
-			const struct settings_hash_linked_list settings_element = {
-				.previous_hash = 0, .next_hash = 0};
-			rc = zms_write(&cf->cf_zms, ZMS_LL_HEAD_HASH_ID, &settings_element,
-				       sizeof(struct settings_hash_linked_list));
+			/* header doesn't exist or linked list broken, reinitialize the header
+			 * if it doesn't exist and recover it if it is broken
+			 */
+			return settings_zms_init_or_recover_ll(cf, ll_last_hash_id);
+		} else if (rc < 0) {
+			return rc;
+		}
+
+		if (settings_element.previous_hash != previous_ll_hash_id) {
+			/* This is a special case that can happen when a power down occurred
+			 * when deleting a linked list node.
+			 * If the power down occurred after updating the previous linked list node,
+			 * then we would end up with a state where the previous_hash of the linked
+			 * list is broken. Let's recover from this
+			 */
+			rc = zms_delete(&cf->cf_zms, settings_element.previous_hash);
+			if (rc < 0) {
+				return rc;
+			}
+			/* Now recover the linked list */
+			settings_element.previous_hash = previous_ll_hash_id;
+			zms_write(&cf->cf_zms, ll_last_hash_id, &settings_element,
+				  sizeof(struct settings_hash_linked_list));
 			if (rc < 0) {
 				return rc;
 			}
-			cf->last_hash_id = ZMS_LL_HEAD_HASH_ID;
-			cf->second_to_last_hash_id = 0;
-			return 0;
-		} else if (rc < 0) {
-			return rc;
 		}
+		previous_ll_hash_id = ll_last_hash_id;
 
+#ifdef CONFIG_SETTINGS_ZMS_LL_CACHE
+		if ((cf->ll_cache_next < CONFIG_SETTINGS_ZMS_LL_CACHE_SIZE) &&
+		    (settings_element.next_hash)) {
+			cf->ll_cache[cf->ll_cache_next] = settings_element;
+			cf->ll_cache_next = cf->ll_cache_next + 1;
+		}
+#endif
 		/* increment hash collision number if necessary */
 		if (ZMS_COLLISION_NUM(ll_last_hash_id) > cf->hash_collision_num) {
 			cf->hash_collision_num = ZMS_COLLISION_NUM(ll_last_hash_id);
@@ -381,6 +661,9 @@ static int settings_zms_get_last_hash_ids(struct settings_zms *cf)
 		ll_last_hash_id = settings_element.next_hash;
 	} while (settings_element.next_hash);
 
+#ifdef CONFIG_SETTINGS_ZMS_LL_CACHE
+	cf->ll_has_changed = false;
+#endif
 	return 0;
 }
 
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
index 0bcc82e646b..025c842f70b 100644
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -1 +1,2 @@
 CONFIG_SOC_NRF54H20_GPD=n
+CONFIG_SSF_CLIENT_SYS_INIT=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
index 0bcc82e646b..025c842f70b 100644
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -1 +1,2 @@
 CONFIG_SOC_NRF54H20_GPD=n
+CONFIG_SSF_CLIENT_SYS_INIT=n
diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index f9615d1b35e..00000000000
--- a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-&cpusec_cpuapp_ipc {
-	status = "disabled";
-};
-
-&cpusec_bellboard {
-	status = "disabled";
-};
diff --git a/tests/bluetooth/controller/ctrl_api/testcase.yaml b/tests/bluetooth/controller/ctrl_api/testcase.yaml
index 19bf6c9ab49..21f178bf9b2 100644
--- a/tests/bluetooth/controller/ctrl_api/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_api/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_api.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
index f7e8068d60e..9c3ee626433 100644
--- a/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_chmu/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_chmu.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
index 99612a89bc3..2371d7063eb 100644
--- a/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_create/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_create.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
index 956172a89b2..a98229ba45f 100644
--- a/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cis_terminate/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cis_terminate.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_collision/testcase.yaml b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
index 6086a9a4ebc..daa8f3bc6c3 100644
--- a/tests/bluetooth/controller/ctrl_collision/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_collision/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_collision.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
index 5b0bda4b908..fc4ecb0b647 100644
--- a/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_conn_update/testcase.yaml
@@ -7,11 +7,18 @@ common:
 tests:
   bluetooth.controller.ctrl_conn_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_conn_update.apm_test:
     type: unit
-    extra_args: CONF_FILE=prj_apm.conf
+    extra_args:
+      - CONF_FILE=prj_apm.conf
+      - SNIPPET="bt-ll-sw-split"
+
 
   bluetooth.controller.ctrl_conn_update.no_param_req_test:
     type: unit
-    extra_args: CONF_FILE=prj_no_param_req.conf
+    extra_args:
+      - CONF_FILE=prj_no_param_req.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
index fd6ff51118d..c6288aecc43 100644
--- a/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_cte_req/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_cte_req.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
index 9778af435b4..c7d1174e12b 100644
--- a/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_data_length_update/testcase.yaml
@@ -6,11 +6,17 @@ common:
 tests:
   bluetooth.controller.ctrl_data_length_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nocodedphy:
     type: unit
-    extra_args: CONF_FILE=prj_nocoded.conf
+    extra_args:
+      - CONF_FILE=prj_nocoded.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_data_length_update.test_nophy:
     type: unit
-    extra_args: CONF_FILE=prj_nophy.conf
+    extra_args:
+      - CONF_FILE=prj_nophy.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
index d5bb2cb8b11..86dd5bfe4d3 100644
--- a/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_encrypt/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_encrypt.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
index 257542f3612..087e49575ff 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_feature_exchange.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_hci/testcase.yaml b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
index c750ebc8dd8..5e00c85f6f4 100644
--- a/tests/bluetooth/controller/ctrl_hci/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_hci/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_hci.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
index 2d1741931e3..cee54e6b09e 100644
--- a/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_invalid/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_invalid.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
index b6a77528f32..54178905da1 100644
--- a/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_le_ping/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_le_ping.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
index 0991b0cdd43..a9445cbf8c4 100644
--- a/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_min_used_chans/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_min_used_chans.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
index 1d7da169f1d..d5c49d587a8 100644
--- a/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_phy_update/testcase.yaml
@@ -6,6 +6,10 @@ common:
 tests:
   bluetooth.controller.ctrl_phy_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
   bluetooth.controller.ctrl_phy_update.test_reduced_buf:
     type: unit
-    extra_args: CONF_FILE=prj_rx_cnt.conf
+    extra_args:
+      - CONF_FILE=prj_rx_cnt.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
index cbf63aa1b57..cbc3c3faf72 100644
--- a/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sca_update/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_sca_update.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
index 778606d6954..ac5dd6e957e 100644
--- a/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_sw_privacy/testcase.yaml
@@ -4,3 +4,5 @@ common:
 tests:
   bluetooth.ctrl_sw_privacy.test:
     platform_allow: nrf52_bsim
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
index cbe639401ea..6b1409e9653 100644
--- a/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_terminate/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_terminate.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
index 614eb7fe94c..363986bd3d3 100644
--- a/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_buffer_alloc/testcase.yaml
@@ -6,23 +6,35 @@ common:
 tests:
   bluetooth.controller.ctrl_tx_buffer_alloc.test_0_per_conn:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_1_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_1.conf
+    extra_args:
+      - CONF_FILE=prj_1.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_2_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_2.conf
+    extra_args:
+      - CONF_FILE=prj_2.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_3_per_conn:
     type: unit
-    extra_args: CONF_FILE=prj_3.conf
+    extra_args:
+      - CONF_FILE=prj_3.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_per_conn_alloc:
     type: unit
-    extra_args: CONF_FILE=prj_max.conf
+    extra_args:
+      - CONF_FILE=prj_max.conf
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_tx_buffer_alloc.test_max_common_alloc:
     type: unit
-    extra_args: CONF_FILE=prj_max_common.conf
+    extra_args:
+      - CONF_FILE=prj_max_common.conf
+       - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
index 295ad891a63..282b620b317 100644
--- a/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_tx_queue/testcase.yaml
@@ -5,3 +5,5 @@ common:
 tests:
   bluetooth.ctrl_tx_queue.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
index 28aba1a752a..48b18af9353 100644
--- a/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_unsupported/testcase.yaml
@@ -6,7 +6,11 @@ common:
 tests:
   bluetooth.controller.ctrl_unsupported.default.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
 
   bluetooth.controller.ctrl_unsupported.test:
     type: unit
-    extra_args: CONF_FILE=prj_unsupported.conf
+    extra_args:
+      - CONF_FILE=prj_unsupported.conf
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
index af319a7a719..be963df24a8 100644
--- a/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_user_ext/testcase.yaml
@@ -4,3 +4,5 @@ common:
 tests:
   bluetooth.ctrl_user_ext.test:
     platform_allow: nrf52_bsim
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/controller/ctrl_version/testcase.yaml b/tests/bluetooth/controller/ctrl_version/testcase.yaml
index 6badcbc7254..5df86b9bca9 100644
--- a/tests/bluetooth/controller/ctrl_version/testcase.yaml
+++ b/tests/bluetooth/controller/ctrl_version/testcase.yaml
@@ -6,3 +6,5 @@ common:
 tests:
   bluetooth.controller.ctrl_version.test:
     type: unit
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_req/testcase.yaml b/tests/bluetooth/df/connection_cte_req/testcase.yaml
index 768aba4a51f..fbfe4b0d9a1 100644
--- a/tests/bluetooth/df/connection_cte_req/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_req/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.conection_cte_req:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
index 38a23b0950e..a9986c5b0e5 100644
--- a/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
+++ b/tests/bluetooth/df/connection_cte_tx_params/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.conection_cte_tx_params:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
index 6aa5bb0f0c1..844a7bbb524 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_chains:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
index f839b1910eb..c8f08a90843 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_rx/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_rx:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
index 77d651d0cbc..491cc0e7e59 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_tx/testcase.yaml
@@ -2,3 +2,5 @@ tests:
   bluetooth.df.connectionless_cte_tx:
     platform_allow: nrf52_bsim
     tags: bluetooth
+    extra_args:
+      - SNIPPET="bt-ll-sw-split"
diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml
index dd44257e012..a5cc40cd39e 100644
--- a/tests/bluetooth/init/testcase.yaml
+++ b/tests/bluetooth/init/testcase.yaml
@@ -74,7 +74,9 @@ tests:
     extra_args: CONF_FILE=prj_9.conf
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_ctlr:
-    extra_args: CONF_FILE=prj_ctlr.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -86,7 +88,9 @@ tests:
       - nrf51dk/nrf51822
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_4_0:
-    extra_args: CONF_FILE=prj_ctlr_4_0.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_4_0.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -95,7 +99,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_4_0_dbg:
-    extra_args: CONF_FILE=prj_ctlr_4_0_dbg.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_4_0_dbg.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -104,7 +110,9 @@ tests:
       - nrf52dk/nrf52832
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_tiny:
-    extra_args: CONF_FILE=prj_ctlr_tiny.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_tiny.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -116,6 +124,7 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -126,6 +135,7 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr_5_x_dbg.conf
       - DTC_OVERLAY_FILE=pa_lna.overlay
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -137,6 +147,7 @@ tests:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_CTLR_ADVANCED_FEATURES=y
       - CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER=y
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf5340dk/nrf5340/cpunet
       - nrf52840dk/nrf52840
@@ -146,13 +157,16 @@ tests:
   bluetooth.init.test_ctlr_ticker:
     extra_args:
       - CONF_FILE=prj_ctlr_ticker.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
     integration_platforms:
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_broadcaster:
-    extra_args: CONF_FILE=prj_ctlr_broadcaster.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_broadcaster.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -161,7 +175,9 @@ tests:
     integration_platforms:
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_peripheral:
-    extra_args: CONF_FILE=prj_ctlr_peripheral.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -170,7 +186,9 @@ tests:
     integration_platforms:
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_peripheral_priv:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -179,7 +197,9 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
   bluetooth.init.test_ctlr_observer:
-    extra_args: CONF_FILE=prj_ctlr_observer.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_observer.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -188,7 +208,9 @@ tests:
     integration_platforms:
       - nrf52dk/nrf52832
   bluetooth.init.test_ctlr_central:
-    extra_args: CONF_FILE=prj_ctlr_central.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -198,7 +220,9 @@ tests:
       - nrf52dk/nrf52832
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_central_priv:
-    extra_args: CONF_FILE=prj_ctlr_central_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -208,7 +232,9 @@ tests:
       - nrf52dk/nrf52832
       - rv32m1_vega/openisa_rv32m1/ri5cy
   bluetooth.init.test_ctlr_broadcaster_ext:
-    extra_args: CONF_FILE=prj_ctlr_broadcaster_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_broadcaster_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -217,7 +243,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -226,7 +254,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_ext_priv:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_ext_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -235,7 +265,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_oberver_ext:
-    extra_args: CONF_FILE=prj_ctlr_observer_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_observer_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -244,7 +276,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext:
-    extra_args: CONF_FILE=prj_ctlr_central_ext.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_ext.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -253,7 +287,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_ext_priv:
-    extra_args: CONF_FILE=prj_ctlr_central_ext_priv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_ext_priv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -262,7 +298,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv:
-    extra_args: CONF_FILE=prj_ctlr_per_adv.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_adv.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -271,7 +309,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_adv_no_adi:
-    extra_args: CONF_FILE=prj_ctlr_per_adv_no_adi.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_adv_no_adi.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -280,7 +320,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync:
-    extra_args: CONF_FILE=prj_ctlr_per_sync.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -289,7 +331,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_adi:
-    extra_args: CONF_FILE=prj_ctlr_per_sync_no_adi.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync_no_adi.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -298,7 +342,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_per_sync_no_filter:
-    extra_args: CONF_FILE=prj_ctlr_per_sync_no_filter.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_per_sync_no_filter.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -307,7 +353,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_peripheral_iso:
-    extra_args: CONF_FILE=prj_ctlr_peripheral_iso.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_peripheral_iso.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -316,7 +364,9 @@ tests:
       - nrf52840dk/nrf52840
       - nrf51dk/nrf51822
   bluetooth.init.test_ctlr_central_iso:
-    extra_args: CONF_FILE=prj_ctlr_central_iso.conf
+    extra_args:
+      - CONF_FILE=prj_ctlr_central_iso.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -335,7 +385,9 @@ tests:
       - DTC_OVERLAY_FILE=h5.overlay
     platform_allow: qemu_cortex_m3
   bluetooth.init.test_llcp:
-    extra_args: CONF_FILE=prj_llcp.conf
+    extra_args:
+      - CONF_FILE=prj_llcp.conf
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
       - nrf52dk/nrf52832
@@ -347,6 +399,7 @@ tests:
     extra_args:
       - CONF_FILE=prj_ctlr.conf
       - CONFIG_BT_RECV_WORKQ_BT=y
+      - SNIPPET="bt-ll-sw-split"
     platform_allow:
       - nrf52840dk/nrf52840
   bluetooth.init.test_host_6_x:
diff --git a/tests/bluetooth/mesh_shell/boards/qemu_x86.conf b/tests/bluetooth/mesh_shell/boards/qemu_x86.conf
new file mode 100644
index 00000000000..bfb57193b78
--- /dev/null
+++ b/tests/bluetooth/mesh_shell/boards/qemu_x86.conf
@@ -0,0 +1,6 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_NRF_SECURITY=n
+CONFIG_MBEDTLS_ENABLE_HEAP=n
+CONFIG_TRUSTED_STORAGE=n
+CONFIG_SECURE_STORAGE=y
diff --git a/tests/bluetooth/mesh_shell/prj.conf b/tests/bluetooth/mesh_shell/prj.conf
index 2af60029568..aab2745d359 100644
--- a/tests/bluetooth/mesh_shell/prj.conf
+++ b/tests/bluetooth/mesh_shell/prj.conf
@@ -14,7 +14,7 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 CONFIG_SETTINGS=y
-CONFIG_SECURE_STORAGE=y
+# CONFIG_SECURE_STORAGE=y
 
 CONFIG_BT=y
 CONFIG_BT_OBSERVER=y
diff --git a/tests/bluetooth/tester/Kconfig.sysbuild b/tests/bluetooth/tester/Kconfig.sysbuild
index 69e4d5a97fb..e14a6e1aa8e 100644
--- a/tests/bluetooth/tester/Kconfig.sysbuild
+++ b/tests/bluetooth/tester/Kconfig.sysbuild
@@ -5,6 +5,7 @@ source "share/sysbuild/Kconfig"
 
 config NET_CORE_BOARD
 	string
+	default "nrf54h20dk/nrf54h20/cpurad" if "$(BOARD)" = "nrf54h20dk"
 	default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
 	default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
 	default "nrf5340bsim/nrf5340/cpunet" if $(BOARD_TARGET_STRING) = "NRF5340BSIM_NRF5340_CPUAPP"
diff --git a/tests/bluetooth/tester/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/bluetooth/tester/boards/nrf54h20dk_nrf54h20_cpuapp.conf
index 5bb1c4d8284..51b0ef5fa8d 100644
--- a/tests/bluetooth/tester/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ b/tests/bluetooth/tester/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -22,3 +22,10 @@ CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_BTTESTER_LOG_LEVEL_DBG=y
 
 CONFIG_UART_INTERRUPT_DRIVEN=y
+
+# Enable PSA RNG
+CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
+CONFIG_PSA_SSF_CRYPTO_CLIENT=y
+CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
+CONFIG_MBEDTLS_PSA_CRYPTO_C=y
+CONFIG_NRF_SECURITY=y
diff --git a/tests/bluetooth/tester/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/bluetooth/tester/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index e6d4f675f57..4f9de686b7e 100644
--- a/tests/bluetooth/tester/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/bluetooth/tester/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -12,3 +12,17 @@
 	status = "okay";
 	hw-flow-control;
 };
+
+// Enable PSA RNG
+/ {
+	chosen {
+		zephyr,entropy = &psa_rng;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+
+	/delete-node/ prng;
+};
diff --git a/tests/bluetooth/tester/hci_ipc_cpunet.conf b/tests/bluetooth/tester/hci_ipc_cpunet.conf
index e14b9815424..0c7f26c2602 100644
--- a/tests/bluetooth/tester/hci_ipc_cpunet.conf
+++ b/tests/bluetooth/tester/hci_ipc_cpunet.conf
@@ -15,3 +15,5 @@ CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
 
 CONFIG_BT_CTLR_ISOAL_SOURCES=4
 CONFIG_BT_CTLR_ISO_TX_BUFFERS=8
+
+CONFIG_BT_CTLR_SDC_PERIPHERAL_COUNT=2
diff --git a/tests/bluetooth/tester/sysbuild.cmake b/tests/bluetooth/tester/sysbuild.cmake
index 07806ec40e2..8b9402cfcdd 100644
--- a/tests/bluetooth/tester/sysbuild.cmake
+++ b/tests/bluetooth/tester/sysbuild.cmake
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
-	# For builds in the nrf5340, we build the netcore image with the controller
-
 	set(NET_APP hci_ipc)
 	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
 
@@ -13,10 +11,16 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
 		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
 	)
 
-	set(${NET_APP}_CONF_FILE
-	 ${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
-	 CACHE INTERNAL ""
-	)
+	if(SB_CONFIG_SOC_NRF5340_CPUAPP)
+		set(${NET_APP}_CONF_FILE
+		${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
+		CACHE INTERNAL ""
+		)
+		set(${NET_APP}_SNIPPET
+		"bt-ll-sw-split"
+		CACHE INTERNAL ""
+		)
+	endif()
 
 	set(${NET_APP}_EXTRA_CONF_FILE
 	 ${APP_DIR}/hci_ipc_cpunet.conf
diff --git a/tests/bluetooth/tester/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/bluetooth/tester/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf
new file mode 100644
index 00000000000..b7d64a9e6a0
--- /dev/null
+++ b/tests/bluetooth/tester/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -0,0 +1,40 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=1024
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+
+# Host
+CONFIG_BT_BROADCASTER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_PER_ADV=y
+CONFIG_BT_PER_ADV_SYNC=y
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=n
+CONFIG_BT_LL_SOFTDEVICE=y
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
+
+# Enable PSA RNG
+CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
+CONFIG_PSA_SSF_CRYPTO_CLIENT=y
+CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
+CONFIG_MBEDTLS_PSA_CRYPTO_C=y
+CONFIG_NRF_SECURITY=y
diff --git a/tests/bluetooth/tester/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/bluetooth/tester/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay
new file mode 100644
index 00000000000..e34567fe834
--- /dev/null
+++ b/tests/bluetooth/tester/sysbuild/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -0,0 +1,13 @@
+// Enable PSA RNG
+/ {
+	chosen {
+		zephyr,entropy = &psa_rng;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
+
+	/delete-node/ prng;
+};
diff --git a/tests/bluetooth/tester/sysbuild/hci_ipc/prj.conf b/tests/bluetooth/tester/sysbuild/hci_ipc/prj.conf
new file mode 100644
index 00000000000..08b1aed9e7f
--- /dev/null
+++ b/tests/bluetooth/tester/sysbuild/hci_ipc/prj.conf
@@ -0,0 +1,23 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_HEAP_MEM_POOL_SIZE=4096
+
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+CONFIG_BT_MAX_CONN=16
+
+
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
+# Enable and adjust the below value as necessary
+# CONFIG_BT_BUF_EVT_RX_COUNT=16
+# CONFIG_BT_BUF_EVT_RX_SIZE=255
+# CONFIG_BT_BUF_ACL_RX_SIZE=255
+# CONFIG_BT_BUF_ACL_TX_SIZE=251
+# CONFIG_BT_BUF_CMD_TX_SIZE=255
diff --git a/tests/boards/nrf/ironside_se_boot_report/CMakeLists.txt b/tests/boards/nrf/ironside_se_boot_report/CMakeLists.txt
new file mode 100644
index 00000000000..26e471228fa
--- /dev/null
+++ b/tests/boards/nrf/ironside_se_boot_report/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(ironside_se_boot_report)
+
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})
diff --git a/tests/boards/nrf/ironside_se_boot_report/prj.conf b/tests/boards/nrf/ironside_se_boot_report/prj.conf
new file mode 100644
index 00000000000..b7db25411d0
--- /dev/null
+++ b/tests/boards/nrf/ironside_se_boot_report/prj.conf
@@ -0,0 +1 @@
+# Empty
diff --git a/tests/boards/nrf/ironside_se_boot_report/src/main.c b/tests/boards/nrf/ironside_se_boot_report/src/main.c
new file mode 100644
index 00000000000..2bcd4437bd1
--- /dev/null
+++ b/tests/boards/nrf/ironside_se_boot_report/src/main.c
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <nrf/ironside_se_boot_report.h>
+#include <stdio.h>
+
+int main(void)
+{
+	int err;
+	const struct ironside_se_boot_report *report;
+
+	err = ironside_se_boot_report_get(&report);
+	printf("err:  %d\n", err);
+	printf("version: 0x%x\n", report->ironside_se_version_int);
+	printf("extraversion: %s\n", report->ironside_se_extraversion);
+
+	return 0;
+}
diff --git a/tests/boards/nrf/ironside_se_boot_report/testcase.yaml b/tests/boards/nrf/ironside_se_boot_report/testcase.yaml
new file mode 100644
index 00000000000..cb6e2290e29
--- /dev/null
+++ b/tests/boards/nrf/ironside_se_boot_report/testcase.yaml
@@ -0,0 +1,19 @@
+common:
+  tags:
+    - drivers
+    - hwinfo
+  harness: console
+
+tests:
+  soc.nordic.ironside_se_boot_report:
+    harness_config:
+      type: multi_line
+      ordered: true
+      regex:
+        - "err: 0"
+        - "version: 0x([0-9a-fA-F]+)"
+        - "extraversion: ([0-9a-fA-F]+)"
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp/iron
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp/iron
diff --git a/tests/boot/mcuboot_recovery_retention/sysbuild.conf b/tests/boot/mcuboot_recovery_retention/sysbuild.conf
index 47f00ff3cff..3b5b3c96380 100644
--- a/tests/boot/mcuboot_recovery_retention/sysbuild.conf
+++ b/tests/boot/mcuboot_recovery_retention/sysbuild.conf
@@ -1 +1,2 @@
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/boot/test_mcuboot/sysbuild.conf b/tests/boot/test_mcuboot/sysbuild.conf
index 47f00ff3cff..3b5b3c96380 100644
--- a/tests/boot/test_mcuboot/sysbuild.conf
+++ b/tests/boot/test_mcuboot/sysbuild.conf
@@ -1 +1,2 @@
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/crypto/mbedtls/CMakeLists.txt b/tests/crypto/mbedtls/CMakeLists.txt
index 7ebdc9d76a9..47670bead01 100644
--- a/tests/crypto/mbedtls/CMakeLists.txt
+++ b/tests/crypto/mbedtls/CMakeLists.txt
@@ -6,15 +6,5 @@ project(mbedtls)
 
 set(output_file ${PROJECT_BINARY_DIR}/mbedtls-check.timestamp)
 
-add_custom_command(
-    COMMENT "Check Mbed TLS auto-generated files"
-    COMMAND
-        ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/modules/mbedtls/create_psa_files.py --check
-    OUTPUT
-        ${output_file}
-)
-
-add_custom_target(check_mbedtls_auto_generated_files ALL DEPENDS ${output_file})
-
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
diff --git a/tests/crypto/secp256r1/mbedtls.conf b/tests/crypto/secp256r1/mbedtls.conf
index bbc2eb0e656..c4ea620de55 100644
--- a/tests/crypto/secp256r1/mbedtls.conf
+++ b/tests/crypto/secp256r1/mbedtls.conf
@@ -1,6 +1,7 @@
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_MBEDTLS_PSA_P256M_DRIVER_ENABLED=y
+CONFIG_MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE=65
 CONFIG_MBEDTLS_PSA_STATIC_KEY_SLOTS=y
 CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=2
 
diff --git a/tests/drivers/audio/dmic_api/src/main.c b/tests/drivers/audio/dmic_api/src/main.c
index 7f697e4539b..89d121742e6 100644
--- a/tests/drivers/audio/dmic_api/src/main.c
+++ b/tests/drivers/audio/dmic_api/src/main.c
@@ -34,8 +34,14 @@ static const struct device *dmic_dev = DEVICE_DT_GET(DT_ALIAS(dmic_dev));
 /* Milliseconds to wait for a block to be read. */
 #define READ_TIMEOUT 1000
 /* Size of a block for 100 ms of audio data. */
+#if defined(CONFIG_COVERAGE)
+/* Use smaller buffer in coverage mode. */
+#define BLOCK_SIZE(_sample_rate, _number_of_channels) \
+	(BYTES_PER_SAMPLE * (_sample_rate / 100) * _number_of_channels)
+#else
 #define BLOCK_SIZE(_sample_rate, _number_of_channels) \
 	(BYTES_PER_SAMPLE * (_sample_rate / 10) * _number_of_channels)
+#endif
 
 /* Driver will allocate blocks from this slab to receive audio data into them.
  * Application, after getting a given block from the driver and processing its
diff --git a/tests/drivers/build_all/regulator/testcase.yaml b/tests/drivers/build_all/regulator/testcase.yaml
index 30d494aca23..b662f0ac205 100644
--- a/tests/drivers/build_all/regulator/testcase.yaml
+++ b/tests/drivers/build_all/regulator/testcase.yaml
@@ -3,9 +3,7 @@
 
 tests:
   drivers.regulator.build:
-    tags:
-      - drivers
-      - regulator
+    tags: drivers regulator
     build_only: true
     platform_allow:
       - native_sim
diff --git a/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
deleted file mode 100644
index 0bcc82e646b..00000000000
--- a/tests/drivers/can/host/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_NRF54H20_GPD=n
diff --git a/tests/drivers/clock_control/clock_control_api/Kconfig b/tests/drivers/clock_control/clock_control_api/Kconfig
new file mode 100644
index 00000000000..dc1e976d824
--- /dev/null
+++ b/tests/drivers/clock_control/clock_control_api/Kconfig
@@ -0,0 +1,13 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config TEST_NRF_HF_STARTUP_TIME_US
+	int "Delay required for HF clock startup."
+	default 3000 if CONFIG_SOC_SERIES_NRF91X
+	default 500
+	depends on SOC_FAMILY_NORDIC_NRF
+	help
+	  Delay in microseconds required for high-frequency
+	  clock startup.
+
+source "Kconfig.zephyr"
diff --git a/tests/drivers/clock_control/clock_control_api/boards/nrf54l09pdk_nrf54l09_cpuapp.conf b/tests/drivers/clock_control/clock_control_api/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
new file mode 100644
index 00000000000..11d42321cbc
--- /dev/null
+++ b/tests/drivers/clock_control/clock_control_api/boards/nrf54l09pdk_nrf54l09_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_TEST_NRF_HF_STARTUP_TIME_US=1000
diff --git a/tests/drivers/clock_control/clock_control_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf b/tests/drivers/clock_control/clock_control_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
new file mode 100644
index 00000000000..11d42321cbc
--- /dev/null
+++ b/tests/drivers/clock_control/clock_control_api/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_TEST_NRF_HF_STARTUP_TIME_US=1000
diff --git a/tests/drivers/clock_control/clock_control_api/src/nrf_device_subsys.h b/tests/drivers/clock_control/clock_control_api/src/nrf_device_subsys.h
index 6d660bda947..47a3060d630 100644
--- a/tests/drivers/clock_control/clock_control_api/src/nrf_device_subsys.h
+++ b/tests/drivers/clock_control/clock_control_api/src/nrf_device_subsys.h
@@ -10,9 +10,7 @@
 static const struct device_subsys_data subsys_data[] = {
 	{
 		.subsys = CLOCK_CONTROL_NRF_SUBSYS_HF,
-		.startup_us =
-			IS_ENABLED(CONFIG_SOC_SERIES_NRF91X) ?
-				3000 : 500
+		.startup_us = CONFIG_TEST_NRF_HF_STARTUP_TIME_US
 	},
 #ifndef CONFIG_SOC_NRF52832
 	/* On nrf52832 LF clock cannot be stopped because it leads
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c b/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c
index 29ae25b9a4e..794144ff8d4 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c
+++ b/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c
@@ -63,6 +63,10 @@ static void test_calibration(uint32_t exp_cal, uint32_t exp_skip,
 	int cal_cnt;
 	int skip_cnt;
 
+	const struct device *const clk_dev = DEVICE_DT_GET_ONE(nordic_nrf_clock);
+
+	turn_on_clock(clk_dev, CLOCK_CONTROL_NRF_SUBSYS_HF);
+
 	cal_cnt = z_nrf_clock_calibration_count();
 	skip_cnt = z_nrf_clock_calibration_skips_count();
 
@@ -71,6 +75,8 @@ static void test_calibration(uint32_t exp_cal, uint32_t exp_skip,
 	cal_cnt = z_nrf_clock_calibration_count() - cal_cnt;
 	skip_cnt = z_nrf_clock_calibration_skips_count() - skip_cnt;
 
+	turn_off_clock(clk_dev, CLOCK_CONTROL_NRF_SUBSYS_HF);
+
 	zassert_equal(cal_cnt, exp_cal,
 			"%d: Unexpected number of calibrations (%d, exp:%d)",
 			line, cal_cnt, exp_cal);
diff --git a/tests/drivers/clock_control/nrf_clock_control/src/main.c b/tests/drivers/clock_control/nrf_clock_control/src/main.c
index 1f12969eb3d..7d3305df5ce 100644
--- a/tests/drivers/clock_control/nrf_clock_control/src/main.c
+++ b/tests/drivers/clock_control/nrf_clock_control/src/main.c
@@ -41,11 +41,6 @@ const struct nrf_clock_spec test_clk_specs_fll16m[] = {
 		.accuracy = 20000,
 		.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,
 	},
-	{
-		.frequency = MHZ(16),
-		.accuracy = 5020,
-		.precision = NRF_CLOCK_CONTROL_PRECISION_DEFAULT,
-	},
 	{
 		.frequency = MHZ(16),
 		.accuracy = 30,
diff --git a/tests/drivers/flash/negative_tests/sysbuild.conf b/tests/drivers/flash/negative_tests/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/drivers/flash/negative_tests/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/drivers/i2s/i2s_api/Kconfig b/tests/drivers/i2s/i2s_api/Kconfig
index 538157f8a79..ad08f2cc457 100644
--- a/tests/drivers/i2s/i2s_api/Kconfig
+++ b/tests/drivers/i2s/i2s_api/Kconfig
@@ -15,7 +15,7 @@ config I2S_TEST_SEPARATE_DEVICES
 
 config I2S_TEST_USE_I2S_DIR_BOTH
 	bool "Use I2S_DIR_BOTH value to perform RX/TX transfers"
-	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	help
 	  Use the I2S_DIR_BOTH enumeration value to trigger commands in test
 	  cases involving both reception and transmission. Use of this option
@@ -24,7 +24,7 @@ config I2S_TEST_USE_I2S_DIR_BOTH
 
 config I2S_TEST_USE_GPIO_LOOPBACK
 	bool "Use GPIO loopback"
-	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	help
 	  Use wiring between the data-out and data-in pins for looping back
 	  data. This option is intended to be used for devices that do not
@@ -32,7 +32,7 @@ config I2S_TEST_USE_GPIO_LOOPBACK
 
 config I2S_TEST_ALLOWED_DATA_OFFSET
 	int "Allowed offset in received data"
-	default 2 if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default 2 if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	default 0
 	help
 	  Maximum allowed offset between sent and received samples. Non-zero
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..0625be930fa
--- /dev/null
+++ b/tests/drivers/i2s/i2s_api/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &tdm130;
+	};
+};
+
+&pinctrl {
+	tdm130_default_alt: tdm130_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TDM_SCK_M, 1, 3)>,
+				<NRF_PSEL(TDM_FSYNC_M, 1, 6)>,
+				<NRF_PSEL(TDM_SDOUT, 1, 4)>,
+				<NRF_PSEL(TDM_SDIN, 1, 5)>;
+		};
+	};
+};
+
+&tdm130 {
+	status = "okay";
+	pinctrl-0 = <&tdm130_default_alt>;
+	pinctrl-names = "default";
+	memory-regions = <&cpuapp_dma_region>;
+};
diff --git a/tests/drivers/i2s/i2s_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/i2s/i2s_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..09a2cb0459c
--- /dev/null
+++ b/tests/drivers/i2s/i2s_api/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &tdm;
+	};
+};
+
+&pinctrl {
+	tdm_default_alt: tdm_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TDM_SCK_M, 1, 3)>,
+				<NRF_PSEL(TDM_FSYNC_M, 1, 6)>,
+				<NRF_PSEL(TDM_SDOUT, 1, 14)>,
+				<NRF_PSEL(TDM_SDIN, 1, 15)>;
+		};
+	};
+};
+
+&tdm {
+	status = "okay";
+	pinctrl-0 = <&tdm_default_alt>;
+	pinctrl-names = "default";
+};
diff --git a/tests/drivers/i2s/i2s_speed/Kconfig b/tests/drivers/i2s/i2s_speed/Kconfig
index 165fc6279b2..4e074f18c10 100644
--- a/tests/drivers/i2s/i2s_speed/Kconfig
+++ b/tests/drivers/i2s/i2s_speed/Kconfig
@@ -15,7 +15,7 @@ config I2S_TEST_SEPARATE_DEVICES
 
 config I2S_TEST_USE_I2S_DIR_BOTH
 	bool "Use I2S_DIR_BOTH value to perform RX/TX transfers"
-	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	help
 	  Use the I2S_DIR_BOTH enumeration value to trigger commands in test
 	  cases involving both reception and transmission. Use of this option
@@ -24,7 +24,7 @@ config I2S_TEST_USE_I2S_DIR_BOTH
 
 config I2S_TEST_USE_GPIO_LOOPBACK
 	bool "Use GPIO loopback"
-	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default y if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	help
 	  Use wiring between the data-out and data-in pins for looping back
 	  data. This option is intended to be used for devices that do not
@@ -32,7 +32,7 @@ config I2S_TEST_USE_GPIO_LOOPBACK
 
 config I2S_TEST_ALLOWED_DATA_OFFSET
 	int "Allowed offset in received data"
-	default 2 if DT_HAS_NORDIC_NRF_I2S_ENABLED
+	default 2 if DT_HAS_NORDIC_NRF_I2S_ENABLED || DT_HAS_NORDIC_NRF_TDM_ENABLED
 	default 0
 	help
 	  Maximum allowed offset between sent and received samples. Non-zero
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
new file mode 100644
index 00000000000..0625be930fa
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &tdm130;
+	};
+};
+
+&pinctrl {
+	tdm130_default_alt: tdm130_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TDM_SCK_M, 1, 3)>,
+				<NRF_PSEL(TDM_FSYNC_M, 1, 6)>,
+				<NRF_PSEL(TDM_SDOUT, 1, 4)>,
+				<NRF_PSEL(TDM_SDIN, 1, 5)>;
+		};
+	};
+};
+
+&tdm130 {
+	status = "okay";
+	pinctrl-0 = <&tdm130_default_alt>;
+	pinctrl-names = "default";
+	memory-regions = <&cpuapp_dma_region>;
+};
diff --git a/tests/drivers/i2s/i2s_speed/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/i2s/i2s_speed/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
new file mode 100644
index 00000000000..09a2cb0459c
--- /dev/null
+++ b/tests/drivers/i2s/i2s_speed/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* i2s-node0 is the transmitter/receiver */
+
+/ {
+	aliases {
+		i2s-node0 = &tdm;
+	};
+};
+
+&pinctrl {
+	tdm_default_alt: tdm_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TDM_SCK_M, 1, 3)>,
+				<NRF_PSEL(TDM_FSYNC_M, 1, 6)>,
+				<NRF_PSEL(TDM_SDOUT, 1, 14)>,
+				<NRF_PSEL(TDM_SDIN, 1, 15)>;
+		};
+	};
+};
+
+&tdm {
+	status = "okay";
+	pinctrl-0 = <&tdm_default_alt>;
+	pinctrl-names = "default";
+};
diff --git a/tests/kernel/pipe/deprecated/pipe_api/prj.conf b/tests/kernel/pipe/deprecated/pipe_api/prj.conf
index d080e2fbdbd..040b166563f 100644
--- a/tests/kernel/pipe/deprecated/pipe_api/prj.conf
+++ b/tests/kernel/pipe/deprecated/pipe_api/prj.conf
@@ -5,3 +5,4 @@ CONFIG_DYNAMIC_OBJECTS=y
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
 CONFIG_PIPES=y
+CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/schedule_api/prj.conf b/tests/kernel/sched/schedule_api/prj.conf
index a5ceef69433..8b649a3b7fc 100644
--- a/tests/kernel/sched/schedule_api/prj.conf
+++ b/tests/kernel/sched/schedule_api/prj.conf
@@ -7,3 +7,4 @@ CONFIG_MAX_THREAD_BYTES=6
 CONFIG_TEST_USERSPACE=y
 CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
+CONFIG_MINIMAL_LIBC=y
diff --git a/tests/kernel/sched/schedule_api/prj_multiq.conf b/tests/kernel/sched/schedule_api/prj_multiq.conf
index c8dd4bf786b..84c9d80ac61 100644
--- a/tests/kernel/sched/schedule_api/prj_multiq.conf
+++ b/tests/kernel/sched/schedule_api/prj_multiq.conf
@@ -7,3 +7,4 @@ CONFIG_MP_MAX_NUM_CPUS=1
 CONFIG_ZTEST_FATAL_HOOK=y
 CONFIG_NUM_COOP_PRIORITIES=30
 CONFIG_NUM_PREEMPT_PRIORITIES=40
+CONFIG_MINIMAL_LIBC=y
diff --git a/tests/lib/newlib/heap_listener/prj.conf b/tests/lib/newlib/heap_listener/prj.conf
index e5a5dc6df4c..7282777ff1c 100644
--- a/tests/lib/newlib/heap_listener/prj.conf
+++ b/tests/lib/newlib/heap_listener/prj.conf
@@ -1,3 +1,4 @@
 CONFIG_ZTEST=y
 CONFIG_NEWLIB_LIBC=y
+CONFIG_NEWLIB_LIBC_NANO=n
 CONFIG_NEWLIB_LIBC_HEAP_LISTENER=y
diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf
index 51cfa883727..c8dda772895 100644
--- a/tests/net/ipv6/prj.conf
+++ b/tests/net/ipv6/prj.conf
@@ -33,6 +33,7 @@ CONFIG_NET_IF_MAX_IPV6_COUNT=2
 CONFIG_NET_IPV6_PE=y
 CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT=2
 CONFIG_NET_IPV6_PE_PREFER_PUBLIC_ADDRESSES=n
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 
 # Increase the stack a bit for mps2/an385
 CONFIG_NET_RX_STACK_SIZE=1700
diff --git a/tests/net/lib/lwm2m/interop/prj.conf b/tests/net/lib/lwm2m/interop/prj.conf
index 2a8ad090074..443531c3e5c 100644
--- a/tests/net/lib/lwm2m/interop/prj.conf
+++ b/tests/net/lib/lwm2m/interop/prj.conf
@@ -82,7 +82,7 @@ CONFIG_MBEDTLS_HEAP_SIZE=7168
 CONFIG_MBEDTLS_CIPHER_AES_ENABLED=y
 CONFIG_MBEDTLS_CIPHER_CCM_ENABLED=y
 # Disable RSA, we don't parse certs: saves flash/memory
-CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED=n
+CONFIG_MBEDTLS_RSA_C=n
 # Enable PSK instead
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED=y
 CONFIG_LWM2M_SECURITY_DTLS_TLS_CIPHERSUITE_MAX=3
diff --git a/tests/net/socket/tls_configurations/overlay-rsa.conf b/tests/net/socket/tls_configurations/overlay-rsa.conf
index c8fc3e29b10..bd6d33cd678 100644
--- a/tests/net/socket/tls_configurations/overlay-rsa.conf
+++ b/tests/net/socket/tls_configurations/overlay-rsa.conf
@@ -1,3 +1,8 @@
+CONFIG_MBEDTLS_MD=y
+CONFIG_MBEDTLS_RSA_C=y
+CONFIG_MBEDTLS_PKCS1_V15=y
+CONFIG_MBEDTLS_PKCS1_V21=y
+
 CONFIG_PSA_WANT_ALG_RSA_OAEP=y
 CONFIG_PSA_WANT_ALG_RSA_PKCS1V15_CRYPT=y
 CONFIG_PSA_WANT_ALG_RSA_PKCS1V15_SIGN=y
diff --git a/tests/net/socket/tls_configurations/prj.conf b/tests/net/socket/tls_configurations/prj.conf
index 29c317ca3e7..78fdf8ddd8b 100644
--- a/tests/net/socket/tls_configurations/prj.conf
+++ b/tests/net/socket/tls_configurations/prj.conf
@@ -36,7 +36,8 @@ CONFIG_ENTROPY_GENERATOR=y
 # have a basic configuration in this "prj.conf" file and then add algorithm
 # support in overlay files.
 CONFIG_MBEDTLS_TLS_VERSION_1_2=n
-CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED=n
+CONFIG_MBEDTLS_MD=n
+CONFIG_MBEDTLS_RSA_C=n
 CONFIG_MBEDTLS_CIPHER_AES_ENABLED=n
 CONFIG_PSA_WANT_KEY_TYPE_AES=n
 CONFIG_PSA_WANT_ALG_CBC_NO_PADDING=n
diff --git a/tests/subsys/fs/fcb/sysbuild.conf b/tests/subsys/fs/fcb/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/subsys/fs/fcb/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/subsys/fs/littlefs/sysbuild.conf b/tests/subsys/fs/littlefs/sysbuild.conf
new file mode 100644
index 00000000000..6408669a847
--- /dev/null
+++ b/tests/subsys/fs/littlefs/sysbuild.conf
@@ -0,0 +1 @@
+SB_CONFIG_PARTITION_MANAGER=n
diff --git a/tests/subsys/secure_storage/psa/its/testcase.yaml b/tests/subsys/secure_storage/psa/its/testcase.yaml
index 05f1c1b9a6a..74bcec13586 100644
--- a/tests/subsys/secure_storage/psa/its/testcase.yaml
+++ b/tests/subsys/secure_storage/psa/its/testcase.yaml
@@ -28,6 +28,7 @@ tests:
     extra_args:
       - EXTRA_DTC_OVERLAY_FILE=zms.overlay
       - EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-store_zms.conf;overlay-transform_default.conf
+      - SB_CONFIG_PARTITION_MANAGER=n
 
   secure_storage.psa.its.secure_storage.store.settings:
     filter: CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
diff --git a/tests/subsys/settings/functional/src/settings_basic_test.c b/tests/subsys/settings/functional/src/settings_basic_test.c
index f77c87db71d..03ff3eba8a8 100644
--- a/tests/subsys/settings/functional/src/settings_basic_test.c
+++ b/tests/subsys/settings/functional/src/settings_basic_test.c
@@ -16,7 +16,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(settings_basic_test);
 
-#if defined(CONFIG_SETTINGS_FCB) || defined(CONFIG_SETTINGS_NVS)
+#if defined(CONFIG_SETTINGS_FCB) || defined(CONFIG_SETTINGS_NVS) || defined(CONFIG_SETTINGS_ZMS)
 #include <zephyr/storage/flash_map.h>
 #if DT_HAS_CHOSEN(zephyr_settings_partition)
 #define TEST_FLASH_AREA_ID DT_FIXED_PARTITION_ID(DT_CHOSEN(zephyr_settings_partition))
@@ -240,13 +240,22 @@ ZTEST(settings_functional, test_register_and_loading)
 {
 	int rc, err;
 	uint8_t val = 0;
+	ssize_t val_len = 0;
 
 	rc = settings_subsys_init();
 	zassert_true(rc == 0, "subsys init failed");
 
 
+	/* Check that key that corresponds to val2 do not exist in storage */
+	val_len = settings_get_val_len("ps/ss/ss/val2");
+	zassert_true((val_len == 0), "Failure: key should not exist");
+
 	settings_save_one("ps/ss/ss/val2", &val, sizeof(uint8_t));
 
+	/* Check that the key that corresponds to val2 exists in storage */
+	val_len = settings_get_val_len("ps/ss/ss/val2");
+	zassert_true((val_len == 1), "Failure: key should exist");
+
 	memset(&data, 0, sizeof(struct stored_data));
 
 	rc = settings_register(&val1_settings);
@@ -279,7 +288,16 @@ ZTEST(settings_functional, test_register_and_loading)
 	err = (data.en1) && (data.en2) && (!data.en3);
 	zassert_true(err, "wrong data enable found");
 
+	/* Check that key that corresponds to val3 do not exist in storage */
+	val_len = settings_get_val_len("ps/ss/val3");
+	zassert_true((val_len == 0), "Failure: key should not exist");
+
 	settings_save_one("ps/ss/val3", &val, sizeof(uint8_t));
+
+	/* Check that the key that corresponds to val3 exists in storage */
+	val_len = settings_get_val_len("ps/ss/val3");
+	zassert_true((val_len == 1), "Failure: key should exist");
+
 	memset(&data, 0, sizeof(struct stored_data));
 	/* when we load settings now data.val2 and data.val1 should receive a
 	 * value
@@ -310,7 +328,16 @@ ZTEST(settings_functional, test_register_and_loading)
 	err = (data.en1) && (data.en2) && (data.en3);
 	zassert_true(err, "wrong data enable found");
 
+	/* Check that key that corresponds to val1 do not exist in storage */
+	val_len = settings_get_val_len("ps/val1");
+	zassert_true((val_len == 0), "Failure: key should not exist");
+
 	settings_save_one("ps/val1", &val, sizeof(uint8_t));
+
+	/* Check that the key that corresponds to val1 exists in storage */
+	val_len = settings_get_val_len("ps/val1");
+	zassert_true((val_len == 1), "Failure: key should exist");
+
 	memset(&data, 0, sizeof(struct stored_data));
 	/* when we load settings all data should receive a value loaded */
 	rc = settings_load();
@@ -345,6 +372,17 @@ ZTEST(settings_functional, test_register_and_loading)
 	err = (!data.en1) && (data.en2) && (!data.en3);
 	zassert_true(err, "wrong data enable found");
 
+	memset(&data, 0, sizeof(struct stored_data));
+	/* test load_one: path "ps/ss/ss/val2". Only data.val2 should
+	 * receive a value
+	 */
+	val = 2;
+	settings_save_one("ps/ss/ss/val2", &val, sizeof(uint8_t));
+	rc = settings_load_one("ps/ss/ss/val2", &data.val2, sizeof(uint8_t));
+	zassert_true(rc >= 0, "settings_load_one failed");
+	err = (data.val1 == 0) && (data.val2 == 2) && (data.val3 == 0);
+	zassert_true(err, "wrong data value found %u != 2", data.val2);
+
 	/* clean up by deregistering settings_handler */
 	rc = settings_deregister(&val1_settings);
 	zassert_true(rc, "deregistering val1_settings failed");
diff --git a/tests/subsys/settings/functional/zms/CMakeLists.txt b/tests/subsys/settings/functional/zms/CMakeLists.txt
new file mode 100644
index 00000000000..e29cd6c417e
--- /dev/null
+++ b/tests/subsys/settings/functional/zms/CMakeLists.txt
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(functional_zms)
+
+# The code is in the library common to several tests.
+target_sources(app PRIVATE settings_test_zms.c)
+
+add_subdirectory(../src func_test_bindir)
diff --git a/tests/subsys/settings/functional/zms/prj.conf b/tests/subsys/settings/functional/zms/prj.conf
new file mode 100644
index 00000000000..3de961c7c72
--- /dev/null
+++ b/tests/subsys/settings/functional/zms/prj.conf
@@ -0,0 +1,8 @@
+CONFIG_ZTEST=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_ZMS=y
+
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_RUNTIME=y
+CONFIG_SETTINGS_ZMS=y
diff --git a/tests/subsys/settings/functional/zms/settings_test_zms.c b/tests/subsys/settings/functional/zms/settings_test_zms.c
new file mode 100644
index 00000000000..2a2ef9a5d59
--- /dev/null
+++ b/tests/subsys/settings/functional/zms/settings_test_zms.c
@@ -0,0 +1,25 @@
+/* Copyright (c) 2024 BayLibre SAS
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+#include <errno.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/fs/zms.h>
+
+ZTEST(settings_functional, test_setting_storage_get)
+{
+	int rc;
+	void *storage;
+	uint32_t data = 0xdeadbeef;
+
+	rc = settings_storage_get(&storage);
+	zassert_equal(0, rc, "Can't fetch storage reference (err=%d)", rc);
+	zassert_not_null(storage, "Null reference.");
+
+	rc = zms_write((struct zms_fs *)storage, 512, &data, sizeof(data));
+	zassert_true(rc >= 0, "Can't write ZMS entry (err=%d).", rc);
+}
+ZTEST_SUITE(settings_functional, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/subsys/settings/functional/zms/testcase.yaml b/tests/subsys/settings/functional/zms/testcase.yaml
new file mode 100644
index 00000000000..8b7fcdf576f
--- /dev/null
+++ b/tests/subsys/settings/functional/zms/testcase.yaml
@@ -0,0 +1,9 @@
+tests:
+  settings.functional.zms:
+    platform_allow:
+      - qemu_x86
+      - native_sim
+      - native_sim/native/64
+    tags:
+      - settings
+      - zms
diff --git a/tests/subsys/settings/performance/settings_test_perf.c b/tests/subsys/settings/performance/settings_test_perf.c
index a5de17e3475..3efe0fcaa52 100644
--- a/tests/subsys/settings/performance/settings_test_perf.c
+++ b/tests/subsys/settings/performance/settings_test_perf.c
@@ -19,20 +19,21 @@ static struct k_work_q settings_work_q;
 static K_THREAD_STACK_DEFINE(settings_work_stack, 2024);
 static struct k_work_delayable pending_store;
 
-#define TEST_SETTINGS_COUNT (128)
-#define TEST_STORE_ITR (5)
-#define TEST_TIMEOUT_SEC (60)
+#define TEST_SETTINGS_COUNT      (128)
+#define TEST_STORE_ITR           (5)
+#define TEST_TIMEOUT_SEC         (60)
 #define TEST_SETTINGS_WORKQ_PRIO (1)
 
-static void bt_scan_cb(const bt_addr_le_t *addr, int8_t rssi, uint8_t adv_type,
-		struct net_buf_simple *buf)
+static void bt_scan_cb([[maybe_unused]] const bt_addr_le_t *addr, [[maybe_unused]] int8_t rssi,
+		       [[maybe_unused]] uint8_t adv_type, struct net_buf_simple *buf)
 {
 	printk("len %u\n", buf->len);
 }
 
 struct test_setting {
 	uint32_t val;
-} test_settings[TEST_SETTINGS_COUNT];
+};
+struct test_setting test_settings[TEST_SETTINGS_COUNT];
 
 K_SEM_DEFINE(waitfor_work, 0, 1);
 
@@ -45,14 +46,15 @@ static void store_pending(struct k_work *work)
 		uint32_t total_measured;
 		uint32_t single_entry_max;
 		uint32_t single_entry_min;
-	} stats = {0, 0, 0, UINT32_MAX};
+	};
+	struct test_stats stats = {0, 0, 0, UINT32_MAX};
 
 	int64_t ts1 = k_uptime_get();
 
 	/* benchmark storage performance */
 	for (int j = 0; j < TEST_STORE_ITR; j++) {
 		for (int i = 0; i < TEST_SETTINGS_COUNT; i++) {
-			test_settings[i].val = TEST_SETTINGS_COUNT*j + i;
+			test_settings[i].val = TEST_SETTINGS_COUNT * j + i;
 
 			int64_t ts2 = k_uptime_get();
 
@@ -80,8 +82,7 @@ static void store_pending(struct k_work *work)
 	printk("*** storing of %u entries completed ***\n", ARRAY_SIZE(test_settings));
 	printk("total calculated: %u, total measured: %u\n", stats.total_calculated,
 	       stats.total_measured);
-	printk("entry max: %u, entry min: %u\n", stats.single_entry_max,
-	       stats.single_entry_min);
+	printk("entry max: %u, entry min: %u\n", stats.single_entry_max, stats.single_entry_min);
 
 	k_sem_give(&waitfor_work);
 }
@@ -99,8 +100,8 @@ ZTEST(settings_perf, test_performance)
 	}
 
 	k_work_queue_start(&settings_work_q, settings_work_stack,
-		K_THREAD_STACK_SIZEOF(settings_work_stack),
-		K_PRIO_COOP(TEST_SETTINGS_WORKQ_PRIO), NULL);
+			   K_THREAD_STACK_SIZEOF(settings_work_stack),
+			   K_PRIO_COOP(TEST_SETTINGS_WORKQ_PRIO), NULL);
 	k_thread_name_set(&settings_work_q.thread, "Settings workq");
 	k_work_init_delayable(&pending_store, store_pending);
 
diff --git a/west.yml b/west.yml
index 47512a0b5b8..1b3f7063b7a 100644
--- a/west.yml
+++ b/west.yml
@@ -198,7 +198,7 @@ manifest:
       groups:
         - hal
     - name: hal_nordic
-      revision: 119ff5b5ec7a413ca2f64ae1928c79eee1e7b7b2
+      revision: a5a2277d4399939e9aa67a71ca9eb411c85a1a7d
       path: modules/hal/nordic
       groups:
         - hal