diff --git a/components/mbedtls/esp_tee/esp_tee_mbedtls_config.h b/components/mbedtls/esp_tee/esp_tee_mbedtls_config.h
index 6cd200dc59..2691d2cfd8 100644
--- a/components/mbedtls/esp_tee/esp_tee_mbedtls_config.h
+++ b/components/mbedtls/esp_tee/esp_tee_mbedtls_config.h
@@ -25,8 +25,7 @@
 #include "soc/soc_caps.h"
 #include "sdkconfig.h"
 
-#ifndef ESP_TEE_MBEDTLS_CONFIG_H
-#define ESP_TEE_MBEDTLS_CONFIG_H
+#pragma once
 
 #define MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS
 #ifndef CONFIG_IDF_TARGET_LINUX
@@ -93,19 +92,23 @@
 #undef PSA_WANT_ECC_BRAINPOOL_P_R1_256
 #undef PSA_WANT_ECC_BRAINPOOL_P_R1_384
 #undef PSA_WANT_ECC_BRAINPOOL_P_R1_512
+#undef PSA_WANT_ECC_MONTGOMERY_255
+#undef PSA_WANT_ECC_MONTGOMERY_448
 #undef MBEDTLS_ECP_DP_BP256R1_ENABLED
 #undef MBEDTLS_ECP_DP_BP384R1_ENABLED
 #undef MBEDTLS_ECP_DP_BP512R1_ENABLED
 #undef MBEDTLS_ECP_DP_SECP192K1_ENABLED
 #undef MBEDTLS_ECP_DP_SECP224K1_ENABLED
 #undef MBEDTLS_ECP_DP_SECP256K1_ENABLED
-
-
+#undef MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#undef MBEDTLS_ECP_DP_CURVE448_ENABLED
 
 #undef PSA_WANT_KEY_TYPE_HMAC
 #undef PSA_WANT_KEY_TYPE_ARIA
+#undef MBEDTLS_ARIA_C
 #undef PSA_WANT_KEY_TYPE_CAMELLIA
 #undef MBEDTLS_CAMELLIA_C
+#undef PSA_WANT_KEY_TYPE_DES
 #undef MBEDTLS_DES_C
 #undef PSA_WANT_ALG_RIPEMD160
 #undef MBEDTLS_RIPEMD160_C
@@ -126,16 +129,27 @@
 #undef PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT
 #undef PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT
 #undef PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
+#undef PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
+#undef PSA_WANT_ALG_RSA_PKCS1V15_CRYPT
+#undef PSA_WANT_ALG_RSA_PKCS1V15_SIGN
+#undef PSA_WANT_ALG_RSA_OAEP
+#undef PSA_WANT_ALG_RSA_PSS
 #undef MBEDTLS_RSA_C
 
+#undef PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC
+#undef PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT
+#undef PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT
+#undef PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE
+#undef PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY
 #undef PSA_WANT_ALG_FFDH
-#undef MBEDTLS_ARIA_C
+#undef MBEDTLS_ECDH_C
+
 #undef MBEDTLS_CCM_C
 #undef MBEDTLS_CHACHA20_C
 #undef MBEDTLS_CHACHAPOLY_C
 #undef MBEDTLS_DEBUG_C
 
-#define MBEDTLS_SSL_CLI_C
+#undef MBEDTLS_SSL_CLI_C
 #undef MBEDTLS_SSL_SRV_C
 
 #undef PSA_WANT_ALG_PBKDF2_HMAC
@@ -143,8 +157,9 @@
 #undef PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
 #undef PSA_WANT_ALG_CCM
 #undef PSA_WANT_ALG_CMAC
-#undef PSA_WANT_KEY_TYPE_DES
 
 #undef MBEDTLS_AES_C
 #define MBEDTLS_AES_ROM_TABLES
-#endif /* ESP_TEE_MBEDTLS_CONFIG_H */
+#if SOC_AES_SUPPORTED
+#define MBEDTLS_AES_FEWER_TABLES
+#endif