diff --git a/.gitmodules b/.gitmodules
index 7e34e9698..4612b3d0c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/Mbed-TLS/mbedtls-framework
 [submodule "tf-psa-crypto"]
 	path = tf-psa-crypto
-	url = git@github.com:bjwtaylor/TF-PSA-Crypto.git
+	url = https://github.com/Mbed-TLS/TF-PSA-Crypto.git
diff --git a/framework b/framework
index fdb0615d9..1a83e0c84 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit fdb0615d9a72c95cdf7f67e77bfcf0418dce756f
+Subproject commit 1a83e0c84d4b7aa11c7cfd3771322486fc87d281
diff --git a/tf-psa-crypto b/tf-psa-crypto
index 8706d77f9..35ae18cf8 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit 8706d77f9632eb2d3d0e58b713281f4232c1ee20
+Subproject commit 35ae18cf891d3675584da41f7e830f1de5f87f07