diff --git a/Makefile b/Makefile
index ed97340f6d..878ba58ab8 100644
--- a/Makefile
+++ b/Makefile
@@ -288,6 +288,7 @@ minikube-iso-arm64: minikube-iso-aarch64
 minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause # build minikube iso
 	echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/VERSION
 	echo $(shell git log --no-merges --pretty='format:%H %s' | head -1) >> deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/CHANGELOG
+	echo 'source "$$BR2_EXTERNAL_MINIKUBE_PATH/arch/$*/package/Config.in"' >> deploy/iso/minikube-iso/Config.in
 	if [ ! -d $(BUILD_DIR)/buildroot ]; then \
 		mkdir -p $(BUILD_DIR); \
 		git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \
diff --git a/deploy/iso/minikube-iso/Config.in b/deploy/iso/minikube-iso/Config.in
index 909008a785..0f5c2d952e 100644
--- a/deploy/iso/minikube-iso/Config.in
+++ b/deploy/iso/minikube-iso/Config.in
@@ -1,3 +1 @@
 source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"
-source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/Config.in"
-source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/Config.in"
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 78bd7bfbaf..68696dbb55 100644
--- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
@@ -10,4 +10,6 @@ menu "System tools"
     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"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/vbox-guest/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in"
 endmenu
diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_fcopy.rules b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/70-hv_fcopy.rules
similarity index 100%
rename from deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_fcopy.rules
rename to deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/70-hv_fcopy.rules
diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_kvp.rules b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/70-hv_kvp.rules
similarity index 100%
rename from deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_kvp.rules
rename to deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/70-hv_kvp.rules
diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_vss.rules b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/70-hv_vss.rules
similarity index 100%
rename from deploy/iso/minikube-iso/package/hyperv-daemons/70-hv_vss.rules
rename to deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/70-hv_vss.rules
diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/hyperv-daemons/Config.in
rename to deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/Config.in
diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/hv_fcopy_daemon.service b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hv_fcopy_daemon.service
similarity index 100%
rename from deploy/iso/minikube-iso/package/hyperv-daemons/hv_fcopy_daemon.service
rename to deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hv_fcopy_daemon.service
diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/hv_kvp_daemon.service b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hv_kvp_daemon.service
similarity index 100%
rename from deploy/iso/minikube-iso/package/hyperv-daemons/hv_kvp_daemon.service
rename to deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hv_kvp_daemon.service
diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/hv_vss_daemon.service b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hv_vss_daemon.service
similarity index 100%
rename from deploy/iso/minikube-iso/package/hyperv-daemons/hv_vss_daemon.service
rename to deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hv_vss_daemon.service
diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hyperv-daemons.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk
rename to deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hyperv-daemons.mk
diff --git a/deploy/iso/minikube-iso/package/vbox-guest/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/Config.in
similarity index 100%
rename from deploy/iso/minikube-iso/package/vbox-guest/Config.in
rename to deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/Config.in
diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash b/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.hash
similarity index 100%
rename from deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash
rename to deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.hash
diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk b/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.mk
similarity index 100%
rename from deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk
rename to deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.mk
diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service b/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vboxservice.service
similarity index 100%
rename from deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service
rename to deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vboxservice.service
diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in
index 088b1e86f2..3cb958fae6 100644
--- a/deploy/iso/minikube-iso/package/Config.in
+++ b/deploy/iso/minikube-iso/package/Config.in
@@ -1,9 +1,7 @@
 menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/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/falco-module/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/scheduled-stop/Config.in"
 endmenu
diff --git a/deploy/iso/minikube-iso/package/scheduled-stop/Config.in b/deploy/iso/minikube-iso/package/scheduled-stop/Config.in
index b63f0391d7..d4a68f99e8 100644
--- a/deploy/iso/minikube-iso/package/scheduled-stop/Config.in
+++ b/deploy/iso/minikube-iso/package/scheduled-stop/Config.in
@@ -1,4 +1,3 @@
 config BR2_PACKAGE_SCHEDULED_STOP
 	bool "scheduled-stop"
-	depends on BR2_x86_64
 	default y