diff --git a/crypto/mbedtls/Kconfig b/crypto/mbedtls/Kconfig
index c843bda7f..1bee06c89 100644
--- a/crypto/mbedtls/Kconfig
+++ b/crypto/mbedtls/Kconfig
@@ -399,7 +399,7 @@ config MBEDTLS_SSL_PROTO_TLS1_2
 	depends on (MBEDTLS_USE_PSA_CRYPTO ||\
 				(MBEDTLS_MD_C && (MBEDTLS_SHA256_C || MBEDTLS_SHA384_C)))
 	default y
-	help
+	---help---
 		If MBEDTLS_USE_PSA_CRYPTO is set, then PSA_WANT_ALG_SHA_256 or PSA_WANT_ALG_SHA_384
 		must be defined.
 
@@ -421,7 +421,7 @@ config MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
 	depends on MBEDTLS_X509_CRT_PARSE_C && \
 				(MBEDTLS_ECDSA_C || MBEDTLS_USE_PSA_CRYPTO || MBEDTLS_PKCS1_V21)
 	default y
-	help
+	---help---
 		Requires PSA_WANT_ALG_ECDH or PSA_WANT_ALG_FFDH to be defined. Also, if
 		MBEDTLS_USE_PSA_CRYPTO is used to satisfy its dependencies, then PSA_WANT_ALG_ECDSA
 		must also be defined.
@@ -429,7 +429,7 @@ config MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
 config MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED
 	bool "Enable TLS 1.3 PSK ephemeral key exchange mode."
 	default y
-	help
+	---help---
 		Requires PSA_WANT_ALG_ECDH or PSA_WANT_ALG_FFDH.
 
 config MBEDTLS_SSL_SESSION_TICKETS
diff --git a/examples/rmtchar/Kconfig b/examples/rmtchar/Kconfig
index 8831f56a2..e88da638a 100644
--- a/examples/rmtchar/Kconfig
+++ b/examples/rmtchar/Kconfig
@@ -44,11 +44,11 @@ config EXAMPLES_RMTCHAR_RX
 if EXAMPLES_RMTCHAR_RX
 
 config EXAMPLES_RMTCHAR_RX_DEVPATH
-		string "RMT receiver character device path"
-		default "/dev/rmt1"
-		---help---
-			The default path to the RMT receiver character device.
-			Default: /dev/rmt1
+	string "RMT receiver character device path"
+	default "/dev/rmt1"
+	---help---
+		The default path to the RMT receiver character device.
+		Default: /dev/rmt1
 
 config EXAMPLES_RMTCHAR_RXSTACKSIZE
 	int "Receiver thread stack size"
diff --git a/system/settings/Kconfig b/system/settings/Kconfig
index 351897ce9..f2ca841f2 100644
--- a/system/settings/Kconfig
+++ b/system/settings/Kconfig
@@ -5,7 +5,7 @@
 config SYSTEM_SETTINGS
 	bool "Settings Functions"
 	default n
-		---help---
+	---help---
 		The settings storage can be used to store and retrieve various
 		configurable parameters. This storage is a RAM-based map (for fast access)
 		but one or more files can be used too (so values can persist across system
diff --git a/system/zlib/Kconfig b/system/zlib/Kconfig
index 637fbff61..f5dec2bfb 100644
--- a/system/zlib/Kconfig
+++ b/system/zlib/Kconfig
@@ -91,17 +91,17 @@ config UTILS_UNZIP_STACKSIZE
 endif # UTILS_UNZIP
 
 config LIB_ZLIB_MAX_WBITS
-  int "Zlib max wbits"
-  default 15
-  range 8 15
-  ---help---
-    Default windowBits. memory usage (1 << (windowBits+2)) bytes.
+	int "Zlib max wbits"
+	default 15
+	range 8 15
+	---help---
+		Default windowBits. memory usage (1 << (windowBits+2)) bytes.
 
 config LIB_ZLIB_MAX_MEM_LEVEL
-  int "Zlib max mem level"
-  default 8
-  range 1 9
-  ---help---
-    Default memLevel. memory usage (1 << (memLevel+9)) bytes.
+	int "Zlib max mem level"
+	default 8
+	range 1 9
+	---help---
+		Default memLevel. memory usage (1 << (memLevel+9)) bytes.
 
 endif # LIB_ZLIB
diff --git a/testing/mm/stressapptest/Kconfig b/testing/mm/stressapptest/Kconfig
index c56aeeae5..91750dcd7 100644
--- a/testing/mm/stressapptest/Kconfig
+++ b/testing/mm/stressapptest/Kconfig
@@ -6,7 +6,7 @@
 config TESTING_STRESSAPPTEST
 	bool "stressapptest"
 	default n
-	help
+	---help---
 		stressapptest is a userspace memory and CPU stress test tool. It
 		exercises the memory and CPU subsystem stressing for cache misses,
 		TLB misses, memory allocation, memory freeing, etc. It has been
diff --git a/testing/sched/timerjitter/Kconfig b/testing/sched/timerjitter/Kconfig
index 38f1e2ed8..23bbc4fae 100644
--- a/testing/sched/timerjitter/Kconfig
+++ b/testing/sched/timerjitter/Kconfig
@@ -6,7 +6,7 @@
 config TESTING_TIMERJITTER
 	bool "timerjitter testing"
 	default n
-	help
+	---help---
 		timerjitter helps profiling timer accuracy and real-time performance.
 
 if TESTING_TIMERJITTER