diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index f4ea6ccbe809d1..7713871a1c0c79 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -1418,8 +1418,7 @@ config KERNEL_JFFS2_FS_SECURITY
 
 config KERNEL_WERROR
 	bool "Compile the kernel with warnings as errors"
-	default BUILDBOT
-	default y if GCC_USE_VERSION_12
+	default y
 	help
 	  A kernel build should not cause any compiler warnings, and this
 	  enables the '-Werror' (for C) and '-Dwarnings' (for Rust) flags