diff --git a/Makefile b/Makefile
index 3d887ae..2e44d4e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,16 +17,6 @@ $(O)/.prepared: \
 
 prepare: $(O)/.prepared
 
-$(O)/.host-tools: \
-		build-host-tools.sh \
-		host-tools.packages \
-		$(shell find $(CONFIGDIR)/portage/host -type f) \
-		$(O)/.prepared
-	./build-host-tools.sh
-	touch $(O)/.host-tools
-
-host-tools: $(O)/.host-tools
-
 $(O)/.built: \
 		build.sh \
 		build.packages \
@@ -34,7 +24,6 @@ $(O)/.built: \
 		$(CONFIGDIR)/build.packages \
 		$(CONFIGDIR)/install.packages \
 		$(shell find $(CONFIGDIR)/portage/target -type f) \
-		$(O)/.host-tools \
 		$(O)/.prepared
 	./build.sh
 	touch $(O)/.built
@@ -56,7 +45,6 @@ $(O)/.ready: \
 		$(O)/semanage.mods \
 		$(shell find overlay -type f) \
 		$(shell find $(CONFIGDIR)/overlay -type f 2>/dev/null) \
-		$(O)/.host-tools \
 		$(O)/.built
 	./build-rootfs.sh "$(O)"
 	touch $(O)/.ready
@@ -83,7 +71,6 @@ squashfs: $(IMAGESDIR)/rootfs.squashfs
 $(O)/linux/arch/arm64/boot/Image.gz: \
 		build-kernel.sh \
 		$(CONFIGDIR)/linux.config \
-		$(O)/.host-tools \
 		$(O)/.prepared
 	./build-kernel.sh "$(O)"
 
@@ -92,7 +79,6 @@ kernel: $(O)/linux/arch/arm64/boot/Image.gz
 $(O)/efi-part/EFI/BOOT/BOOTAA64.efi: \
 		build-grub.sh \
 		grub.cfg \
-		$(O)/.host-tools \
 		$(O)/.prepared
 	./build-grub.sh "$(O)"
 
@@ -115,18 +101,16 @@ $(IMAGESDIR)/update.tar.zstd: \
 		$(IMAGESDIR)/rootfs.squashfs \
 		$(IMAGESDIR)/firmware.img \
 		install-update.sh \
-		$(O)/.host-tools \
 		$(O)/.prepared
 	./build-update.sh "$(IMAGESDIR)"
 
 clean:
 	rm -rf $(O)/linux $(O)/output $(IMAGESDIR) $(O)/tmp
-	rm -f $(O)/.prepared $(O)/.host-tools
+	rm -f $(O)/.prepared
 
 .PHONY: \
 	build \
 	grub \
-	host-tools \
 	kernel \
 	prepare \
 	sdcard.img \
diff --git a/build-host-tools.sh b/build-host-tools.sh
deleted file mode 100755
index e8de078..0000000
--- a/build-host-tools.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# vim: set sw=4 ts=4 sts=4 et :
-
-PORTAGE_CONFIGROOT="${CONFIGDIR:=${PWD}}"/portage/host \
-< host-tools.packages xargs -ro \
-emerge -vnuUj --rebuilt-binaries=y
diff --git a/host-tools.packages b/host-tools.packages
deleted file mode 100644
index 4fa55fa..0000000
--- a/host-tools.packages
+++ /dev/null
@@ -1,9 +0,0 @@
-sec-policy/selinux-base
-sys-apps/policycoreutils
-sys-apps/systemd
-sys-boot/grub
-sys-fs/btrfs-progs
-sys-fs/dosfstools
-sys-fs/genimage
-sys-fs/mtools
-sys-fs/squashfs-tools
diff --git a/start-container.sh b/start-container.sh
index 0d016fc..b4e918a 100755
--- a/start-container.sh
+++ b/start-container.sh
@@ -17,5 +17,5 @@ podman run \
     -w /tmp/src \
     -d \
     -e FEATURES='-ipc-sandbox -network-sandbox -pid-sandbox' \
-    cross-${target} \
+    aimee-os.org/build/build-${target} \
     python -c 'from signal import *;signal(SIGTERM, lambda x, y: None);pause()'