diff --git a/subsys/nrf_security/Kconfig b/subsys/nrf_security/Kconfig
index dd034e1d88aa..7a266a3b0658 100644
--- a/subsys/nrf_security/Kconfig
+++ b/subsys/nrf_security/Kconfig
@@ -35,7 +35,7 @@ config NRF_SECURITY
 	depends on SOC_FAMILY_NORDIC_NRF
 	default y if BUILD_WITH_TFM
 	# entropy is provided by PSA and NRF_SECURITY on NRF54LX
-	default y if ENTROPY_PSA_CRYPTO_RNG && SOC_SERIES_NRF54LX
+	default y if ENTROPY_PSA_CRYPTO_RNG && (SOC_SERIES_NRF54LX || SOC_SERIES_NRF92X)
 	select DISABLE_MBEDTLS_BUILTIN if MBEDTLS
 	# NCS does not use TF-M's BL2 bootloader, but uses it's own fork
 	# of MCUBoot instead (CONFIG_BOOTLOADER_MCUBOOT).
@@ -58,6 +58,7 @@ if NRF_SECURITY
 
 config MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS
 	bool
+	default y if SOC_SERIES_NRF92X && (SOC_NRF9280_CPUSEC || SOC_NRF9230_CPUSEC)
 	default y if SOC_SERIES_NRF54LX && PSA_CRYPTO_DRIVER_CRACEN
 	default y if PSA_WANT_PLATFORM_KEYS
 	help
diff --git a/subsys/sdfw_services/services/psa_crypto/Kconfig b/subsys/sdfw_services/services/psa_crypto/Kconfig
index a2ad068e85f5..37049081e28e 100644
--- a/subsys/sdfw_services/services/psa_crypto/Kconfig
+++ b/subsys/sdfw_services/services/psa_crypto/Kconfig
@@ -5,7 +5,7 @@
 #
 
 service_name = PSA_CRYPTO
-service_default_enabled = n
+service_default_enabled = y
 service_id = 0x71
 service_version = 2
 service_buffer_size = 128