diff --git a/components/security/mbedtls/integration/CMakeLists.txt b/components/security/mbedtls/integration/CMakeLists.txt
index 247939e6..69839134 100644
--- a/components/security/mbedtls/integration/CMakeLists.txt
+++ b/components/security/mbedtls/integration/CMakeLists.txt
@@ -76,17 +76,24 @@ target_compile_options(mbedcrypto
     PRIVATE
         -Wno-error=switch-default
         -Wno-error=null-dereference
+        -Wno-error=redundant-decls
 )
 target_compile_options(mbedtls
     PRIVATE
         -Wno-error=switch-default
         -Wno-error=null-dereference
+        -Wno-error=redundant-decls
 )
 target_compile_options(mbedx509
     PRIVATE
         -Wno-error=null-dereference
+        -Wno-error=redundant-decls
 )
 target_compile_options(everest
     PRIVATE
         -Wno-error=redundant-decls
 )
+target_compile_options(p256m
+    PRIVATE
+        -Wno-error=redundant-decls
+)
diff --git a/components/security/mbedtls/library b/components/security/mbedtls/library
index 22098d41..c765c831 160000
--- a/components/security/mbedtls/library
+++ b/components/security/mbedtls/library
@@ -1 +1 @@
-Subproject commit 22098d41c6620ce07cf8a0134d37302355e1e5ef
+Subproject commit c765c831e5c2a0971410692f92f7a81d6ec65ec2
diff --git a/manifest.yml b/manifest.yml
index 08aabf6c..fa1696b6 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -34,7 +34,7 @@ dependencies:
     license: "Apache-2.0"
     tpip-category: "category-2"
     security-risk: "high"
-    version: "v3.6.3"
+    version: "v3.6.4"
     repository:
       type: "git"
       url: "https://github.com/Mbed-TLS/mbedtls.git"
diff --git a/release_changes/202507081447.change.md b/release_changes/202507081447.change.md
new file mode 100644
index 00000000..4db465bc
--- /dev/null
+++ b/release_changes/202507081447.change.md
@@ -0,0 +1 @@
+components: Bump Mbed TLS version to v3.6.4