diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 96d651abc5..3cc34740bd 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -13,6 +13,8 @@ submodules:
 # Set the version of Python and other tools you might need
 build:
   os: ubuntu-20.04
+  apt_packages:
+    - cmake
   tools:
     python: "3.9"
   jobs:
diff --git a/framework b/framework
index d0d817541a..820a16cca7 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit d0d817541ae3f449b8cd51afc165668179659699
+Subproject commit 820a16cca705c6842a5a79332c6d40644008c814
diff --git a/tf-psa-crypto b/tf-psa-crypto
index 06bae1e110..4cc5bb4295 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit 06bae1e110ce71b44c3f4d17974d24feea4d2a92
+Subproject commit 4cc5bb429554ba14e36163ff3a82bf53766f7e24