diff --git a/common.cmake b/common.cmake
index 5c7598782f..5b7b259f17 100644
--- a/common.cmake
+++ b/common.cmake
@@ -48,13 +48,12 @@ function(nrfxlib_calculate_lib_path lib_path)
       set(arch_soc_dir ${arch_soc_dir}_cpuapp)
     elseif(DEFINED CONFIG_SOC_NRF5340_CPUNET)
       set(arch_soc_dir ${arch_soc_dir}_cpunet)
-    elseif(DEFINED CONFIG_SOC_NRF54L15_CPUAPP OR DEFINED CONFIG_SOC_NRF54L15_ENGA_CPUAPP
-           OR DEFINED CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
+    elseif(DEFINED CONFIG_SOC_NRF54L15_CPUAPP OR DEFINED CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
       set(arch_soc_dir ${arch_soc_dir}_cpuapp)
       if(DEFINED CONFIG_TRUSTED_EXECUTION_NONSECURE AND ${CALC_LIB_PATH_NS_PROVIDED})
         set(arch_soc_dir ${arch_soc_dir}_ns)
       endif()
-    elseif(DEFINED CONFIG_SOC_NRF54H20_CPURAD OR DEFINED CONFIG_SOC_NRF54H20_ENGB_CPURAD)
+    elseif(DEFINED CONFIG_SOC_NRF54H20_CPURAD)
       set(arch_soc_dir ${arch_soc_dir}_cpurad)
     endif()
   elseif(CONFIG_SOC_SERIES_BSIM_NRF52X)
diff --git a/mpsl/Kconfig b/mpsl/Kconfig
index 62803b3e3c..ea4a5bdc8e 100644
--- a/mpsl/Kconfig
+++ b/mpsl/Kconfig
@@ -11,7 +11,7 @@ config MPSL
 	select NRF_802154_MULTIPROTOCOL_SUPPORT if NRF_802154_RADIO_DRIVER
 	select MULTITHREADING_LOCK
 	depends on (SOC_SERIES_BSIM_NRFXX || SOC_SERIES_NRF52X || SOC_NRF5340_CPUNET ||\
-			SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_SERIES_NRF54LX)
+			SOC_NRF54H20_CPURAD || SOC_SERIES_NRF54LX)
 	help
 	  Use Nordic Multi Protocol Service Layer (MPSL) implementation,
 	  providing services for single and multi-protocol implementations.
@@ -32,7 +32,7 @@ config MPSL_LIB_DIR
 	string
 	default "nrf52" if SOC_SERIES_NRF52X
 	default "nrf53" if SOC_NRF5340_CPUNET
-	default "nrf54h" if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD
+	default "nrf54h" if SOC_NRF54H20_CPURAD
 	default "nrf54l_ns" if SOC_SERIES_NRF54LX && TRUSTED_EXECUTION_NONSECURE
 	default "nrf54l" if SOC_SERIES_NRF54LX && !TRUSTED_EXECUTION_NONSECURE
 	default "bsim_nrf52" if SOC_SERIES_BSIM_NRF52X