diff --git a/subsys/net/lib/hostap_crypto/Kconfig b/subsys/net/lib/hostap_crypto/Kconfig
index 0cb3eb5e55c2..26d84af96fdd 100644
--- a/subsys/net/lib/hostap_crypto/Kconfig
+++ b/subsys/net/lib/hostap_crypto/Kconfig
@@ -93,6 +93,10 @@ config HOSTAP_CRYPTO_ENTERPRISE
 	select MBEDTLS_RSA_C
 	select MBEDTLS_SSL_SERVER_NAME_INDICATION
 	select MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+	select MBEDTLS_ECP_DP_SECP384R1_ENABLED
+	select MBEDTLS_ECP_DP_SECP521R1_ENABLED
+	select MBEDTLS_ECP_DP_CURVE25519_ENABLED
+	select MBEDTLS_ECP_DP_CURVE448_ENABLED
 	default y
 
 endif
diff --git a/west.yml b/west.yml
index 46135f64af8f..a639de3191e5 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: 05b8b21aa9779fb1cb19ad59e7443ebec460aeee
+      revision: pull/3358/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above