diff --git a/configs/defconfig.common b/configs/defconfig.common
index cbcfd8d2c..49bca7bcf 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -7,6 +7,7 @@ CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 CONFIG_BT_ENABLED=y
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
 CONFIG_BLE_MESH=y
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_CXX_EXCEPTIONS=y
 CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
@@ -32,12 +33,11 @@ CONFIG_ETH_SPI_ETHERNET_DM9051=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
 CONFIG_FATFS_CODEPAGE_850=y
 CONFIG_FATFS_LFN_STACK=y
-# CONFIG_FATFS_API_ENCODING_ANSI_OEM is not set
-CONFIG_FATFS_API_ENCODING_UTF_8=y
 # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FREERTOS_HZ=1000
 # CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
 CONFIG_HEAP_POISONING_LIGHT=y
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
@@ -73,22 +73,3 @@ CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
 CONFIG_LWIP_IPV6_AUTOCONFIG=y
 CONFIG_ESP_RMAKER_SKIP_VERSION_CHECK=y
-CONFIG_ESP_RMAKER_USER_ID_CHECK=y
-CONFIG_ESP_INSIGHTS_ENABLED=y
-CONFIG_ESP_INSIGHTS_COREDUMP_ENABLE=y
-CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS=y
-CONFIG_DIAG_LOG_DROP_WIFI_LOGS=y
-CONFIG_DIAG_ENABLE_METRICS=y
-CONFIG_DIAG_ENABLE_HEAP_METRICS=y
-CONFIG_DIAG_ENABLE_WIFI_METRICS=y
-CONFIG_DIAG_ENABLE_VARIABLES=y
-CONFIG_DIAG_ENABLE_NETWORK_VARIABLES=y
-CONFIG_ESP_COREDUMP_ENABLE=y
-CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
-CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
-CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y
-CONFIG_ESP_COREDUMP_MAX_TASKS_NUM=64
-CONFIG_ESP_COREDUMP_STACK_SIZE=1024
-CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
-CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
-CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index bd38b4829..f204c069c 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -20,4 +20,4 @@ CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y
 CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
 CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
 CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
-CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
\ No newline at end of file
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y