diff --git a/boards/ezurio/bl54l15_dvk/Kconfig.defconfig b/boards/ezurio/bl54l15_dvk/Kconfig.defconfig
index 61d46eebccfb6..78ec8fa7116ae 100644
--- a/boards/ezurio/bl54l15_dvk/Kconfig.defconfig
+++ b/boards/ezurio/bl54l15_dvk/Kconfig.defconfig
@@ -15,7 +15,7 @@ endif # BOARD_BL54L15_DVK_NRF54L10_CPUAPP || BOARD_BL54L15_DVK_NRF54L15_CPUAPP
 
 if BOARD_BL54L15_DVK_NRF54L10_CPUAPP_NS || BOARD_BL54L15_DVK_NRF54L15_CPUAPP_NS
 
-config BT_CTLR
+config HAS_BT_CTLR
 	default BT
 
 config FLASH_LOAD_OFFSET
diff --git a/boards/ezurio/bl54l15u_dvk/Kconfig.defconfig b/boards/ezurio/bl54l15u_dvk/Kconfig.defconfig
index 4ee4dc3e6d2d6..bb4934e7fd365 100644
--- a/boards/ezurio/bl54l15u_dvk/Kconfig.defconfig
+++ b/boards/ezurio/bl54l15u_dvk/Kconfig.defconfig
@@ -15,7 +15,7 @@ endif # BOARD_BL54L15U_DVK_NRF54L15_CPUAPP
 
 if BOARD_BL54L15U_DVK_NRF54L15_CPUAPP_NS
 
-config BT_CTLR
+config HAS_BT_CTLR
 	default BT
 
 config FLASH_LOAD_OFFSET
diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
index 0661366e911d3..49e38070a01a0 100644
--- a/boards/nordic/nrf54l15dk/Kconfig.defconfig
+++ b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -19,7 +19,7 @@ config BOARD_NRF54L15DK
 	select USE_DT_CODE_PARTITION if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || \
 		BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
 
-config BT_CTLR
+config HAS_BT_CTLR
 	default BT
 
 # By default, if we build for a Non-Secure version of the board,
diff --git a/boards/panasonic/panb511evb/Kconfig.defconfig b/boards/panasonic/panb511evb/Kconfig.defconfig
index 1c4e4be6637d4..595e01692ccf7 100644
--- a/boards/panasonic/panb511evb/Kconfig.defconfig
+++ b/boards/panasonic/panb511evb/Kconfig.defconfig
@@ -14,7 +14,7 @@ endif # BOARD_PANB511EVB_NRF54L15_CPUAPP
 
 if BOARD_PANB511EVB_NRF54L15_CPUAPP_NS
 
-config BT_CTLR
+config HAS_BT_CTLR
 	default BT
 
 config FLASH_LOAD_OFFSET
diff --git a/boards/raytac/an54l15q_db/Kconfig.defconfig b/boards/raytac/an54l15q_db/Kconfig.defconfig
index 82d59ecdbe3b7..72616407eb7b7 100644
--- a/boards/raytac/an54l15q_db/Kconfig.defconfig
+++ b/boards/raytac/an54l15q_db/Kconfig.defconfig
@@ -15,7 +15,7 @@ endif # BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP
 
 if BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP_NS
 
-config BT_CTLR
+config HAS_BT_CTLR
 	default BT
 
 config FLASH_LOAD_OFFSET
diff --git a/boards/seeed/xiao_nrf54l15/Kconfig.defconfig b/boards/seeed/xiao_nrf54l15/Kconfig.defconfig
index 9f38f0848c96d..dd9a6feb90e65 100644
--- a/boards/seeed/xiao_nrf54l15/Kconfig.defconfig
+++ b/boards/seeed/xiao_nrf54l15/Kconfig.defconfig
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 if BOARD_XIAO_NRF54L15_NRF54L15_CPUAPP
 
-config BT_CTLR
+config HAS_BT_CTLR
 	default BT
 
 config ROM_START_OFFSET
diff --git a/samples/bluetooth/bap_broadcast_sink/Kconfig b/samples/bluetooth/bap_broadcast_sink/Kconfig
index 2d483082fd474..bcfa998d0ac6a 100644
--- a/samples/bluetooth/bap_broadcast_sink/Kconfig
+++ b/samples/bluetooth/bap_broadcast_sink/Kconfig
@@ -7,7 +7,8 @@ config SCAN_OFFLOAD
 	bool "Whether to wait for a Broadcast Assistant"
 	default y
 	# enable PAST support if we can
-	select BT_PER_ADV_SYNC_TRANSFER_RECEIVER if !BT_CTLR || BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT
+	select BT_PER_ADV_SYNC_TRANSFER_RECEIVER if (!HAS_BT_CTLR || \
+						     BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT)
 	help
 	  If set to true, the sample will start advertising connectable for
 	  Broadcast Assistants.
diff --git a/samples/bluetooth/cap_acceptor/Kconfig b/samples/bluetooth/cap_acceptor/Kconfig
index 9ec0440cef27c..8bf991475740b 100644
--- a/samples/bluetooth/cap_acceptor/Kconfig
+++ b/samples/bluetooth/cap_acceptor/Kconfig
@@ -13,7 +13,7 @@ config SAMPLE_UNICAST
 	select BT_PAC_SNK_LOC
 	select BT_PAC_SRC
 	select BT_PAC_SRC_LOC
-	select BT_CTLR_PERIPHERAL_ISO if BT_CTLR
+	select BT_CTLR_PERIPHERAL_ISO if HAS_BT_CTLR
 	help
 	  If set to true, the sample will start advertising connectable for
 	  Broadcast Assistants.
@@ -27,8 +27,9 @@ config SAMPLE_BROADCAST
 	select BT_BAP_BROADCAST_SINK
 	select BT_PAC_SNK
 	select BT_PAC_SNK_LOC
-	select BT_PER_ADV_SYNC_TRANSFER_RECEIVER if !BT_CTLR || BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT
-	select BT_CTLR_SYNC_ISO if BT_CTLR
+	select BT_PER_ADV_SYNC_TRANSFER_RECEIVER if (!HAS_BT_CTLR || \
+						     BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT)
+	select BT_CTLR_SYNC_ISO if HAS_BT_CTLR
 	help
 	  If set to true, the sample will start advertising syncable audio streams
 
diff --git a/samples/bluetooth/cap_initiator/Kconfig b/samples/bluetooth/cap_initiator/Kconfig
index b9bffa08a2e4d..619a4092cc256 100644
--- a/samples/bluetooth/cap_initiator/Kconfig
+++ b/samples/bluetooth/cap_initiator/Kconfig
@@ -15,7 +15,7 @@ config SAMPLE_UNICAST
 	select BT_KEYS_OVERWRITE_OLDEST
 	select BT_CSIP_SET_COORDINATOR
 	select BT_BAP_UNICAST_CLIENT
-	select BT_CTLR_CENTRAL_ISO if BT_CTLR
+	select BT_CTLR_CENTRAL_ISO if HAS_BT_CTLR
 	help
 	  If set to true, the sample will start advertising connectable for
 	  Broadcast Assistants.
@@ -26,7 +26,7 @@ config SAMPLE_BROADCAST
 	select BT_BROADCASTER
 	select BT_ISO_BROADCASTER
 	select BT_BAP_BROADCAST_SOURCE
-	select BT_CTLR_ADV_ISO if BT_CTLR
+	select BT_CTLR_ADV_ISO if HAS_BT_CTLR
 	help
 	  If set to true, the sample will start advertising syncable audio streams
 
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index 298e78b6cfcfa..926fc060a89ca 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -137,16 +137,6 @@ config BT_CTLR_EXTENDED_FEAT_SET_SUPPORT
 config HAS_BT_CTLR
 	bool
 
-config BT_CTLR
-	bool "Bluetooth Controller [DEPRECATED]"
-	select HAS_BT_CTLR
-	select DEPRECATED
-	help
-	  Enables support for SoC native controller implementations. This option
-	  has been deprecated and should not be used anymore. Instead, the
-	  Kconfig options for specific Link Layer implementations should select
-	  the HAS_BT_CTLR option.
-
 config BT_LL_SW_SPLIT
 	bool "Software-based Bluetooth LE Link Layer"
 	default y
diff --git a/tests/bluetooth/buf/prj.conf b/tests/bluetooth/buf/prj.conf
index 697529ffb9d72..67839d1283d6a 100644
--- a/tests/bluetooth/buf/prj.conf
+++ b/tests/bluetooth/buf/prj.conf
@@ -2,7 +2,7 @@ CONFIG_TEST=y
 CONFIG_ZTEST=y
 
 CONFIG_BT=y
-CONFIG_BT_CTLR=n
+CONFIG_BT_LL_SW_SPLIT=n
 CONFIG_BT_H4=n
 
 # Needed to enable and test the iso rx pool
diff --git a/west.yml b/west.yml
index 2a7ae1a9b2fce..1d80efdf1a0bb 100644
--- a/west.yml
+++ b/west.yml
@@ -310,7 +310,7 @@ manifest:
       groups:
         - crypto
     - name: mcuboot
-      revision: 4e108f702b5322fb59344ae4976e3d73c973ef12
+      revision: bf5321bb6906e9e75b4c85b7c98b71c06ae52e90
       path: bootloader/mcuboot
       groups:
         - bootloader