diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 936c49d42..d5f3f5e67 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -213,6 +213,7 @@
             "debian:9",
             "debian:10",
             "debian:11",
+            "moby/buildkit:latest",
             "node:10",
             "node:12",
             "node:14",
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index f12648040..85b8f272a 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -211,6 +211,7 @@
             "debian:9",
             "debian:10",
             "debian:11",
+            "moby/buildkit:latest",
             "node:10",
             "node:12",
             "node:14",