diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
index d8efb042f0c2..1a0c30bfead1 100644
--- a/modules/hal_nordic/nrfx/CMakeLists.txt
+++ b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -4,14 +4,22 @@
 zephyr_library_amend(${ZEPHYR_NRF_MODULE_DIR})
 
 set(BSP_DIR ${NRFX_DIR}/bsp)
-set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME})
+
+if(CONFIG_SOC_NORDIC_BSP_NAME STREQUAL "stable")
+  set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME})
+else()
+  string(TOUPPER ${CONFIG_SOC_NORDIC_BSP_NAME} BSP_MODULE_NAME)
+  set(SOC_DIR "${ZEPHYR_${BSP_MODULE_NAME}_MODULE_DIR}")
+endif()
+
 set(MDK_DIR ${SOC_DIR}/mdk)
-set(mdk_dir ${NRFX_DIR}/mdk)
 
 # Add definitions for products which are yet to be upstreamed.
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_ENGA NRF54LM20A_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_ENGA_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_ENGA_CPUFLPR NRF_FLPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54LM20A NRF54LM20A_ENGA_XXAA)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54LM20A_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LS05B_ENGA NRF54LS05B_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LS05B_ENGA_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LV10A_ENGA NRF54LV10A_ENGA_XXAA)
diff --git a/west.yml b/west.yml
index bef1f072851c..6dbb58efef5e 100644
--- a/west.yml
+++ b/west.yml
@@ -66,7 +66,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: c475e9f2c9eedd5aef47e2e0a36eb02d05e87a7f
+      revision: pull/3336/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -281,6 +281,13 @@ manifest:
       groups:
         - nrfx
       revision: 98167a75a6ed8eb530c4e2977118619b51fd75b0
+    - name: bspexternal
+      repo-path: nrfx
+      remote: ncs
+      path: modules/hal/bspexternal
+      groups:
+        - nrfx
+      revision: nrfx-bsp-nrf54lm20
 
   # West-related configuration for the nrf repository.
   self: