diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index d7ae72fe81b..9fe62031b15 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -107,7 +107,6 @@ config ESP32_RMT
 config ESP32_RNG
 	bool "Random Number Generator (RNG)"
 	default n
-	depends on EXPERIMENTAL
 	select ARCH_HAVE_RNG
 	---help---
 		ESP32 supports a RNG that passed on Dieharder test suite.
@@ -248,14 +247,13 @@ config ESP32_UART2
 config ESP32_WIRELESS
 	bool "Wireless"
 	default n
-	depends on EXPERIMENTAL
 	select NET
 	select ARCH_PHY_INTERRUPT
 	select ESP32_RNG
 	select ESP32_RT_TIMER
 	select ESP32_TIMER0
 	---help---
-		No yet implemented
+		Enable Wireless support
 
 config ESP32_I2C0
 	bool "I2C 0"
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
index 68e81e63700..fa5a84bf2f7 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
@@ -18,13 +18,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_XTENSA=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_BUILTIN=y
-CONFIG_DEBUG_ASSERTIONS=y
-CONFIG_DEBUG_ERROR=y
-CONFIG_DEBUG_FEATURES=y
-CONFIG_DEBUG_WARN=y
-CONFIG_DEBUG_WIRELESS=y
-CONFIG_DEBUG_WIRELESS_ERROR=y
-CONFIG_DEBUG_WIRELESS_WARN=y
 CONFIG_DRIVERS_IEEE80211=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_ESP32_MTD_SIZE=0x80000
@@ -32,7 +25,6 @@ CONFIG_ESP32_SPIFLASH=y
 CONFIG_ESP32_UART0=y
 CONFIG_ESP32_WIFI_SAVE_PARAM=y
 CONFIG_ESP32_WIRELESS=y
-CONFIG_EXPERIMENTAL=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_SPIFFS=y
 CONFIG_HAVE_CXX=y