diff --git a/comps-f34.xml.in b/comps-f34.xml.in
index 39a86933..d04c6b8a 100644
--- a/comps-f34.xml.in
+++ b/comps-f34.xml.in
@@ -284,7 +284,7 @@
       <packagereq>plymouth-system-theme</packagereq>
       <packagereq>xorg-x11-drv-amdgpu</packagereq>
       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>
-      <packagereq>xorg-x11-drv-armsoc</packagereq>
+      <packagereq arch="aarch64,armhfp">xorg-x11-drv-armsoc</packagereq>
       <packagereq>xorg-x11-drv-ati</packagereq>
       <packagereq>xorg-x11-drv-evdev</packagereq>
       <packagereq>xorg-x11-drv-fbdev</packagereq>
@@ -2815,7 +2815,7 @@
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
-      <packagereq type="optional">bcm283x-firmware</packagereq>
+      <packagereq arch="aarch64,armhfp" type="optional">bcm283x-firmware</packagereq>
       <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
diff --git a/comps-f35.xml.in b/comps-f35.xml.in
index b0aac0cd..1dfa4f3e 100644
--- a/comps-f35.xml.in
+++ b/comps-f35.xml.in
@@ -285,7 +285,7 @@
       <packagereq>plymouth-system-theme</packagereq>
       <packagereq>xorg-x11-drv-amdgpu</packagereq>
       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>
-      <packagereq>xorg-x11-drv-armsoc</packagereq>
+      <packagereq arch="aarch64,armhfp">xorg-x11-drv-armsoc</packagereq>
       <packagereq>xorg-x11-drv-ati</packagereq>
       <packagereq>xorg-x11-drv-evdev</packagereq>
       <packagereq>xorg-x11-drv-fbdev</packagereq>
@@ -2828,7 +2828,7 @@
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
-      <packagereq type="optional">bcm283x-firmware</packagereq>
+      <packagereq arch="aarch64,armhfp" type="optional">bcm283x-firmware</packagereq>
       <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
diff --git a/comps-f36.xml.in b/comps-f36.xml.in
index 829f3a73..50e7ac5b 100644
--- a/comps-f36.xml.in
+++ b/comps-f36.xml.in
@@ -285,7 +285,7 @@
       <packagereq>plymouth-system-theme</packagereq>
       <packagereq>xorg-x11-drv-amdgpu</packagereq>
       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>
-      <packagereq>xorg-x11-drv-armsoc</packagereq>
+      <packagereq arch="aarch64,armhfp">xorg-x11-drv-armsoc</packagereq>
       <packagereq>xorg-x11-drv-ati</packagereq>
       <packagereq>xorg-x11-drv-evdev</packagereq>
       <packagereq>xorg-x11-drv-fbdev</packagereq>
@@ -2912,7 +2912,7 @@
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
-      <packagereq type="optional">bcm283x-firmware</packagereq>
+      <packagereq arch="aarch64,armhfp" type="optional">bcm283x-firmware</packagereq>
       <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
diff --git a/comps-f37.xml.in b/comps-f37.xml.in
index 37a16bac..67988dbd 100644
--- a/comps-f37.xml.in
+++ b/comps-f37.xml.in
@@ -284,7 +284,7 @@
       <packagereq>plymouth-system-theme</packagereq>
       <packagereq>xorg-x11-drv-amdgpu</packagereq>
       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>
-      <packagereq>xorg-x11-drv-armsoc</packagereq>
+      <packagereq arch="aarch64">xorg-x11-drv-armsoc</packagereq>
       <packagereq>xorg-x11-drv-ati</packagereq>
       <packagereq>xorg-x11-drv-evdev</packagereq>
       <packagereq>xorg-x11-drv-fbdev</packagereq>
@@ -2910,7 +2910,7 @@
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
-      <packagereq type="optional">bcm283x-firmware</packagereq>
+      <packagereq arch="aarch64" type="optional">bcm283x-firmware</packagereq>
       <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>