diff --git a/Kconfig.nrf b/Kconfig.nrf
index 648943fa9e93..cfcbdc9ae5f8 100644
--- a/Kconfig.nrf
+++ b/Kconfig.nrf
@@ -124,7 +124,7 @@ config NRF_SECURITY_ENABLER
 	imply NRF_SECURITY if BT_CRYPTO || BT_HOST_CRYPTO || BT_MESH_USES_MBEDTLS_PSA || BT_FAST_PAIR_CRYPTO_PSA
 	imply ENTROPY_GENERATOR if BOARD_NATIVE_SIM || BT_HOST_CRYPTO_PRNG || BT_ECC || BT_GATT_CACHING
 	imply PSA_WANT_GENERATE_RANDOM if BT_HOST_CRYPTO_PRNG || BT_ECC || BT_GATT_CACHING
-	imply MBEDTLS_ENABLE_HEAP if BT_HOST_CRYPTO_PRNG || BT_ECC || BT_GATT_CACHING
+	imply MBEDTLS_ENABLE_HEAP if BT_HOST_CRYPTO_PRNG || BT_ECC || BT_GATT_CACHING || BT_CRYPTO
 	depends on !SOC_NRF5340_CPUNET
 
 if SOC_SERIES_BSIM_NRFXX && ENTROPY_GENERATOR
diff --git a/west.yml b/west.yml
index b26942818ac9..369e5fec5d45 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: 804a1d59154a63351e29d6cf294e3b462220d5cd
+      revision: 319b359ae7669cd64ba3adec65034a4a4e4a5535
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above