diff --git a/modules/trusted-firmware-m/tfm_boards/external_core.cmake b/modules/trusted-firmware-m/tfm_boards/external_core.cmake
index c936e60e06a1..85abe57ef49e 100644
--- a/modules/trusted-firmware-m/tfm_boards/external_core.cmake
+++ b/modules/trusted-firmware-m/tfm_boards/external_core.cmake
@@ -136,7 +136,10 @@ if(TARGET platform_s)
             # Required for system_nrfxx_approtect.h.
             $<$<BOOL:${CONFIG_NRF_APPROTECT_LOCK}>:ENABLE_APPROTECT>
             $<$<BOOL:${CONFIG_NRF_APPROTECT_USER_HANDLING}>:ENABLE_APPROTECT_USER_HANDLING>
+            $<$<BOOL:${CONFIG_NRF_APPROTECT_USER_HANDLING}>:ENABLE_AUTHENTICATED_APPROTECT> # nRF54L15
             $<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_LOCK}>:ENABLE_SECURE_APPROTECT>
+            $<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_LOCK}>:ENABLE_SECUREAPPROTECT> # nRF54L15
             $<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING}>:ENABLE_SECURE_APPROTECT_USER_HANDLING>
+            $<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING}>:ENABLE_AUTHENTICATED_SECUREAPPROTECT> # nRF54L15
     )
 endif()
diff --git a/west.yml b/west.yml
index f83023efcb62..c9fc25392a69 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: bc59fe3cf65c054b13305aa977ecddddf7cf42e4
+      revision: 0f0e5ad7da0d1e423a1991485e9dfc6fef3757fe
       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: ac72485fdd643d636808484fcb34dab442dd584d
     - name: psa-arch-tests
       repo-path: sdk-psa-arch-tests
       path: modules/tee/tf-m/psa-arch-tests