diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b0fca085..0b461d98d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,4 +37,6 @@ add_custom_target(mem-variant DEPENDS "mem_variant")
 ##################
 ### ESP Matter ###
 ##################
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-DCHIP_HAVE_CONFIG_H" APPEND)
+# JUST TESTING -Os related to bigged mbedTLS library...
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DCHIP_HAVE_CONFIG_H" APPEND)
+idf_build_set_property(C_COMPILE_OPTIONS "-Os" APPEND)
diff --git a/configs/defconfig.common b/configs/defconfig.common
index 47310528c..0d3566e87 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -75,13 +75,9 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
 CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT=y
 CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT=y
 CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y
-CONFIG_LWIP_MULTICAST_PING=y
-CONFIG_LWIP_BROADCAST_PING=y
-CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
-CONFIG_MBEDTLS_ECJPAKE_C=y
 CONFIG_MBEDTLS_HKDF_C=y
 CONFIG_MBEDTLS_CAMELLIA_C=y
 CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER=y
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
index 7770504fc..10c0dc80d 100644
--- a/configs/defconfig.esp32c6
+++ b/configs/defconfig.esp32c6
@@ -33,4 +33,9 @@ CONFIG_OPENTHREAD_NETWORK_PANID=0x1234
 CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe"
 CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
+# LwIP and mbedTLS necessary features
+CONFIG_LWIP_MULTICAST_PING=y
+CONFIG_LWIP_BROADCAST_PING=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
 # end of OpenThread
diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2
index dfd36395d..3e0eb5455 100644
--- a/configs/defconfig.esp32h2
+++ b/configs/defconfig.esp32h2
@@ -29,4 +29,9 @@ CONFIG_OPENTHREAD_NETWORK_PANID=0x1234
 CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe"
 CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
+# LwIP and mbedTLS necessary features
+CONFIG_LWIP_MULTICAST_PING=y
+CONFIG_LWIP_BROADCAST_PING=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
 # end of OpenThread