diff --git a/components/boot.xml b/components/boot.xml
index d801c01..4b7db8e 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -4,6 +4,7 @@
 		<profile name="BootCoreUKI" description="Boot core packages for UKI"/>
 		<profile name="BootDiskCore" description="Boot disk core configuration">
 			<requires profile="BaseCommon"/>
+			<requires profile="HardwareCommon"/>
 			<requires profile="BootCore"/>
 		</profile>
 	</profiles>
@@ -118,7 +119,6 @@
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="BootDiskCore">
 		<package name="arm-image-installer" arch="aarch64"/>
-		<package name="bcm283x-firmware" arch="aarch64"/>
 		<package name="glibc-all-langpacks"/>
 		<package name="kernel"/>
 		<package name="kernel-modules"/>
diff --git a/components/common.xml b/components/common.xml
index 64316fa..dc1f34c 100644
--- a/components/common.xml
+++ b/components/common.xml
@@ -1,9 +1,14 @@
 <image>
 	<profiles>
 		<profile name="BaseCommon" description="Base common packages"/>
+		<profile name="HardwareCommon" description="Base common packages for hardware support"/>
 	</profiles>
 	<packages type="image" patternType="plusRecommended" profiles="BaseCommon">
 		<namedCollection name="standard"/>
 		<ignore name="qemu-user-static"/> <!-- Saves ~100MB -->
 	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="HardwareCommon">
+		<namedCollection name="hardware-support"/>
+		<package name="bcm283x-firmware" arch="aarch64"/>
+	</packages>
 </image>
diff --git a/components/desktops/common.xml b/components/desktops/common.xml
index 4f31c0d..fed17c4 100644
--- a/components/desktops/common.xml
+++ b/components/desktops/common.xml
@@ -2,13 +2,13 @@
 	<profiles>
 		<profile name="DesktopCommon" description="Common desktop packages">
 			<requires profile="BaseCommon"/>
+			<requires profile="HardwareCommon"/>
 		</profile>
 	</profiles>
 	<packages type="image" patternType="plusRecommended" profiles="DesktopCommon">
 		<namedCollection name="fonts"/>
 		<namedCollection name="multimedia"/>
 		<namedCollection name="networkmanager-submodules"/>
-		<namedCollection name="hardware-support"/>
 		<namedCollection name="printing"/>
 		<namedCollection name="guest-desktop-agents"/>
 		<package name="mediawriter"/>
diff --git a/teams/server.xml b/teams/server.xml
index 955d781..78ce59a 100644
--- a/teams/server.xml
+++ b/teams/server.xml
@@ -8,6 +8,7 @@
 			<requires profile="ServerCore"/>
 		</profile>
 		<profile name="ServerDisk" description="Server Edition disk configuration">
+			<requires profile="HardwareCommon"/>
 			<requires profile="ServerCore"/>
 		</profile>
 		<profile name="Server-Guest-Generic" description="Generic Server Guest Image">
@@ -199,6 +200,7 @@
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="Server-Host-Generic">
 		<namedCollection name="container-management"/>
+		<namedCollection name="server-hardware-support"/>
 		<package name="dracut-config-rescue"/>
 		<package name="kernel"/>
 		<package name="linux-firmware"/>