diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
index eba36817a893d..20eba6263c7e2 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
@@ -44,7 +44,6 @@ CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y
 # Wi-Fi
 #
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4
-CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=16
 CONFIG_ESP_WIFI_RX_BA_WIN=4
 # end of Wi-Fi
 
diff --git a/ports/espressif/esp-idf-config/sdkconfig-psram.defaults b/ports/espressif/esp-idf-config/sdkconfig-psram.defaults
index c3824cfec5c60..3d4dc69178edb 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-psram.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-psram.defaults
@@ -8,6 +8,12 @@
 # ESP PSRAM
 #
 CONFIG_SPIRAM=y
+#
+# SPI RAM config
+#
+CONFIG_SPIRAM_USE_CAPS_ALLOC=y
+# end of SPI RAM config
+
 # end of ESP PSRAM
 
 #
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
index caeef4d1e14d2..758d0efcc3148 100644
--- a/ports/espressif/esp-idf-config/sdkconfig.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -66,6 +66,7 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048
 #
 # mbedTLS v3.x related
 #
+CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y
 # CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE is not set
 # end of mbedTLS v3.x related