diff --git a/deploy/iso/minikube-iso/package/automount/minikube-automount b/deploy/iso/minikube-iso/package/automount/minikube-automount
index f1a8484bee54..478280ec15bd 100755
--- a/deploy/iso/minikube-iso/package/automount/minikube-automount
+++ b/deploy/iso/minikube-iso/package/automount/minikube-automount
@@ -105,6 +105,10 @@ if [ -n "$BOOT2DOCKER_DATA" ]; then
     mkdir -p /var/lib/containerd
     mount --bind /mnt/$PARTNAME/var/lib/containerd /var/lib/containerd
 
+    mkdir -p /mnt/$PARTNAME/var/lib/buildkit
+    mkdir -p /var/lib/buildkit
+    mount --bind /mnt/$PARTNAME/var/lib/buildkit /var/lib/buildkit
+
     mkdir -p /mnt/$PARTNAME/var/lib/containers
     mkdir -p /var/lib/containers
     mount --bind /mnt/$PARTNAME/var/lib/containers /var/lib/containers
diff --git a/site/content/en/docs/handbook/persistent_volumes.md b/site/content/en/docs/handbook/persistent_volumes.md
index bb05a7944b1e..8f4966b5c77d 100644
--- a/site/content/en/docs/handbook/persistent_volumes.md
+++ b/site/content/en/docs/handbook/persistent_volumes.md
@@ -18,6 +18,9 @@ minikube is configured to persist files stored under the following directories,
 * `/data`
 * `/var/lib/minikube`
 * `/var/lib/docker`
+* `/var/lib/containerd`
+* `/var/lib/buildkit`
+* `/var/lib/containers`
 * `/tmp/hostpath_pv`
 * `/tmp/hostpath-provisioner`