diff --git a/samples/crypto/psa_tls/sample.yaml b/samples/crypto/psa_tls/sample.yaml
index d416851efa7b..748334ea49d6 100644
--- a/samples/crypto/psa_tls/sample.yaml
+++ b/samples/crypto/psa_tls/sample.yaml
@@ -654,11 +654,15 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf9151dk/nrf9151
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf9160dk/nrf9160
       - nrf9151dk/nrf9151
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
     tags:
       - ci_build
       - legacy
@@ -674,11 +678,15 @@ tests:
       - nrf9160dk/nrf9160
       - nrf5340dk/nrf5340/cpuapp
       - nrf9151dk/nrf9151
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
     integration_platforms:
       - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
       - nrf9160dk/nrf9160
       - nrf9151dk/nrf9151
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
     tags:
       - ci_build
       - legacy
diff --git a/subsys/nrf_security/src/core/Kconfig b/subsys/nrf_security/src/core/Kconfig
index 80629c1398d9..0391aa76ff2d 100644
--- a/subsys/nrf_security/src/core/Kconfig
+++ b/subsys/nrf_security/src/core/Kconfig
@@ -7,16 +7,23 @@
 choice PSA_CORE
 	prompt "PSA Core implementation"
 
+config PSA_CORE_DISABLED
+	bool
+	prompt "PSA core-less for SSF crypto client support"
+	depends on DT_HAS_NORDIC_IRONSIDE_CALL_ENABLED
+
 config PSA_CORE_OBERON
 	bool
 	prompt "PSA Core implementation - Oberon"
 	select PSA_WANT_AES_KEY_SIZE_128
 	select PSA_WANT_AES_KEY_SIZE_192
 	select PSA_WANT_AES_KEY_SIZE_256
+	depends on !DT_HAS_NORDIC_IRONSIDE_CALL_ENABLED
 
 config PSA_CORE_LITE
 	bool "PSA core created for tiny footprint"
 	depends on SOC_SERIES_NRF54LX
+	depends on !DT_HAS_NORDIC_IRONSIDE_CALL_ENABLED
 	help
 	  The PSA core with tiny footprint is created to be used e.g. for bootloader
 	  or similar use cases where there are severe size restrictions. This PSA core
diff --git a/west.yml b/west.yml
index b3693e2a604f..1ead21347917 100644
--- a/west.yml
+++ b/west.yml
@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 318b87179093864727c181d80c06565138a4d071
+      revision: pull/3346/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above