diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 0fdd8b28..629d766a 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -47,7 +47,8 @@
             "versions": [
                 "1.18.*",
                 "1.19.*",
-                "1.20.*"
+                "1.20.*",
+                "1.21.*"
             ],
             "default": "1.20.*"
         },
diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json
index 08fb0ca0..9dac6a78 100644
--- a/images/linux/toolsets/toolset-2204.json
+++ b/images/linux/toolsets/toolset-2204.json
@@ -44,7 +44,8 @@
             "versions": [
                 "1.18.*",
                 "1.19.*",
-                "1.20.*"
+                "1.20.*",
+                "1.21.*"
             ],
             "default": "1.20.*"
         },