diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 86ff1b091..65a5705a6 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -34,7 +34,8 @@
             "versions": [
                 "12.*",
                 "14.*",
-                "16.*"
+                "16.*",
+                "18.*"
             ]
         },
         {
@@ -243,9 +244,11 @@
             "node:12",
             "node:14",
             "node:16",
+            "node:18",
             "node:12-alpine",
             "node:14-alpine",
             "node:16-alpine",
+            "node:18-alpine",
             "ubuntu:16.04",
             "ubuntu:18.04",
             "ubuntu:20.04"
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 9e803ba4b..ccd56b4a4 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -36,7 +36,8 @@
             "versions": [
                 "12.*",
                 "14.*",
-                "16.*"
+                "16.*",
+                "18.*"
             ]
         },
         {
@@ -243,9 +244,11 @@
             "node:12",
             "node:14",
             "node:16",
+            "node:18",
             "node:12-alpine",
             "node:14-alpine",
             "node:16-alpine",
+            "node:18-alpine",
             "ubuntu:16.04",
             "ubuntu:18.04",
             "ubuntu:20.04"
diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json
index 725316807..58f21d58c 100644
--- a/images/linux/toolsets/toolset-2204.json
+++ b/images/linux/toolsets/toolset-2204.json
@@ -31,7 +31,8 @@
             "arch": "x64",
             "versions": [
                 "14.*",
-                "16.*"
+                "16.*",
+                "18.*"
             ]
         },
         {
@@ -220,8 +221,10 @@
             "moby/buildkit:latest",
             "node:14",
             "node:16",
+            "node:18",
             "node:14-alpine",
             "node:16-alpine",
+            "node:18-alpine",
             "ubuntu:18.04",
             "ubuntu:20.04",
             "ubuntu:22.04"