diff --git a/components/base.xml b/components/base.xml
index 4b11001..0d85c16 100644
--- a/components/base.xml
+++ b/components/base.xml
@@ -6,8 +6,6 @@
 		<namedCollection name="core"/>
 		<namedCollection name="standard"/>
 		<namedCollection name="hardware-support"/>
-		<namedCollection name="arm-tools" arch="aarch64"/>
-		<package name="bcm283x-firmware"/>
 		<package name="chrony"/>
 		<package name="dracut-config-generic"/>
 		<package name="initial-setup"/>
diff --git a/components/boot.xml b/components/boot.xml
index 0ee9311..30c13ee 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -12,6 +12,7 @@
 		<package name="shim-signed-aa64" arch="aarch64"/>
 		<package name="shim-signed-x64" arch="x86_64"/>
 		<package name="grub2-efi-aa64" arch="aarch64"/>
+		<package name="uboot-images-armv8" arch="aarch64"/>
 		<package name="kernel"/>
 		<package name="kernel-modules-extra"/>
 		<package name="systemd-oomd-defaults"/>