diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
index ed914b98995a3..b54f599b2a5b7 100644
--- a/ports/espressif/esp-idf-config/sdkconfig.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -96,9 +96,7 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048
 #
 # Certificate Bundle
 #
-CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y
-CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
-CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="../../lib/certificates/data/roots.pem"
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
 # end of Certificate Bundle
 
 # CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER is not set
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 66c7befd11c5d..da44c7c1c2e2d 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -164,11 +164,6 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 CIRCUITPY_USB_DEVICE = 0
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1
 
-# Some C3 boards have only 2MB flash
-ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),2MB)
-CIRCUITPY_BLEIO_NATIVE = 0
-endif
-
 else ifeq ($(IDF_TARGET),esp32c6)
 # Modules
 CIRCUITPY_ESPCAMERA = 0
@@ -275,8 +270,10 @@ ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),2MB)
 CIRCUITPY__EVE = 0
 CIRCUITPY_AUDIOMP3 = 0
 CIRCUITPY_BITMAPFILTER ?= 0
-CIRCUITPY_BLEIO_NATIVE ?= 0
+CIRCUITPY_BLEIO_NATIVE = 0
 CIRCUITPY_DUALBANK = 0
+CIRCUITPY_MAX3421E = 0
+CIRCUITPY_RGBMATRIX = 0
 OPTIMIZATION_FLAGS ?= -Os
 endif