diff --git a/samples/net/wifi/shell/boards/frdm_rw612.conf b/samples/net/wifi/shell/boards/frdm_rw612.conf
index 8f40dd471fa..51009115645 100644
--- a/samples/net/wifi/shell/boards/frdm_rw612.conf
+++ b/samples/net/wifi/shell/boards/frdm_rw612.conf
@@ -78,35 +78,6 @@ CONFIG_NET_CONTEXT_PRIORITY=y
 CONFIG_NET_MGMT_THREAD_PRIO_CUSTOM=y
 CONFIG_NET_MGMT_THREAD_PRIORITY=3
 
-CONFIG_WIFI_NM_WPA_SUPPLICANT=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CLI=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_EAPOL=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_INF_MON=n
-CONFIG_WIFI_NM_MAX_MANAGED_INTERFACES=2
-CONFIG_SAE_PWE_EARLY_EXIT=y
-CONFIG_WIFI_NM_HOSTAPD_AP=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS=y
-CONFIG_WIFI_NM_HOSTAPD_WPS=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_ROAMING=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_SKIP_DHCP_ON_ROAMING=y
-CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE=y
-
-# Enable mbedtls
-CONFIG_MBEDTLS=y
-CONFIG_MBEDTLS_BUILTIN=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="wpa_supp_els_pkc_mbedtls_config.h"
-
-# Include els_pkc in build
-CONFIG_ENTROPY_GENERATOR=y
-CONFIG_MBEDTLS_PSA_CRYPTO_C=y
-CONFIG_MBEDTLS_ENTROPY_C=y
-CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
-
 # power management
 CONFIG_PM=y
 CONFIG_PM_DEVICE=y
@@ -121,8 +92,6 @@ CONFIG_NET_MGMT_EVENT_STACK_SIZE=4608
 CONFIG_NET_TCP_WORKQ_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=4096
 CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=4096
-CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=12288
-CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=12288
 
 # optimization level
 # refer to Kconfig.zephyr for Optimizations Level
@@ -150,14 +119,7 @@ CONFIG_NET_STATISTICS_USER_API=y
 #CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
 #CONFIG_ZPERF_WORK_Q_STACK_SIZE=4096
 #CONFIG_MAIN_STACK_SIZE=4096
-#CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=16384
-#CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=16384
 #CONFIG_IDLE_STACK_SIZE=2048
 
 # comment out for -O0
 CONFIG_CODE_DATA_RELOCATION_SRAM=y
-#CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=2
-CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=3
-CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO=3
-CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=80000
diff --git a/samples/net/wifi/shell/boards/overlay_hostap_rw612.conf b/samples/net/wifi/shell/boards/overlay_hostap_rw612.conf
new file mode 100644
index 00000000000..eb79c28e55d
--- /dev/null
+++ b/samples/net/wifi/shell/boards/overlay_hostap_rw612.conf
@@ -0,0 +1,44 @@
+# wpa_supplicant
+CONFIG_WIFI_NM_WPA_SUPPLICANT=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_CLI=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_EAPOL=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_INF_MON=n
+CONFIG_WIFI_NM_MAX_MANAGED_INTERFACES=2
+CONFIG_SAE_PWE_EARLY_EXIT=y
+CONFIG_WIFI_NM_HOSTAPD_AP=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS=y
+CONFIG_WIFI_NM_HOSTAPD_WPS=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_ROAMING=y
+CONFIG_WIFI_NM_WPA_SUPPLICANT_SKIP_DHCP_ON_ROAMING=y
+CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE=y
+
+# Enable mbedtls
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
+CONFIG_MBEDTLS_USER_CONFIG_FILE="wpa_supp_els_pkc_mbedtls_config.h"
+CONFIG_ENTROPY_GENERATOR=y
+CONFIG_MBEDTLS_PSA_CRYPTO_C=y
+CONFIG_MBEDTLS_ENTROPY_C=y
+CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=80000
+
+#priority
+CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=3
+CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO=3
+
+# stack size
+CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=12288
+CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=12288
+
+# stack size for -O0
+#CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=16384
+#CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=16384
+
+# debug level
+#CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=2
+CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
diff --git a/samples/net/wifi/shell/boards/rd_rw612_bga.conf b/samples/net/wifi/shell/boards/rd_rw612_bga.conf
index da51250fc0c..f963bd1969e 100644
--- a/samples/net/wifi/shell/boards/rd_rw612_bga.conf
+++ b/samples/net/wifi/shell/boards/rd_rw612_bga.conf
@@ -77,35 +77,6 @@ CONFIG_NET_CONTEXT_PRIORITY=y
 CONFIG_NET_MGMT_THREAD_PRIO_CUSTOM=y
 CONFIG_NET_MGMT_THREAD_PRIORITY=3
 
-CONFIG_WIFI_NM_WPA_SUPPLICANT=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CLI=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_EAPOL=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_INF_MON=n
-CONFIG_WIFI_NM_MAX_MANAGED_INTERFACES=2
-CONFIG_SAE_PWE_EARLY_EXIT=y
-CONFIG_WIFI_NM_HOSTAPD_AP=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS=y
-CONFIG_WIFI_NM_HOSTAPD_WPS=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_ROAMING=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_SKIP_DHCP_ON_ROAMING=y
-CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE=y
-
-# Enable mbedtls
-CONFIG_MBEDTLS=y
-CONFIG_MBEDTLS_BUILTIN=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="wpa_supp_els_pkc_mbedtls_config.h"
-
-# Include els_pkc in build
-CONFIG_ENTROPY_GENERATOR=y
-CONFIG_MBEDTLS_PSA_CRYPTO_C=y
-CONFIG_MBEDTLS_ENTROPY_C=y
-CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
-
 # power management
 CONFIG_PM=y
 CONFIG_PM_DEVICE=y
@@ -120,8 +91,6 @@ CONFIG_NET_MGMT_EVENT_STACK_SIZE=4608
 CONFIG_NET_TCP_WORKQ_STACK_SIZE=2048
 CONFIG_MAIN_STACK_SIZE=4096
 CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=4096
-CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=12288
-CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=12288
 
 # optimization level
 # refer to Kconfig.zephyr for Optimizations Level
@@ -149,14 +118,7 @@ CONFIG_NET_STATISTICS_USER_API=y
 #CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
 #CONFIG_ZPERF_WORK_Q_STACK_SIZE=4096
 #CONFIG_MAIN_STACK_SIZE=4096
-#CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=16384
-#CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=16384
 #CONFIG_IDLE_STACK_SIZE=2048
 
 # comment out for -O0
 CONFIG_CODE_DATA_RELOCATION_SRAM=y
-#CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=2
-CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=3
-CONFIG_WIFI_NM_WPA_SUPPLICANT_PRIO=3
-CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=80000