diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 3c074c99b2f..af4d54c73e5 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,7 +2,7 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_USE_VERSION_11
+	default GCC_USE_VERSION_12
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 65f272746b0..6202ca732f1 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,8 +1,8 @@
-config GCC_VERSION_12
-	default y if GCC_USE_VERSION_12
+config GCC_VERSION_11
+	default y if GCC_USE_VERSION_11
 	bool
 
 config GCC_VERSION
 	string
-	default "12.2.0"	if GCC_VERSION_12
-	default "11.3.0"
+	default "12.2.0"
+	default "11.3.0"	if GCC_VERSION_11