diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt
index 5c750f545d2ed..f3233bb2cfbbc 100644
--- a/modules/hostap/CMakeLists.txt
+++ b/modules/hostap/CMakeLists.txt
@@ -572,6 +572,10 @@ zephyr_library_compile_definitions_ifdef(CONFIG_EAP_FAST
   EAP_FAST
 )
 
+zephyr_library_compile_definitions_ifdef(CONFIG_EAP_TLSV1_3
+  EAP_TLSV1_3
+)
+
 zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_EAPOL
   ${HOSTAP_SRC_BASE}/eapol_supp/eapol_supp_sm.c
   ${HOSTAP_SRC_BASE}/eap_peer/eap.c
diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index aa6d5d8689f68..facea9cc5a801 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -299,6 +299,10 @@ config EAP_ALL
 	select EAP_TTLS
 	select EAP_MSCHAPV2
 	default y
+
+config EAP_TLSV1_3
+	bool "EAP TLSv1.3 support"
+	select MBEDTLS_TLS_VERSION_1_3
 endif # WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 
 config WIFI_NM_WPA_SUPPLICANT_WPA3
diff --git a/samples/net/wifi/shell/nxp/overlay_hostap_hosted_mcu.conf b/samples/net/wifi/shell/nxp/overlay_hostap_hosted_mcu.conf
index 0c52d5fa805a5..895be3f395b64 100644
--- a/samples/net/wifi/shell/nxp/overlay_hostap_hosted_mcu.conf
+++ b/samples/net/wifi/shell/nxp/overlay_hostap_hosted_mcu.conf
@@ -24,6 +24,13 @@ CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_MBEDTLS_ENTROPY_C=y
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
 
+# TLSv1.3
+CONFIG_EAP_TLSV1_3=n
+CONFIG_MBEDTLS_TLS_SESSION_TICKETS=n
+CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED=n
+CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED=n
+CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED=n
+
 # mbedtls heap for enterprise case
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_HEAP_SIZE=80192
diff --git a/samples/net/wifi/shell/nxp/overlay_hostap_rw612.conf b/samples/net/wifi/shell/nxp/overlay_hostap_rw612.conf
index 28bb9eec041fc..86ce39f134377 100644
--- a/samples/net/wifi/shell/nxp/overlay_hostap_rw612.conf
+++ b/samples/net/wifi/shell/nxp/overlay_hostap_rw612.conf
@@ -36,5 +36,12 @@ CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO=3
 CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=12288
 CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=12288
 
+# TLSv1.3
+CONFIG_EAP_TLSV1_3=n
+CONFIG_MBEDTLS_TLS_SESSION_TICKETS=n
+CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED=n
+CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED=n
+CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED=n
+
 # debug level
 CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
diff --git a/west.yml b/west.yml
index 2a7ae1a9b2fce..ed89651971d73 100644
--- a/west.yml
+++ b/west.yml
@@ -210,7 +210,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: 2de68b601cc95417466707f1b99149820b0556ec
+      revision: pull/585/head
       path: modules/hal/nxp
       groups:
         - hal
@@ -281,7 +281,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: c55683ce514953277be5566fceb38c4c2485f1e1
+      revision: pull/98/head
     - name: liblc3
       revision: 48bbd3eacd36e99a57317a0a4867002e0b09e183
       path: modules/lib/liblc3