diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig
index eda27e30b3..472857caf1 100644
--- a/modules/hostap/Kconfig
+++ b/modules/hostap/Kconfig
@@ -95,47 +95,12 @@ config WIFI_NM_WPA_SUPPLICANT_WEP
 
 choice WIFI_NM_WPA_SUPPLICANT_CRYPTO_BACKEND
 	prompt "WPA supplicant crypto implementation"
-	default WIFI_NM_WPA_SUPPLICANT_CRYPTO_PSA if BUILD_WITH_TFM
-	default WIFI_NM_WPA_SUPPLICANT_CRYPTO_LEGACY_BUILTIN if !BUILD_WITH_TFM
+	default WIFI_NM_WPA_SUPPLICANT_CRYPTO
 	help
 	  Select the crypto implementation to use for WPA supplicant.
 
-# To easily manage the crypto dependencies we separate the crypto
-# implementations into two Kconfig options. One for the legacy crypto
-# and one for the PSA crypto.
-config WIFI_NM_WPA_SUPPLICANT_CRYPTO_PSA
-	bool "PSA Crypto support for WiFi"
-	select WIFI_NM_WPA_SUPPLICANT_WEP
-	select PSA_WANT_KEY_TYPE_AES
-	select PSA_WANT_ALG_CMAC
-	select PSA_WANT_ALG_CBC_PKCS7
-	select PSA_WANT_ALG_CTR
-	select PSA_WANT_ALG_ECDSA
-	select PSA_WANT_GENERATE_RANDOM
-	select PSA_WANT_ALG_RSA_PSS
-	select PSA_WANT_ALG_DETERMINISTIC_ECDSA
-	select PSA_WANT_ALG_SHA_512
-	select PSA_WANT_ALG_SHA_1
-	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR
-	select PSA_WANT_ECC_SECP_R1_256
-	# Legacy crypto, still needed
-	select MBEDTLS
-	select MBEDTLS_CMAC_C
-	select MBEDTLS_GCM_C
-	select MBEDTLS_TLS_LIBRARY
-	select MBEDTLS_PK_WRITE_C
-	select MBEDTLS_X509_LIBRARY
-	select MBEDTLS_X509_CRT_PARSE_C
-	select MBEDTLS_CIPHER_C
-	select MBEDTLS_CIPHER_MODE_CTR
-	select MBEDTLS_CIPHER_MODE_CBC
-	select MBEDTLS_SSL_TLS_C
-	select MBEDTLS_ECP_C
-	select MBEDTLS_CTR_DRBG_C
-	select MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
-
-config WIFI_NM_WPA_SUPPLICANT_CRYPTO_LEGACY_BUILTIN
-	bool "Legacy Crypto support for WiFi"
+config WIFI_NM_WPA_SUPPLICANT_CRYPTO
+	bool "Crypto support for WiFi"
 	select MBEDTLS
 	select MBEDTLS_CIPHER_MODE_CTR_ENABLED
 	select MBEDTLS_CIPHER_MODE_CBC_ENABLED