diff --git a/variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.conf b/variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.conf
index c6222f4c5..eaf599eaa 100644
--- a/variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.conf
+++ b/variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.conf
@@ -59,12 +59,8 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
 CONFIG_BT_MAX_CONN=4
-CONFIG_BT_CTLR_ADV_EXT=y
-CONFIG_BT_CTLR_ADV_PERIODIC=y
-CONFIG_BT_CTLR_DTM_HCI=y
 CONFIG_CYW4343W_MURATA_1DX=y
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_BT_RX_STACK_SIZE=4096
-CONFIG_BT_HCI_TX_STACK_SIZE=4096
 
 CONFIG_STM32H7_BOOT_M4_AT_INIT=n
diff --git a/variants/arduino_nano_33_ble_nrf52840_sense/arduino_nano_33_ble_nrf52840_sense.conf b/variants/arduino_nano_33_ble_nrf52840_sense/arduino_nano_33_ble_nrf52840_sense.conf
index 787e6dc9a..1b7191cad 100644
--- a/variants/arduino_nano_33_ble_nrf52840_sense/arduino_nano_33_ble_nrf52840_sense.conf
+++ b/variants/arduino_nano_33_ble_nrf52840_sense/arduino_nano_33_ble_nrf52840_sense.conf
@@ -1,5 +1,4 @@
 CONFIG_BT=y
-
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_H4=y
 CONFIG_BT_HCI_RAW_H4_ENABLE=y
@@ -9,14 +8,10 @@ CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
 CONFIG_BT_MAX_CONN=4
 CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_ADV_PERIODIC=y
+CONFIG_BT_RX_STACK_SIZE=4096
 
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
-# 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
-
-
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Arduino Nano 33 BLE"
 CONFIG_USB_DEVICE_MANUFACTURER="Arduino"
@@ -37,9 +32,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=16384
 CONFIG_LLEXT_HEAP_SIZE=128
 CONFIG_MAIN_STACK_SIZE=16384
 
-CONFIG_BT_RX_STACK_SIZE=4096
-CONFIG_BT_HCI_TX_STACK_SIZE=4096
-
 CONFIG_FPU=y
 
 CONFIG_STACK_USAGE=n
diff --git a/variants/arduino_opta_stm32h747xx_m7/arduino_opta_stm32h747xx_m7.conf b/variants/arduino_opta_stm32h747xx_m7/arduino_opta_stm32h747xx_m7.conf
index 51d5f4fc7..ec12c78dc 100644
--- a/variants/arduino_opta_stm32h747xx_m7/arduino_opta_stm32h747xx_m7.conf
+++ b/variants/arduino_opta_stm32h747xx_m7/arduino_opta_stm32h747xx_m7.conf
@@ -88,12 +88,8 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
 CONFIG_BT_MAX_CONN=4
-CONFIG_BT_CTLR_ADV_EXT=y
-CONFIG_BT_CTLR_ADV_PERIODIC=y
-CONFIG_BT_CTLR_DTM_HCI=y
 CONFIG_CYW4343W_MURATA_1DX=y
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_BT_RX_STACK_SIZE=4096
-CONFIG_BT_HCI_TX_STACK_SIZE=4096
 
 CONFIG_STM32H7_BOOT_M4_AT_INIT=n
diff --git a/variants/arduino_portenta_c33_r7fa6m5bh3cfc/arduino_portenta_c33_r7fa6m5bh3cfc.conf b/variants/arduino_portenta_c33_r7fa6m5bh3cfc/arduino_portenta_c33_r7fa6m5bh3cfc.conf
index b9f799e78..2a003fc84 100644
--- a/variants/arduino_portenta_c33_r7fa6m5bh3cfc/arduino_portenta_c33_r7fa6m5bh3cfc.conf
+++ b/variants/arduino_portenta_c33_r7fa6m5bh3cfc/arduino_portenta_c33_r7fa6m5bh3cfc.conf
@@ -99,5 +99,3 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
 CONFIG_BT_MAX_CONN=4
-CONFIG_BT_CTLR_ADV_EXT=y
-CONFIG_BT_CTLR_ADV_PERIODIC=y
\ No newline at end of file
diff --git a/variants/arduino_portenta_h7_stm32h747xx_m7/arduino_portenta_h7_stm32h747xx_m7.conf b/variants/arduino_portenta_h7_stm32h747xx_m7/arduino_portenta_h7_stm32h747xx_m7.conf
index 15ab891d8..6c0b575eb 100644
--- a/variants/arduino_portenta_h7_stm32h747xx_m7/arduino_portenta_h7_stm32h747xx_m7.conf
+++ b/variants/arduino_portenta_h7_stm32h747xx_m7/arduino_portenta_h7_stm32h747xx_m7.conf
@@ -87,7 +87,6 @@ CONFIG_VIDEO_BUFFER_USE_SHARED_MULTI_HEAP=y
 CONFIG_VIDEO_BUFFER_SMH_ATTRIBUTE=2
 CONFIG_FLASH=y
 
-
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_H4=y
@@ -96,12 +95,8 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255
 CONFIG_BT_MAX_CONN=4
-CONFIG_BT_CTLR_ADV_EXT=y
-CONFIG_BT_CTLR_ADV_PERIODIC=y
-CONFIG_BT_CTLR_DTM_HCI=y
 CONFIG_CYW4343W_MURATA_1DX=y
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_BT_RX_STACK_SIZE=4096
-CONFIG_BT_HCI_TX_STACK_SIZE=4096
 
 CONFIG_STM32H7_BOOT_M4_AT_INIT=n