diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index d9fa4278a5..357589e172 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_8
+	default GCC_USE_VERSION_11
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index f517ca12ae..61506b670b 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,13 +1,13 @@
+config GCC_VERSION_8
+	default y if GCC_USE_VERSION_8
+	bool
+
 config GCC_VERSION_10
 	default y if GCC_USE_VERSION_10
 	bool
 
-config GCC_VERSION_11
-	default y if GCC_USE_VERSION_11
-	bool
-
 config GCC_VERSION
 	string
+	default "8.4.0"		if GCC_VERSION_8
 	default "10.3.0"	if GCC_VERSION_10
-	default "11.2.0"	if GCC_VERSION_11
-	default "8.4.0"
+	default "11.2.0"