diff --git a/.gitmodules b/.gitmodules
index 3490a17b3..d25c9a6b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "crypto"]
 	path = crypto
 	url = git@github.com:ARMmbed/mbedtls-psa.git
-	branch = feature-psa-tls-integration-proposed
+	branch = feature-psa
diff --git a/crypto b/crypto
index 9edcc3e8f..0e9ff8546 160000
--- a/crypto
+++ b/crypto
@@ -1 +1 @@
-Subproject commit 9edcc3e8fba31bff4c31b685448f3b47edce6d92
+Subproject commit 0e9ff8546bb496ea971b780f4f3b45874373614b