diff --git a/modules/trusted-firmware-m/Kconfig.tfm.pm b/modules/trusted-firmware-m/Kconfig.tfm.pm
index 58f4b3b115fd..fcb544499f23 100644
--- a/modules/trusted-firmware-m/Kconfig.tfm.pm
+++ b/modules/trusted-firmware-m/Kconfig.tfm.pm
@@ -49,6 +49,7 @@ config PM_PARTITION_SIZE_TFM
 
 config PM_PARTITION_SIZE_TFM_PROTECTED_STORAGE
 	hex "Memory reserved for TFM Protected Storage"
+	default 0x5000 if TFM_PARTITION_PROTECTED_STORAGE && WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	default 0x4000 if TFM_PARTITION_PROTECTED_STORAGE
 	default 0
 	help
diff --git a/samples/wifi/shell/Kconfig b/samples/wifi/shell/Kconfig
index 5b4ea8a6a4bc..f9cc3a8e3336 100644
--- a/samples/wifi/shell/Kconfig
+++ b/samples/wifi/shell/Kconfig
@@ -20,6 +20,7 @@ if NET_BUF_VARIABLE_DATA_SIZE
 # so smaller pool sizes are recommended for these targets.
 config NET_PKT_BUF_TX_DATA_POOL_SIZE
 	default 40000 if SOC_SERIES_NRF54HX
+	default 35000 if !SOC_SERIES_NRF52X && !SOC_SERIES_NRF54LX && BUILD_WITH_TFM
 	default 50000 if !SOC_SERIES_NRF52X && !SOC_SERIES_NRF54LX
 
 config NET_PKT_BUF_RX_DATA_POOL_SIZE
diff --git a/subsys/nrf_security/Kconfig.legacy b/subsys/nrf_security/Kconfig.legacy
index f1ffe4ec092f..c271c779321b 100644
--- a/subsys/nrf_security/Kconfig.legacy
+++ b/subsys/nrf_security/Kconfig.legacy
@@ -288,6 +288,7 @@ config MBEDTLS_MPI_MAX_SIZE
 	prompt "Maximum number of bytes for usable MPIs." if !(CC312_BACKEND || CC310_BACKEND)
 	default 256 if CC310_BACKEND
 	default 384 if CC312_BACKEND
+	default 384 # Needed to support RSA 3072
 	range 256 2048
 
 config MBEDTLS_LEGACY_CRYPTO_C_SILENCE_DEPRECATION
diff --git a/west.yml b/west.yml
index 1f4553317b74..d92b49784b22 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: 237ef2e9225a5130047a24f368650c279b676f0b
+      revision: pull/3045/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above