diff --git a/configs/baremetal.h b/configs/baremetal.h
index f82e5f2b9..175f48a63 100644
--- a/configs/baremetal.h
+++ b/configs/baremetal.h
@@ -85,6 +85,8 @@
 #define MBEDTLS_X509_CHECK_KEY_USAGE
 #define MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE
 #define MBEDTLS_X509_REMOVE_INFO
+#define MBEDTLS_X509_ON_DEMAND_PARSING
+#define MBEDTLS_X509_ALWAYS_FLUSH
 #define MBEDTLS_ASN1_PARSE_C
 
 /* X.509 CSR writing */