diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
index 3c1165eb42..4032822f5a 100644
--- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
@@ -3,7 +3,6 @@ menu "System tools aarch64"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/runc-master-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/podman-aarch64/Config.in"
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
deleted file mode 100644
index ee257ae4f7..0000000000
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_CRI_DOCKERD_AARCH64
-	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
-	select BR2_PACKAGE_DOCKER_BIN
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
deleted file mode 100644
index 0ab94ba0e8..0000000000
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-################################################################################
-#
-# cri-dockerd
-#
-################################################################################
-
-# As of 2022-02-03
-CRI_DOCKERD_AARCH64_VER = 0.2.0
-CRI_DOCKERD_AARCH64_REV = a4d1895
-CRI_DOCKERD_AARCH64_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181
-CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive
-CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz
-
-CRI_DOCKERD_AARCH64_DEPENDENCIES = host-go
-
-CRI_DOCKERD_AARCH64_GOPATH = $(@D)/_output
-CRI_DOCKERD_AARCH64_ENV = \
-	$(GO_TARGET_ENV) \
-	CGO_ENABLED=0 \
-	GO111MODULE=on \
-	GOPATH="$(CRI_DOCKERD_AARCH64_GOPATH)" \
-	PATH=$(CRI_DOCKERD_AARCH64_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=arm64
-
-CRI_DOCKERD_AARCH64_COMPILE_SRC = $(CRI_DOCKERD_AARCH64_GOPATH)/src/github.com/Mirantis/cri-dockerd
-CRI_DOCKERD_AARCH64_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_AARCH64_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_AARCH64_REV)'"
-
-# If https://github.com/Mirantis/cri-dockerd/blob/master/packaging/Makefile changes, then this will almost certainly need to change
-# This uses the static make target at the top level Makefile, since that builds everything, then picks out the arm64 binary
-define CRI_DOCKERD_AARCH64_BUILD_CMDS
-	$(CRI_DOCKERD_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_AARCH64_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_AARCH64_VER) REVISION=$(CRI_DOCKERD_AARCH64_REV) static
-endef
-
-define CRI_DOCKERD_AARCH64_INSTALL_TARGET_CMDS
-	$(INSTALL) -Dm755 \
-		$(@D)/packaging/static/build/arm/cri-dockerd/cri-dockerd \
-		$(TARGET_DIR)/usr/bin/cri-dockerd
-endef
-
-define CRI_DOCKERD_AARCH64_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -Dm644 \
-		$(@D)/packaging/systemd/cri-docker.service \
-		$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.service
-	$(INSTALL) -Dm644 \
-		$(@D)/packaging/systemd/cri-docker.socket \
-		$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.socket
-endef
-
-$(eval $(generic-package))
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 40f07e968d..346abe596b 100644
--- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
@@ -3,7 +3,6 @@ menu "System tools x86_64"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/runc-master/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/podman/Config.in"
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash
deleted file mode 100644
index 1693e1b9d4..0000000000
--- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz
-sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz
-sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz
diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in
index c2d0bb6746..663e4d1c95 100644
--- a/deploy/iso/minikube-iso/package/Config.in
+++ b/deploy/iso/minikube-iso/package/Config.in
@@ -3,6 +3,7 @@ menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cri-dockerd/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in"
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in b/deploy/iso/minikube-iso/package/cri-dockerd/Config.in
similarity index 91%
rename from deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in
rename to deploy/iso/minikube-iso/package/cri-dockerd/Config.in
index 460971d045..57d2e21825 100644
--- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in
+++ b/deploy/iso/minikube-iso/package/cri-dockerd/Config.in
@@ -1,7 +1,6 @@
 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/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.hash
similarity index 100%
rename from deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash
rename to deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.hash
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk
similarity index 100%
rename from deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk
rename to deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk