diff --git a/arch/xtensa/src/common/espressif/Kconfig b/arch/xtensa/src/common/espressif/Kconfig
index 958317f4936..d2f1a0c41bb 100644
--- a/arch/xtensa/src/common/espressif/Kconfig
+++ b/arch/xtensa/src/common/espressif/Kconfig
@@ -407,7 +407,7 @@ config ESPRESSIF_SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC
 	bool "Leave UART bootloader encryption enabled"
 	depends on ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
 	default n
-	help
+	---help---
 		If not set (default), the bootloader will permanently disable UART bootloader encryption access on
 		first boot. If set, the UART bootloader will still be able to access hardware encryption.
 
@@ -449,14 +449,14 @@ choice ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE
 		Refer to the Flash Encryption section of the ESP-IDF Programmer's Guide for details:
 		https://docs.espressif.com/projects/esp-idf/en/latest/esp32/security/flash-encryption.html#flash-encryption-configuration
 
-	config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
-		bool "Development (NOT SECURE)"
-		select ESPRESSIF_SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC
+config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
+	bool "Development (NOT SECURE)"
+	select ESPRESSIF_SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC
 
-	config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_RELEASE
-		bool "Release"
+config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_RELEASE
+	bool "Release"
 
-endchoice
+endchoice # ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE
 
 config ESPRESSIF_SECURE_FLASH_ENC_USE_HOST_KEY
 	bool "Require user provided encryption key for flash encryption"
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index ca8626ab5c2..477c83cf699 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -750,7 +750,7 @@ config ESP32_I2C1
 	default n
 	select ESP32_I2C
 
-	config ESP32_I2C_PERIPH_MASTER_MODE
+config ESP32_I2C_PERIPH_MASTER_MODE
 	bool
 	depends on (ESP32_I2C0_MASTER_MODE || ESP32_I2C1_MASTER_MODE)
 	default n
diff --git a/arch/xtensa/src/esp32s3/Kconfig b/arch/xtensa/src/esp32s3/Kconfig
index a3cb896c243..e70abbe56ff 100644
--- a/arch/xtensa/src/esp32s3/Kconfig
+++ b/arch/xtensa/src/esp32s3/Kconfig
@@ -1649,18 +1649,19 @@ choice ESP32S3_UNIVERSAL_MAC_ADDRESSES
 		a custom universal MAC address range, the correct setting will depend on the allocation of MAC
 		addresses in this range (either 2 or 4 per device.)
 
-	config ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO
-		bool "Two"
-		select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
-		select ESP_MAC_ADDR_UNIVERSE_BT
+config ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO
+	bool "Two"
+	select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
+	select ESP_MAC_ADDR_UNIVERSE_BT
 
-	config ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR
-		bool "Four"
-		select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
-		select ESP_MAC_ADDR_UNIVERSE_WIFI_AP
-		select ESP_MAC_ADDR_UNIVERSE_BT
-		select ESP_MAC_ADDR_UNIVERSE_ETH
-endchoice
+config ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR
+	bool "Four"
+	select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
+	select ESP_MAC_ADDR_UNIVERSE_WIFI_AP
+	select ESP_MAC_ADDR_UNIVERSE_BT
+	select ESP_MAC_ADDR_UNIVERSE_ETH
+
+endchoice # ESP32S3_UNIVERSAL_MAC_ADDRESSES
 
 config ESP32S3_UNIVERSAL_MAC_ADDRESSES
 	int
@@ -1916,22 +1917,23 @@ choice ESP32S3_FLASH_SIZE
 	depends on ARCH_CHIP_ESP32S3CUSTOM
 	default ESP32S3CUSTOM_FLASH_4M
 
-	config ESP32S3CUSTOM_FLASH_4M
-		bool "ESP32S3 Flash 4MB"
-		select ESP32S3_FLASH_4M
+config ESP32S3CUSTOM_FLASH_4M
+	bool "ESP32S3 Flash 4MB"
+	select ESP32S3_FLASH_4M
 
-	config ESP32S3CUSTOM_FLASH_8M
-		bool "ESP32S3 Flash 8MB"
-		select ESP32S3_FLASH_8M
+config ESP32S3CUSTOM_FLASH_8M
+	bool "ESP32S3 Flash 8MB"
+	select ESP32S3_FLASH_8M
 
-	config ESP32S3CUSTOM_FLASH_16M
-		bool "ESP32S3 Flash 16MB"
-		select ESP32S3_FLASH_16M
+config ESP32S3CUSTOM_FLASH_16M
+	bool "ESP32S3 Flash 16MB"
+	select ESP32S3_FLASH_16M
+
+config ESP32S3CUSTOM_FLASH_32M
+	bool "ESP32S3 Flash 32MB"
+	select ESP32S3_FLASH_32M
+	select ESP32S3_SPI_FLASH_USE_32BIT_ADDRESS
 
-	config ESP32S3CUSTOM_FLASH_32M
-		bool "ESP32S3 Flash 32MB"
-		select ESP32S3_FLASH_32M
-		select ESP32S3_SPI_FLASH_USE_32BIT_ADDRESS
 endchoice # ESP32S3_FLASH_SIZE
 
 config ESP32S3_HAVE_OTA_PARTITION