diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 9c62b5f49..b78e3ce31 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -249,15 +249,13 @@
     "gcc": {
         "versions": [
             "g++-9",
-            "g++-10",
-            "g++-11"
+            "g++-10"
         ]
     },
     "gfortran": {
         "versions": [
             "gfortran-9",
-            "gfortran-10",
-            "gfortran-11"
+            "gfortran-10"
         ]
     },
     "php": {
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 323b2068e..6bd1616cc 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -251,15 +251,13 @@
     "gcc": {
         "versions": [
             "g++-9",
-            "g++-10",
-            "g++-11"
+            "g++-10"
         ]
     },
     "gfortran": {
         "versions": [
             "gfortran-9",
-            "gfortran-10",
-            "gfortran-11"
+            "gfortran-10"
         ]
     },
     "php": {