diff --git a/port/esp32/template/sdkconfig b/port/esp32/template/sdkconfig
index 5d67361af..dcc135e6f 100644
--- a/port/esp32/template/sdkconfig
+++ b/port/esp32/template/sdkconfig
@@ -20,7 +20,10 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=
 CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG=
 CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE=
 CONFIG_LOG_BOOTLOADER_LEVEL=2
-CONFIG_BOOTLOADER_VDDSDIO_BOOST=y
+CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
+CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
+CONFIG_BOOTLOADER_FACTORY_RESET=
+CONFIG_BOOTLOADER_APP_TEST=
 
 #
 # Security features
@@ -83,6 +86,7 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
 CONFIG_APP_OFFSET=0x10000
+CONFIG_PARTITION_TABLE_MD5=y
 
 #
 # Compiler options
@@ -98,6 +102,7 @@ CONFIG_STACK_CHECK_NORM=
 CONFIG_STACK_CHECK_STRONG=
 CONFIG_STACK_CHECK_ALL=
 CONFIG_STACK_CHECK=
+CONFIG_WARN_WRITE_STRINGS=
 
 #
 # Component config
@@ -110,10 +115,6 @@ CONFIG_ESP32_APPTRACE_DEST_TRAX=
 CONFIG_ESP32_APPTRACE_DEST_NONE=y
 CONFIG_ESP32_APPTRACE_ENABLE=
 CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
-
-#
-# FreeRTOS SystemView Tracing
-#
 CONFIG_AWS_IOT_SDK=
 
 #
@@ -123,9 +124,20 @@ CONFIG_BT_ENABLED=y
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
 CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y
 CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4=
+
+#
+# MODEM SLEEP Options
+#
+CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=
 CONFIG_BLUEDROID_ENABLED=
 CONFIG_BT_RESERVE_DRAM=0x10000
 
+#
+# ADC configuration
+#
+CONFIG_ADC_FORCE_XPD_FSM=
+CONFIG_ADC2_DISABLE_DAC=y
+
 #
 # ESP32-specific
 #
@@ -133,7 +145,6 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
-CONFIG_MEMMAP_SMP=y
 CONFIG_SPIRAM_SUPPORT=
 CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
@@ -172,6 +183,7 @@ CONFIG_ESP32_PANIC_PRINT_REBOOT=
 CONFIG_ESP32_PANIC_SILENT_REBOOT=
 CONFIG_ESP32_PANIC_GDBSTUB=
 CONFIG_ESP32_DEBUG_OCDAWARE=y
+CONFIG_ESP32_DEBUG_STUBS_ENABLE=y
 CONFIG_INT_WDT=y
 CONFIG_INT_WDT_TIMEOUT_MS=300
 CONFIG_TASK_WDT=y
@@ -203,6 +215,7 @@ CONFIG_ESP32_XTAL_FREQ=0
 CONFIG_DISABLE_BASIC_ROM_CONSOLE=
 CONFIG_ESP_TIMER_PROFILING=
 CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
+CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 
 #
 # Wi-Fi
@@ -214,6 +227,7 @@ CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_CSI_ENABLED=
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP32_WIFI_TX_BA_WIN=6
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
@@ -233,6 +247,18 @@ CONFIG_ESP32_PHY_MAX_TX_POWER=20
 #
 CONFIG_PM_ENABLE=
 
+#
+# ADC-Calibration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+
+#
+# ESP HTTP client
+#
+CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
+
 #
 # Ethernet
 #
@@ -333,7 +359,9 @@ CONFIG_LOG_COLORS=y
 # LWIP
 #
 CONFIG_L2_TO_L3_COPY=
+CONFIG_LWIP_IRAM_OPTIMIZATION=
 CONFIG_LWIP_MAX_SOCKETS=4
+CONFIG_USE_ONLY_LWIP_SELECT=
 CONFIG_LWIP_SO_REUSE=
 CONFIG_LWIP_SO_RCVBUF=
 CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
@@ -366,6 +394,7 @@ CONFIG_TCP_SND_BUF_DEFAULT=5744
 CONFIG_TCP_WND_DEFAULT=5744
 CONFIG_TCP_RECVMBOX_SIZE=6
 CONFIG_TCP_QUEUE_OOSEQ=y
+CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES=
 CONFIG_TCP_OVERSIZE_MSS=y
 CONFIG_TCP_OVERSIZE_QUARTER_MSS=
 CONFIG_TCP_OVERSIZE_DISABLE=
@@ -504,6 +533,7 @@ CONFIG_SPIFFS_CACHE_STATS=
 CONFIG_SPIFFS_PAGE_CHECK=y
 CONFIG_SPIFFS_GC_MAX_RUNS=10
 CONFIG_SPIFFS_GC_STATS=
+CONFIG_SPIFFS_PAGE_SIZE=256
 CONFIG_SPIFFS_OBJ_NAME_LEN=32
 CONFIG_SPIFFS_USE_MAGIC=y
 CONFIG_SPIFFS_USE_MAGIC_LENGTH=y
@@ -525,6 +555,11 @@ CONFIG_SPIFFS_TEST_VISUALISATION=
 #
 CONFIG_IP_LOST_TIMER_INTERVAL=120
 
+#
+# Virtual file system
+#
+CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+
 #
 # Wear Levelling
 #