diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json
index 3b2247db..1bacd5e2 100644
--- a/images/linux/toolsets/toolset-1604.json
+++ b/images/linux/toolsets/toolset-1604.json
@@ -230,22 +230,17 @@
     },
     "clang": {
         "versions": [
-            "6.0",
-            "8",
             "9"
         ],
         "default_version": "9"
     },
     "gcc": {
         "versions": [
-            "g++-7",
-            "g++-8",
             "g++-9"
         ]
     },
     "gfortran": {
         "versions": [
-            "gfortran-8",
             "gfortran-9"
         ]
     },
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index cc65f1cf..cc96345b 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -237,23 +237,18 @@
     },
     "clang": {
         "versions": [
-            "6.0",
-            "8",
             "9"
         ],
         "default_version": "9"
     },
     "gcc": {
         "versions": [
-            "g++-7",
-            "g++-8",
             "g++-9",
             "g++-10"
         ]
     },
     "gfortran": {
         "versions": [
-            "gfortran-8",
             "gfortran-9",
             "gfortran-10"
         ]
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 125c00f1..e1499a2e 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -238,7 +238,6 @@
     },
     "clang": {
         "versions": [
-            "8",
             "9",
             "10",
             "11"
@@ -247,15 +246,12 @@
     },
     "gcc": {
         "versions": [
-            "g++-7",
-            "g++-8",
             "g++-9",
             "g++-10"
         ]
     },
     "gfortran": {
         "versions": [
-            "gfortran-8",
             "gfortran-9",
             "gfortran-10"
         ]