diff --git a/west.yml b/west.yml
index 7eeeb7696dc5..2f238a06d119 100644
--- a/west.yml
+++ b/west.yml
@@ -72,7 +72,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: a735c24d172361298102d4dc29fe22397f99f26a
+      revision: 015b317bc3242161f731a14a76333ad6c5d7f47d
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -153,7 +153,7 @@ manifest:
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m
-      revision: v2.1.1-ncs1-rc1
+      revision: 5ae4c7f39ca806d6ea9cc6eb395ea6b886e0d9fd
     - name: psa-arch-tests
       repo-path: sdk-psa-arch-tests
       path: modules/tee/tf-m/psa-arch-tests