diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/users b/deploy/iso/minikube-iso/board/coreos/minikube/users
index cdff9ff1f997..e5ece397b952 100644
--- a/deploy/iso/minikube-iso/board/coreos/minikube/users
+++ b/deploy/iso/minikube-iso/board/coreos/minikube/users
@@ -1 +1 @@
-docker 1000 docker 1000 =tcuser /home/docker /bin/bash wheel,vboxsf,podman -
+docker 1000 docker 1000 =tcuser /home/docker /bin/bash wheel,vboxsf,podman,buildkit -
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk
index cc479a30fd1d..cc699c8a6cf0 100644
--- a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk
+++ b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk
@@ -12,6 +12,10 @@ BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz
 # https://github.com/opencontainers/runc.git
 BUILDKIT_RUNC_VERSION = 12644e614e25b05da6fd08a38ffa0cfe1903fdec
 
+define BUILDKIT_BIN_USERS
+	- -1 buildkit -1 - - - - -
+endef
+
 define BUILDKIT_BIN_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 \
 		$(@D)/buildctl \
@@ -27,4 +31,16 @@ define BUILDKIT_BIN_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/sbin
 endef
 
+define BUILDKIT_BIN_INSTALL_INIT_SYSTEMD
+        $(INSTALL) -D -m 644 \
+                        $(BUILDKIT_BIN_PKGDIR)/buildkit.service \
+                        $(TARGET_DIR)/usr/lib/systemd/system/buildkit.service
+        $(INSTALL) -D -m 644 \
+                        $(BUILDKIT_BIN_PKGDIR)/buildkit.socket \
+                        $(TARGET_DIR)/usr/lib/systemd/system/buildkit.socket
+        $(INSTALL) -D -m 644 \
+                        $(BUILDKIT_BIN_PKGDIR)/buildkit.conf \
+                        $(TARGET_DIR)/usr/lib/tmpfiles.d/buildkit.conf
+endef
+
 $(eval $(generic-package))
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit.conf b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit.conf
index 2d7f8e5b5142..006273ce91b5 100644
--- a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit.conf
+++ b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit.conf
@@ -1 +1 @@
-d /run/buildkit-bin 0770 root buildkit
+d /run/buildkit 0770 root buildkit
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
index 36451957fa5b..9db9e5e115c0 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
@@ -21,5 +21,5 @@ sha256 74a4e916acddc6cf47ab5752bdebb6732ce2c028505ef57b7edc21d2da9039b6 v1.18.4.
 sha256 fc8a8e61375e3ce30563eeb0fd6534c4f48fc20300a72e6ff51cc99cb2703516 v1.19.0.tar.gz
 sha256 6165c5b8212ea03be2a465403177318bfe25a54c3e8d66d720344643913a0223 v1.19.1.tar.gz
 sha256 76fd7543bc92d4364a11060f43a5131893a76c6e6e9d6de3a6bb6292c110b631 v1.20.0.tar.gz
-sha256 1c01d4a76cdcfe3ac24147eb1d5f6ebd782bd98fb0ac0c19b79bd5a6560b1481 v1.20.2.tar.gz
+sha256 36d9f4cf4966342e2d4099e44d8156c55c6a10745c67ce4f856aa9f6dcc2d9ba v1.20.2.tar.gz
 sha256 bc53ea8977e252bd9812974c33ff654ee22076598e901464468c5c105a5ef773 v1.22.0.tar.gz