diff --git a/Makefile b/Makefile
index ed97340f6d..9f62a0f662 100644
--- a/Makefile
+++ b/Makefile
@@ -293,9 +293,9 @@ minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/
 		git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \
 		cp deploy/iso/minikube-iso/go.hash $(BUILD_DIR)/buildroot/package/go/go.hash; \
 	fi;
-	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* minikube_$*_defconfig
-	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* host-python
-	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$*
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) GOARCH=$(subst x86_64,amd64,$(subst aarch64,arm64,$*)) O=$(BUILD_DIR)/buildroot/output-$* minikube_$*_defconfig
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) GOARCH=$(subst x86_64,amd64,$(subst aarch64,arm64,$*)) O=$(BUILD_DIR)/buildroot/output-$* host-python
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) GOARCH=$(subst x86_64,amd64,$(subst aarch64,arm64,$*)) O=$(BUILD_DIR)/buildroot/output-$*
 	mv $(BUILD_DIR)/buildroot/output-$*/images/boot.iso $(BUILD_DIR)/minikube-$(subst x86_64,amd64,$(subst aarch64,arm64,$*)).iso
 
 
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
index bf55da98b2..4520a34a45 100644
--- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
@@ -1,4 +1,5 @@
 menu "System tools"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/buildkit-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/runc-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crio-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in"
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/51-buildkit.preset b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/51-buildkit.preset
similarity index 100%
rename from deploy/iso/minikube-iso/package/buildkit-bin/51-buildkit.preset
rename to deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/51-buildkit.preset
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/Config.in
new file mode 100644
index 0000000000..b070228387
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_BUILDKIT_BIN
+	bool "buildkit-bin"
+	default y
+	depends on BR2_aarch64
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash
new file mode 100644
index 0000000000..0feae19c30
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash
@@ -0,0 +1 @@
+0a834a749e86525e0eb16e7e80ce726e7c6a8e8d26fc5cc36c712305024da4e7  buildkit-v0.9.0.linux-arm64.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk
new file mode 100644
index 0000000000..e181b0a834
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk
@@ -0,0 +1,52 @@
+################################################################################
+#
+# buildkit-bin
+#
+################################################################################
+
+BUILDKIT_BIN_VERSION = v0.9.0
+BUILDKIT_BIN_COMMIT = c8bb937807d405d92be91f06ce2629e6202ac7a9
+BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION)
+BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-arm64.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 \
+		$(TARGET_DIR)/usr/bin
+	$(INSTALL) -D -m 0755 \
+		$(@D)/buildkit-runc \
+		$(TARGET_DIR)/usr/sbin
+	$(INSTALL) -D -m 0755 \
+		$(@D)/buildkit-qemu-* \
+		$(TARGET_DIR)/usr/sbin
+	$(INSTALL) -D -m 0755 \
+		$(@D)/buildkitd \
+		$(TARGET_DIR)/usr/sbin
+	$(INSTALL) -D -m 644 \
+		$(BUILDKIT_BIN_PKGDIR)/buildkit.conf \
+		$(TARGET_DIR)/usr/lib/tmpfiles.d/buildkit.conf
+	$(INSTALL) -D -m 644 \
+		$(BUILDKIT_BIN_PKGDIR)/buildkitd.toml \
+		$(TARGET_DIR)/etc/buildkit/buildkitd.toml
+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)/51-buildkit.preset \
+		$(TARGET_DIR)/usr/lib/systemd/system-preset/51-buildkit.preset
+endef
+
+$(eval $(generic-package))
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit.conf b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.conf
similarity index 100%
rename from deploy/iso/minikube-iso/package/buildkit-bin/buildkit.conf
rename to deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.conf
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit.service b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.service
similarity index 100%
rename from deploy/iso/minikube-iso/package/buildkit-bin/buildkit.service
rename to deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.service
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit.socket b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.socket
similarity index 100%
rename from deploy/iso/minikube-iso/package/buildkit-bin/buildkit.socket
rename to deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.socket
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkitd.toml b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkitd.toml
similarity index 100%
rename from deploy/iso/minikube-iso/package/buildkit-bin/buildkitd.toml
rename to deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkitd.toml
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in
index 57d2e21825..5a4ecc3a14 100644
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_CRI_DOCKERD
 	bool "cri-dockerd"
 	default y
+	depends on BR2_aarch64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
index b403c7d01b..7edf1b540c 100644
--- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
@@ -1,4 +1,6 @@
 menu "System tools"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/conmon/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/runc-head/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crio-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in"
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/51-buildkit.preset b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/51-buildkit.preset
new file mode 100644
index 0000000000..37de892c71
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/51-buildkit.preset
@@ -0,0 +1 @@
+disable buildkit.service
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/buildkit-bin/Config.in
rename to deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/Config.in
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.hash
rename to deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/buildkit-bin/buildkit-bin.mk
rename to deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.conf b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.conf
new file mode 100644
index 0000000000..006273ce91
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.conf
@@ -0,0 +1 @@
+d /run/buildkit 0770 root buildkit
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.service b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.service
new file mode 100644
index 0000000000..c1dad527ec
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=BuildKit
+Requires=buildkit.socket
+After=buildkit.socket
+Documentation=https://github.com/moby/buildkit
+
+[Service]
+ExecStart=/usr/sbin/buildkitd --addr fd://
+
+[Install]
+WantedBy=multi-user.target
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.socket b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.socket
new file mode 100644
index 0000000000..776b237627
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.socket
@@ -0,0 +1,12 @@
+[Unit]
+Description=BuildKit
+Documentation=https://github.com/moby/buildkit
+
+[Socket]
+ListenStream=%t/buildkit/buildkitd.sock
+SocketMode=0660
+SocketUser=root
+SocketGroup=buildkit
+
+[Install]
+WantedBy=sockets.target
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkitd.toml b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkitd.toml
new file mode 100644
index 0000000000..62158d44d7
--- /dev/null
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkitd.toml
@@ -0,0 +1,5 @@
+[worker.oci]
+  enabled = false
+[worker.containerd]
+  enabled = true
+  namespace = "k8s.io"
diff --git a/deploy/iso/minikube-iso/package/conmon/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/conmon/Config.in
similarity index 91%
rename from deploy/iso/minikube-iso/package/conmon/Config.in
rename to deploy/iso/minikube-iso/arch/x86_64/package/conmon/Config.in
index 6d4df09cf9..0022e24900 100644
--- a/deploy/iso/minikube-iso/package/conmon/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/conmon/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CONMON
 	bool "conmon"
+	depends on BR2_x86_64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
diff --git a/deploy/iso/minikube-iso/package/conmon/conmon.hash b/deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/conmon/conmon.hash
rename to deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.hash
diff --git a/deploy/iso/minikube-iso/package/conmon/conmon.mk b/deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/conmon/conmon.mk
rename to deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.mk
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in
index 57d2e21825..460971d045 100644
--- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_CRI_DOCKERD
 	bool "cri-dockerd"
 	default y
+	depends on BR2_x86_64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in
index 44ef3b4d73..088b1e86f2 100644
--- a/deploy/iso/minikube-iso/package/Config.in
+++ b/deploy/iso/minikube-iso/package/Config.in
@@ -1,11 +1,9 @@
 menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hyperv-daemons/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/vbox-guest/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/buildkit-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/scheduled-stop/Config.in"
 endmenu
diff --git a/deploy/iso/minikube-iso/package/crun/Config.in b/deploy/iso/minikube-iso/package/crun/Config.in
index 63b6085da5..8f093390d7 100644
--- a/deploy/iso/minikube-iso/package/crun/Config.in
+++ b/deploy/iso/minikube-iso/package/crun/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CRUN
 	bool "crun"
+	depends on BR2_x86_64
 	select BR2_PACKAGE_YAJL
 	help
 	  A fast and low-memory footprint OCI Container Runtime
diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in b/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in
index 4a60df7850..fc31001b01 100644
--- a/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in
+++ b/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in
@@ -1,3 +1,4 @@
 config BR2_PACKAGE_HYPERV_DAEMONS
 	bool "hyperv-daemons"
+	depends on BR2_x86_64
 	default y
diff --git a/deploy/iso/minikube-iso/package/scheduled-stop/Config.in b/deploy/iso/minikube-iso/package/scheduled-stop/Config.in
index d4a68f99e8..b63f0391d7 100644
--- a/deploy/iso/minikube-iso/package/scheduled-stop/Config.in
+++ b/deploy/iso/minikube-iso/package/scheduled-stop/Config.in
@@ -1,3 +1,4 @@
 config BR2_PACKAGE_SCHEDULED_STOP
 	bool "scheduled-stop"
+	depends on BR2_x86_64
 	default y
diff --git a/deploy/iso/minikube-iso/package/vbox-guest/Config.in b/deploy/iso/minikube-iso/package/vbox-guest/Config.in
index 60e88e888e..2147deb04a 100644
--- a/deploy/iso/minikube-iso/package/vbox-guest/Config.in
+++ b/deploy/iso/minikube-iso/package/vbox-guest/Config.in
@@ -1,4 +1,5 @@
 config BR2_PACKAGE_VBOX_GUEST
 	bool "vbox-guest"
+	depends on BR2_x86_64
 	depends on BR2_LINUX_KERNEL