diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 246c1250..3430c305 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -1073,15 +1073,7 @@
       <packagereq>s390utils-base</packagereq>
       <packagereq>shim</packagereq>
       <packagereq>syslinux-extlinux</packagereq>
-      <packagereq>uboot-beagle</packagereq>
-      <packagereq>uboot-beaglebone</packagereq>
-      <packagereq>uboot-origen</packagereq>
-      <packagereq>uboot-panda</packagereq>
-      <packagereq>uboot-smdkv310</packagereq>
-      <packagereq>uboot-tools</packagereq>
-      <packagereq>uboot-wandboard_dl</packagereq>
-      <packagereq>uboot-wandboard_solo</packagereq>
-      <packagereq>uboot-wandboard_quad</packagereq>
+      <packagereq>uboot-images-armv7</packagereq>
       <packagereq>xfsprogs</packagereq>
       <packagereq>yaboot</packagereq>
     </packagelist>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 246c1250..3430c305 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -1073,15 +1073,7 @@
       <packagereq>s390utils-base</packagereq>
       <packagereq>shim</packagereq>
       <packagereq>syslinux-extlinux</packagereq>
-      <packagereq>uboot-beagle</packagereq>
-      <packagereq>uboot-beaglebone</packagereq>
-      <packagereq>uboot-origen</packagereq>
-      <packagereq>uboot-panda</packagereq>
-      <packagereq>uboot-smdkv310</packagereq>
-      <packagereq>uboot-tools</packagereq>
-      <packagereq>uboot-wandboard_dl</packagereq>
-      <packagereq>uboot-wandboard_solo</packagereq>
-      <packagereq>uboot-wandboard_quad</packagereq>
+      <packagereq>uboot-images-armv7</packagereq>
       <packagereq>xfsprogs</packagereq>
       <packagereq>yaboot</packagereq>
     </packagelist>