diff --git a/_data/images.json b/_data/images.json
index c35a6bb2..3a4d5be6 100755
--- a/_data/images.json
+++ b/_data/images.json
@@ -108,7 +108,7 @@
             {
                 "comment": "env",
                 "op": {
-                    "File": "/data/env.sh",
+                    "File": "env.sh",
                     "Dest": "/etc/profile.d/path.sh"
                 },
                 "type": "upload"
@@ -116,7 +116,7 @@
             {
                 "comment": "copy-in bootstrap dir",
                 "op": {
-                    "LocalPath": "/data/bootstrap",
+                    "LocalPath": "bootstrap",
                     "RemoteDir": "/"
                 },
                 "type": "copy-in"
@@ -164,5 +164,61 @@
                 "type": "run-command"
             }
         ]
+    },
+    {
+        "name": "kind_4.19.qcow2",
+	"parent": "kind.qcow2",
+        "actions": [
+            {
+                "comment": "install 4.19",
+                "op": {
+                    "KernelInstallDir": "kernels/4.19/tar-install"
+                },
+                "type": "install-kernel"
+            },
+            { "op": { "Hostname": "kind-4.19"}, "type": "set-hostname" }
+        ]
+    },
+    {
+        "name": "kind_5.4.qcow2",
+	"parent": "kind.qcow2",
+        "actions": [
+            {
+                "comment": "install 5.4",
+                "op": {
+                    "KernelInstallDir": "kernels/5.4/tar-install"
+                },
+                "type": "install-kernel"
+            },
+            { "op": { "Hostname": "kind-5.4"}, "type": "set-hostname" }
+        ]
+    },
+    {
+        "name": "kind_5.10.qcow2",
+	"parent": "kind.qcow2",
+        "actions": [
+            {
+                "comment": "install 5.10",
+                "op": {
+                    "KernelInstallDir": "kernels/5.10/tar-install"
+                },
+                "type": "install-kernel"
+            },
+            { "op": { "Hostname": "kind-5.10"}, "type": "set-hostname" }
+        ]
+    },
+    {
+        "name": "kind_bpf-next.qcow2",
+	"parent": "kind.qcow2",
+        "actions": [
+            {
+                "comment": "install bpf-next",
+                "op": {
+                    "KernelInstallDir": "kernels/bpf-next/tar-install"
+                },
+                "type": "install-kernel"
+            },
+            { "op": { "Hostname": "kind-bpf-next"}, "type": "set-hostname" }
+        ]
     }
 ]
diff --git a/dockerfiles/root-images b/dockerfiles/root-images
index 340c5c9e..2b35a1eb 100644
--- a/dockerfiles/root-images
+++ b/dockerfiles/root-images
@@ -2,7 +2,10 @@
 FROM quay.io/lvh-images/root-builder AS builder
 COPY _data /data
 # mmdebstrap outputs messages in stderr, so we redirect stderr
-RUN lvh images build --dir /data 2>&1
+
+RUN lvh images build --image base --dir /data 2>&1
+RUN lvh images build --image kind --dir /data 2>&1
+
 RUN zstd --compress --rm --threads=0 /data/images/*.qcow2
 
 # Can't use scratch here because we use `docker create` elsewhere, and