diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 3df858b0d..52b881e6b 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -251,13 +251,15 @@
     "gcc": {
         "versions": [
             "g++-9",
-            "g++-10"
+            "g++-10",
+            "g++-11"
         ]
     },
     "gfortran": {
         "versions": [
             "gfortran-9",
-            "gfortran-10"
+            "gfortran-10",
+            "gfortran-11"
         ]
     },
     "php": {
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 790509405..92a1848a0 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -253,13 +253,15 @@
     "gcc": {
         "versions": [
             "g++-9",
-            "g++-10"
+            "g++-10",
+            "g++-11"
         ]
     },
     "gfortran": {
         "versions": [
             "gfortran-9",
-            "gfortran-10"
+            "gfortran-10",
+            "gfortran-11"
         ]
     },
     "php": {