diff --git a/configs/defconfig.common b/configs/defconfig.common
index 68ba0ddb0..b1c696511 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -6,6 +6,8 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 CONFIG_BT_ENABLED=y
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_BT_BTC_TASK_STACK_SIZE=8192
+CONFIG_BT_BTU_TASK_STACK_SIZE=8192
 CONFIG_BLE_MESH=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_CXX_EXCEPTIONS=y
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index 65bc3f0c3..08f787f8d 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -1,7 +1,5 @@
 CONFIG_BTDM_CTRL_MODE_BTDM=y
 CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=20
-CONFIG_BT_BTC_TASK_STACK_SIZE=8192
-CONFIG_BT_BTU_TASK_STACK_SIZE=8192
 CONFIG_BT_CLASSIC_ENABLED=y
 CONFIG_BT_A2DP_ENABLE=y
 CONFIG_BT_SPP_ENABLED=y