diff --git a/comps-rocky-9.0.xml b/comps-rocky-9.0.xml
index ec7170f..34168a2 100644
--- a/comps-rocky-9.0.xml
+++ b/comps-rocky-9.0.xml
@@ -129,7 +129,7 @@
       <packagereq variant="AppStream">sane-backends-devel</packagereq>
       <packagereq variant="AppStream">scl-utils</packagereq>
       <packagereq variant="AppStream">scl-utils-build</packagereq>
-      <packagereq variant="AppStream">SDL-devel</packagereq>
+      <packagereq variant="AppStream">SDL2-devel</packagereq>
       <packagereq variant="AppStream">slang-devel</packagereq>
       <packagereq variant="AppStream">startup-notification-devel</packagereq>
       <packagereq variant="AppStream">tbb-devel</packagereq>
@@ -157,8 +157,6 @@
       <packagereq variant="BaseOS">glibc-all-langpacks</packagereq>
       <packagereq variant="BaseOS" arch="aarch64">grub2-efi-aa64</packagereq>
       <packagereq variant="BaseOS" arch="aarch64">grub2-efi-aa64-cdboot</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64">grub2-efi-ia32</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64">grub2-efi-ia32-cdboot</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">grub2-efi-x64</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">grub2-efi-x64-cdboot</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">grub2-pc</packagereq>
@@ -177,7 +175,6 @@
       <packagereq variant="AppStream" arch="s390x">s390utils</packagereq>
       <packagereq variant="AppStream" arch="s390x">s390utils-base</packagereq>
       <packagereq variant="BaseOS" arch="aarch64">shim-aa64</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64">shim-ia32</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">shim-x64</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">syslinux-extlinux</packagereq>
       <packagereq variant="BaseOS">teamd</packagereq>
@@ -324,7 +321,6 @@
       <packagereq variant="AppStream" type="default">crash-trace-command</packagereq>
       <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,s390x">valgrind</packagereq>
       <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64,s390x">valgrind-devel</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="x86_64">xdp-tools</packagereq>
       <packagereq variant="AppStream" type="optional">bpftrace</packagereq>
       <packagereq variant="AppStream" type="optional">gdb-gdbserver</packagereq>
       <packagereq variant="AppStream" type="optional">glibc-utils</packagereq>
@@ -388,6 +384,7 @@
       <packagereq variant="AppStream">at-spi2-atk</packagereq>
       <packagereq variant="BaseOS">avahi</packagereq>
       <packagereq variant="BaseOS">glib-networking</packagereq>
+      <packagereq variant="BaseOS">glibc-all-langpacks</packagereq>
       <packagereq variant="BaseOS">ModemManager</packagereq>
       <packagereq variant="BaseOS">NetworkManager-adsl</packagereq>
       <packagereq variant="BaseOS">polkit</packagereq>
@@ -733,6 +730,7 @@
       <packagereq variant="AppStream" type="optional">mrtg</packagereq>
       <packagereq variant="AppStream" type="optional">nmap</packagereq>
       <packagereq variant="AppStream" type="optional">nmstate</packagereq>
+      <packagereq variant="AppStream" type="optional">xdp-tools</packagereq>
       <packagereq variant="AppStream" type="optional">wireshark</packagereq>
     </packagelist>
   </group>
@@ -781,7 +779,7 @@
       <packagereq variant="AppStream" type="default">pcp-pmda-bcc</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-bind2</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-bonding</packagereq>
-      <packagereq variant="AppStream" type="default">pcp-pmda-bpf</packagereq>
+      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">pcp-pmda-bpf</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-bpftrace</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-cifs</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-cisco</packagereq>
@@ -1104,6 +1102,7 @@
       <packagereq variant="BaseOS" type="default">mlocate</packagereq>
       <packagereq variant="BaseOS" type="default">mtr</packagereq>
       <packagereq variant="BaseOS" type="default">nano</packagereq>
+      <packagereq variant="BaseOS" type="default">nvme-cli</packagereq>
       <packagereq variant="AppStream" type="default">pinfo</packagereq>
       <packagereq variant="AppStream" type="default" arch="ppc64le">ppc64-diag</packagereq>
       <packagereq variant="AppStream" type="default" arch="ppc64le">powerpc-utils</packagereq>
@@ -1209,6 +1208,7 @@
       <packagereq variant="BaseOS" type="default">mlocate</packagereq>
       <packagereq variant="BaseOS" type="default">mtr</packagereq>
       <packagereq variant="BaseOS" type="default">nano</packagereq>
+      <packagereq variant="BaseOS" type="default">nvme-cli</packagereq>
       <packagereq variant="AppStream" type="default">pinfo</packagereq>
       <packagereq variant="AppStream" type="default" arch="ppc64le">ppc64-diag</packagereq>
       <packagereq variant="AppStream" type="default" arch="ppc64le">powerpc-utils</packagereq>
@@ -1732,6 +1732,7 @@
       <packagereq variant="AppStream">setroubleshoot</packagereq>
       <packagereq variant="AppStream">telnet</packagereq>
       <packagereq variant="AppStream">xorg-x11-drv-libinput</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">alsa-sof-firmware</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -2867,6 +2868,7 @@
       <packagereq type="default">bcc-doc</packagereq>
       <packagereq type="default">bcel</packagereq>
       <packagereq type="default">beust-jcommander</packagereq>
+      <packagereq type="default">bind-devel</packagereq>
       <packagereq type="default">bison-devel</packagereq>
       <packagereq type="default">blas-devel</packagereq>
       <packagereq type="default">bluez-libs-devel</packagereq>
@@ -2900,6 +2902,7 @@
       <packagereq type="default">colord-devel-docs</packagereq>
       <packagereq type="default">colord-gtk-devel</packagereq>
       <packagereq type="default">corosync-vqsim</packagereq>
+      <packagereq type="default">cppunit-devel</packagereq>
       <packagereq type="default">cracklib-devel</packagereq>
       <packagereq type="default">crash-devel</packagereq>
       <packagereq type="default">createrepo_c-devel</packagereq>
@@ -2948,6 +2951,7 @@
       <packagereq type="default">flac-devel</packagereq>
       <packagereq type="default">flatpak-devel</packagereq>
       <packagereq type="default">flex-devel</packagereq>
+      <packagereq type="default">flexiblas-devel</packagereq>
       <packagereq type="default">flite</packagereq>
       <packagereq type="default">flite-devel</packagereq>
       <packagereq type="default">fltk-devel</packagereq>
@@ -2956,6 +2960,8 @@
       <packagereq type="default">fontpackages-devel</packagereq>
       <packagereq type="default">freeipmi-devel</packagereq>
       <packagereq type="default">freerdp-devel</packagereq>
+      <packagereq type="default">fstrm-devel</packagereq>
+      <packagereq type="default">fstrm-utils</packagereq>
       <packagereq type="default">fuse-devel</packagereq>
       <packagereq type="default">fwupd-devel</packagereq>
       <packagereq type="default">gcc-plugin-devel</packagereq>
@@ -2965,6 +2971,7 @@
       <packagereq type="default">gdk-pixbuf2-xlib-devel</packagereq>
       <packagereq type="default">gdm-devel</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">gegl04-devel</packagereq>
+      <packagereq type="default">geoclue2-demos</packagereq>
       <packagereq type="default">geoclue2-devel</packagereq>
       <packagereq type="default">ghostscript-doc</packagereq>
       <packagereq type="default">ghostscript-tools-dvipdf</packagereq>
@@ -2986,6 +2993,7 @@
       <packagereq type="default">glm-doc</packagereq>
       <packagereq type="default" arch="aarch64,x86_64,ppc64le">gnome-bluetooth-libs-devel</packagereq>
       <packagereq type="default">gnome-common</packagereq>
+      <packagereq type="default">gnome-menus-devel</packagereq>
       <packagereq type="default" arch="x86_64,aarch64">gnu-efi</packagereq>
       <packagereq type="default" arch="x86_64,aarch64">gnu-efi-devel</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
@@ -2999,6 +3007,7 @@
       <packagereq type="default">graphviz-gd</packagereq>
       <packagereq type="default">graphviz-python3</packagereq>
       <packagereq type="default">grilo-devel</packagereq>
+      <packagereq type="default">gsl-devel</packagereq>
       <packagereq type="default">gsm-devel</packagereq>
       <packagereq type="default">gspell-devel</packagereq>
       <packagereq type="default">gspell-doc</packagereq>
@@ -3050,8 +3059,10 @@
       <packagereq type="default">lasso-devel</packagereq>
       <packagereq type="default">latex2html</packagereq>
       <packagereq type="default">lcms2-devel</packagereq>
+      <packagereq type="default">ldns-devel</packagereq>
       <packagereq type="default">leptonica</packagereq>
       <packagereq type="default">leptonica-devel</packagereq>
+      <packagereq type="default">liba52-devel</packagereq>
       <packagereq type="default">libao-devel</packagereq>
       <packagereq type="default">libappstream-glib-devel</packagereq>
       <packagereq type="default">libarchive-devel</packagereq>
@@ -3078,6 +3089,7 @@
       <packagereq type="default">libdb-devel-doc</packagereq>
       <packagereq type="default">libdb-sql</packagereq>
       <packagereq type="default">libdb-sql-devel</packagereq>
+      <packagereq type="default">libdecor-devel</packagereq>
       <packagereq type="default">libdnf-devel</packagereq>
       <packagereq type="default">libdvdread-devel</packagereq>
       <packagereq type="default">libecpg-devel</packagereq>
@@ -3091,6 +3103,7 @@
       <packagereq type="default">libfabric-devel</packagereq>
       <packagereq type="default">libfdisk-devel</packagereq>
       <packagereq type="default">libfdt-devel</packagereq>
+      <packagereq type="default">libfido2-devel</packagereq>
       <packagereq type="default">libfontenc-devel</packagereq>
       <packagereq type="default">libgee-devel</packagereq>
       <packagereq type="default">libgexiv2-devel</packagereq>
@@ -3126,13 +3139,15 @@
       <packagereq type="default">libmad-devel</packagereq>
       <packagereq type="default">libmaxminddb-devel</packagereq>
       <packagereq type="default">libmemcached-awesome-devel</packagereq>
+      <packagereq type="default">libmemcached-awesome-tools</packagereq>
       <packagereq type="default">libmicrohttpd-devel</packagereq>
       <packagereq type="default">libmicrohttpd-doc</packagereq>
+      <packagereq type="default">libmng-devel</packagereq>
       <packagereq type="default">libmnl-devel</packagereq>
       <packagereq type="default">libmodulemd-devel</packagereq>
       <packagereq type="default">libmount-devel</packagereq>
-      <packagereq type="default">libmpc-devel</packagereq>
       <packagereq type="default">libmspack-devel</packagereq>
+      <packagereq type="default">libmtp-devel</packagereq>
       <packagereq type="default">libnbd-devel</packagereq>
       <packagereq type="default">libnet-devel</packagereq>
       <packagereq type="default">libnetfilter_conntrack-devel</packagereq>
@@ -3150,6 +3165,7 @@
       <packagereq type="default">libopenraw-devel</packagereq>
       <packagereq type="default">libopenraw-gnome</packagereq>
       <packagereq type="default">libopenraw-gnome-devel</packagereq>
+      <packagereq type="default">libotr-devel</packagereq>
       <packagereq type="default">libpaper-devel</packagereq>
       <packagereq type="default">libpath_utils-devel</packagereq>
       <packagereq type="default">libpcap-devel</packagereq>
@@ -3178,11 +3194,15 @@
       <packagereq type="default">librepo-devel</packagereq>
       <packagereq type="default">librevenge-devel</packagereq>
       <packagereq type="default">librhsm-devel</packagereq>
+      <packagereq type="default" arch="ppc64le">librtas-devel</packagereq>
       <packagereq type="default">librx</packagereq>
       <packagereq type="default">librx-devel</packagereq>
+      <packagereq type="default">libsamplerate-devel</packagereq>
       <packagereq type="default">libseccomp-devel</packagereq>
+      <packagereq type="default">libselinux-static</packagereq>
       <packagereq type="default">libsemanage-devel</packagereq>
       <packagereq type="default">libsepol-static</packagereq>
+      <packagereq type="default" arch="ppc64le">libservicelog-devel</packagereq>
       <packagereq type="default">libshout-devel</packagereq>
       <packagereq type="default">libsigc++20-devel</packagereq>
       <packagereq type="default">libsigc++20-doc</packagereq>
@@ -3245,6 +3265,7 @@
       <packagereq type="default">libXres-devel</packagereq>
       <packagereq type="default">libXxf86vm-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
+      <packagereq type="default">libzip-devel</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">lockdev-devel</packagereq>
       <packagereq type="default">lttng-ust-devel</packagereq>
@@ -3341,6 +3362,7 @@
       <packagereq type="default">ModemManager-glib-devel</packagereq>
       <packagereq type="default">mpg123-devel</packagereq>
       <packagereq type="default">mtdev-devel</packagereq>
+      <packagereq type="default">multilib-rpm-config</packagereq>
       <packagereq type="default">munge-devel</packagereq>
       <packagereq type="default">mutter-devel</packagereq>
       <packagereq type="default" arch="x86_64">mvapich2-psm2-devel</packagereq>
@@ -3352,6 +3374,7 @@
       <packagereq type="default">nbdkit-devel</packagereq>
       <packagereq type="default">nbdkit-example-plugins</packagereq>
       <packagereq type="default">ndctl-devel</packagereq>
+      <packagereq type="default">nftables-devel</packagereq>
       <packagereq type="default">neon-devel</packagereq>
       <packagereq type="default">netpbm-devel</packagereq>
       <packagereq type="default">netpbm-doc</packagereq>
@@ -3362,6 +3385,7 @@
       <packagereq type="default">ninja-build</packagereq>
       <packagereq type="default">nispor-devel</packagereq>
       <packagereq type="default">npth-devel</packagereq>
+      <packagereq type="default">nmstate-devel</packagereq>
       <packagereq type="default">nss_hesiod</packagereq>
       <packagereq type="default">objectweb-asm</packagereq>
       <packagereq type="default">objenesis</packagereq>
@@ -3589,7 +3613,6 @@
       <packagereq type="default">emacs-cython-mode</packagereq>
       <packagereq type="default">python3-debug</packagereq>
       <packagereq type="default">python3-gobject-devel</packagereq>
-      <packagereq type="default">python3-greenlet-devel</packagereq>
       <packagereq type="default">python3-hivex</packagereq>
       <packagereq type="default">python3-idle</packagereq>
       <packagereq type="default">python3-imagesize</packagereq>
@@ -3626,6 +3649,8 @@
       <packagereq type="default" arch="x86_64">qatlib-tests</packagereq>
       <packagereq type="default" arch="x86_64">qatzip-devel</packagereq>
       <packagereq type="default">qdox</packagereq>
+      <packagereq type="default">qgpgme</packagereq>
+      <packagereq type="default">qgpgme-devel</packagereq>
       <packagereq type="default">qhull-devel</packagereq>
       <packagereq type="default">qt5-devel</packagereq>
       <packagereq type="default">qt5-qtbase-static</packagereq>
@@ -3650,9 +3675,8 @@
       <packagereq type="default">rubygem-rspec-expectations</packagereq>
       <packagereq type="default">rubygem-rspec-mocks</packagereq>
       <packagereq type="default">rubygem-rspec-support</packagereq>
+      <packagereq type="default">rubygem-thread_order</packagereq>
       <packagereq type="default" arch="s390x">s390utils-devel</packagereq>
-      <packagereq type="default">SDL2</packagereq>
-      <packagereq type="default">SDL2-devel</packagereq>
       <packagereq type="default">SDL2-static</packagereq>
       <packagereq type="default">samba-devel</packagereq>
       <packagereq type="default">samba-pidl</packagereq>
@@ -3661,6 +3685,7 @@
       <packagereq type="default">sanlock-devel</packagereq>
       <packagereq type="default">sblim-cmpi-devel</packagereq>
       <packagereq type="default">sblim-sfcc-devel</packagereq>
+      <packagereq type="default">sdl12-compat-devel</packagereq>
       <packagereq type="default">sendmail-milter-devel</packagereq>
       <packagereq type="default">sg3_utils-devel</packagereq>
       <packagereq type="default">shadow-utils-subid-devel</packagereq>
@@ -3684,12 +3709,15 @@
       <packagereq type="default">swig-doc</packagereq>
       <packagereq type="default">swig-gdb</packagereq>
       <packagereq type="default">taglib-devel</packagereq>
+      <packagereq type="default">tesseract-devel</packagereq>
       <packagereq type="default">texi2html</packagereq>
       <packagereq type="default">texinfo</packagereq>
       <packagereq type="default">texinfo-tex</packagereq>
       <packagereq type="default">texlive-lib-devel</packagereq>
       <packagereq type="default">tinycdb</packagereq>
       <packagereq type="default">tinycdb-devel</packagereq>
+      <packagereq type="default">tix</packagereq>
+      <packagereq type="default">tix-devel</packagereq>
       <packagereq type="default">tokyocabinet-devel</packagereq>
       <packagereq type="default">tog-pegasus-devel</packagereq>
       <packagereq type="default">tpm2-abrmd-devel</packagereq>
@@ -3697,6 +3725,7 @@
       <packagereq type="default">transfig</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">tss2-devel</packagereq>
       <packagereq type="default">turbojpeg-devel</packagereq>
+      <packagereq type="default">twolame-devel</packagereq>
       <packagereq type="default">uid_wrapper</packagereq>
       <packagereq type="default">unicode-ucd-unihan</packagereq>
       <packagereq type="default">unixODBC-devel</packagereq>
@@ -3705,8 +3734,10 @@
       <packagereq type="default">urw-base35-fonts-devel</packagereq>
       <packagereq type="default">usbredir-devel</packagereq>
       <packagereq type="default">userspace-rcu-devel</packagereq>
+      <packagereq type="default">utf8proc-devel</packagereq>
       <packagereq type="default">uuid-devel</packagereq>
       <packagereq type="default">vala</packagereq>
+      <packagereq type="default">varnish-devel</packagereq>
       <packagereq type="default" arch="x86_64">virt-v2v-man-pages-ja</packagereq>
       <packagereq type="default" arch="x86_64">virt-v2v-man-pages-uk</packagereq>
       <packagereq type="default">vte291-devel</packagereq>
@@ -3739,6 +3770,7 @@
       <packagereq type="default">xmvn-minimal</packagereq>
       <packagereq type="default">xmvn-mojo</packagereq>
       <packagereq type="default">xmvn-tools</packagereq>
+      <packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
       <packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
       <packagereq type="default">xorg-x11-drv-wacom-devel</packagereq>
       <packagereq type="default">xorg-x11-server-devel</packagereq>
@@ -3762,7 +3794,7 @@
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
     </optionlist>
   </environment>
   <environment variant="BaseOS">
@@ -3775,7 +3807,7 @@
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
     </optionlist>
   </environment>
   <environment>
@@ -3796,10 +3828,10 @@
       <groupid>dns-server</groupid>
       <groupid>file-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>hardware-monitoring</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>network-server</groupid>
@@ -3828,7 +3860,7 @@
       <groupid>hardware-monitoring</groupid>
       <groupid>headless-management</groupid>
       <groupid>internet-browser</groupid>
-      <groupid>multimedia</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
     </grouplist>
@@ -3837,8 +3869,8 @@
       <groupid>dns-server</groupid>
       <groupid>file-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>network-server</groupid>
@@ -3866,7 +3898,7 @@
       <groupid>headless-management</groupid>
       <groupid>freeipa-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-server</groupid>
       <groupid>smb-server</groupid>
@@ -3886,7 +3918,7 @@
     </grouplist>
     <optionlist>
       <groupid>python-web</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
     </optionlist>
   </environment>
   <environment>
@@ -3903,8 +3935,8 @@
     <optionlist>
       <groupid>debugging</groupid>
       <groupid>file-server</groupid>
-      <groupid>infiniband</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>network-server</groupid>
       <groupid>network-filesystem-client</groupid>
       <groupid>hardware-monitoring</groupid>
@@ -3913,7 +3945,7 @@
       <groupid>smb-server</groupid>
       <groupid>web-server</groupid>
       <groupid>dns-server</groupid>
-      <groupid>identity-management-server</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">identity-management-server</groupid>
       <groupid>ftp-server</groupid>
       <groupid>mail-server</groupid>
       <groupid>mariadb</groupid>
@@ -3935,7 +3967,7 @@
       <groupid>core</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
-      <groupid>multimedia</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>print-client</groupid>
       <groupid>internet-browser</groupid>
@@ -3944,7 +3976,7 @@
       <groupid>desktop-debugging</groupid>
       <groupid>dial-up</groupid>
       <groupid>gnome-desktop</groupid>
-      <groupid>gnome-apps</groupid>
+      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>virtualization-client</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid>virtualization-tools</groupid>
@@ -3959,22 +3991,22 @@
       <groupid default="true">platform-devel</groupid>
       <groupid default="true">emacs</groupid>
       <groupid>additional-devel</groupid>
-      <groupid>graphics</groupid>
-      <groupid>office-suite</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">graphics</groupid>
+      <groupid arch="x86_64">office-suite</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>python-web</groupid>
       <groupid>php</groupid>
       <groupid>web-servlet</groupid>
-      <groupid>identity-management-server</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">identity-management-server</groupid>
       <groupid>dns-server</groupid>
       <groupid>ftp-server</groupid>
       <groupid>mail-server</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>file-server</groupid>
       <groupid>mariadb</groupid>
       <groupid>postgresql</groupid>
       <groupid>virtualization-hypervisor</groupid>
-      <groupid>load-balancer</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">load-balancer</groupid>
       <groupid>legacy-x</groupid>
       <groupid>backup-client</groupid>
       <groupid>mainframe-access</groupid>
@@ -3995,21 +4027,21 @@
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
-      <groupid>multimedia</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>print-client</groupid>
       <groupid>desktop-debugging</groupid>
       <groupid>internet-browser</groupid>
       <groupid>gnome-desktop</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>java-platform</groupid>
     </grouplist>
     <optionlist>
-      <groupid>gnome-apps</groupid>
+      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>internet-applications</groupid>
-      <groupid>office-suite</groupid>
+      <groupid arch="x86_64">office-suite</groupid>
       <groupid>smart-card</groupid>
       <groupid>legacy-x</groupid>
       <groupid>backup-client</groupid>
@@ -4030,16 +4062,16 @@
       <groupid>gnome-desktop</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>hardware-support</groupid>
-      <groupid>multimedia</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
       <groupid>workstation-product</groupid>
     </grouplist>
     <optionlist>
-      <groupid>gnome-apps</groupid>
+      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>headless-management</groupid>
       <groupid>internet-applications</groupid>
-      <groupid>office-suite</groupid>
+      <groupid arch="x86_64">office-suite</groupid>
       <groupid>backup-client</groupid>
       <groupid>remote-desktop-clients</groupid>
       <groupid>smart-card</groupid>
@@ -4087,7 +4119,7 @@
       <groupid>web-server</groupid>
       <groupid>backup-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>identity-management-server</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">identity-management-server</groupid>
       <groupid>mail-server</groupid>
       <groupid>print-server</groupid>
     </grouplist>
@@ -4102,7 +4134,7 @@
       <groupid>debugging</groupid>
       <groupid>dial-up</groupid>
       <groupid>hardware-monitoring</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>large-systems</groupid>
       <groupid>legacy-unix</groupid>
       <groupid>mainframe-access</groupid>
@@ -4152,10 +4184,10 @@
     <display_order>80</display_order>
     <grouplist>
       <groupid>emacs</groupid>
-      <groupid>gnome-apps</groupid>
-      <groupid>graphics</groupid>
+      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">graphics</groupid>
       <groupid>internet-applications</groupid>
-      <groupid>office-suite</groupid>
+      <groupid arch="x86_64">office-suite</groupid>
     </grouplist>
   </category>
 </comps>
\ No newline at end of file
diff --git a/comps-rocky-9.0.xml.in b/comps-rocky-9.0.xml.in
index 6dc6f20..8be84b9 100644
--- a/comps-rocky-9.0.xml.in
+++ b/comps-rocky-9.0.xml.in
@@ -128,7 +128,7 @@
       <packagereq variant="AppStream">sane-backends-devel</packagereq>
       <packagereq variant="AppStream">scl-utils</packagereq>
       <packagereq variant="AppStream">scl-utils-build</packagereq>
-      <packagereq variant="AppStream">SDL-devel</packagereq>
+      <packagereq variant="AppStream">SDL2-devel</packagereq>
       <packagereq variant="AppStream">slang-devel</packagereq>
       <packagereq variant="AppStream">startup-notification-devel</packagereq>
       <packagereq variant="AppStream">tbb-devel</packagereq>
@@ -156,8 +156,6 @@
       <packagereq variant="BaseOS">glibc-all-langpacks</packagereq>
       <packagereq variant="BaseOS" arch="aarch64">grub2-efi-aa64</packagereq>
       <packagereq variant="BaseOS" arch="aarch64">grub2-efi-aa64-cdboot</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64">grub2-efi-ia32</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64">grub2-efi-ia32-cdboot</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">grub2-efi-x64</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">grub2-efi-x64-cdboot</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">grub2-pc</packagereq>
@@ -176,7 +174,6 @@
       <packagereq variant="AppStream" arch="s390x">s390utils</packagereq>
       <packagereq variant="AppStream" arch="s390x">s390utils-base</packagereq>
       <packagereq variant="BaseOS" arch="aarch64">shim-aa64</packagereq>
-      <packagereq variant="BaseOS" arch="x86_64">shim-ia32</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">shim-x64</packagereq>
       <packagereq variant="BaseOS" arch="x86_64">syslinux-extlinux</packagereq>
       <packagereq variant="BaseOS">teamd</packagereq>
@@ -323,7 +320,6 @@
       <packagereq type="default" variant="AppStream">crash-trace-command</packagereq>
       <packagereq type="default" arch="aarch64,ppc64le,x86_64,s390x" variant="AppStream">valgrind</packagereq>
       <packagereq type="default" arch="aarch64,ppc64le,x86_64,s390x" variant="AppStream">valgrind-devel</packagereq>
-      <packagereq type="optional" arch="x86_64" variant="AppStream">xdp-tools</packagereq>
       <packagereq type="optional" variant="AppStream">bpftrace</packagereq>
       <packagereq type="optional" variant="AppStream">gdb-gdbserver</packagereq>
       <packagereq type="optional" variant="AppStream">glibc-utils</packagereq>
@@ -387,6 +383,7 @@
       <packagereq variant="AppStream">at-spi2-atk</packagereq>
       <packagereq variant="BaseOS">avahi</packagereq>
       <packagereq variant="BaseOS">glib-networking</packagereq>
+      <packagereq variant="BaseOS">glibc-all-langpacks</packagereq>
       <packagereq variant="BaseOS">ModemManager</packagereq>
       <packagereq variant="BaseOS">NetworkManager-adsl</packagereq>
       <packagereq variant="BaseOS">polkit</packagereq>
@@ -732,6 +729,7 @@
       <packagereq type="optional" variant="AppStream">mrtg</packagereq>
       <packagereq type="optional" variant="AppStream">nmap</packagereq>
       <packagereq type="optional" variant="AppStream">nmstate</packagereq>
+      <packagereq type="optional" variant="AppStream">xdp-tools</packagereq>
       <packagereq type="optional" variant="AppStream">wireshark</packagereq>
     </packagelist>
   </group>
@@ -780,7 +778,7 @@
       <packagereq type="default" variant="AppStream">pcp-pmda-bcc</packagereq>
       <packagereq type="default" variant="AppStream">pcp-pmda-bind2</packagereq>
       <packagereq type="default" variant="AppStream">pcp-pmda-bonding</packagereq>
-      <packagereq type="default" variant="AppStream">pcp-pmda-bpf</packagereq>
+      <packagereq type="default" arch="aarch64,ppc64le,x86_64" variant="AppStream">pcp-pmda-bpf</packagereq>
       <packagereq type="default" variant="AppStream">pcp-pmda-bpftrace</packagereq>
       <packagereq type="default" variant="AppStream">pcp-pmda-cifs</packagereq>
       <packagereq type="default" variant="AppStream">pcp-pmda-cisco</packagereq>
@@ -1103,6 +1101,7 @@
       <packagereq type="default" variant="BaseOS">mlocate</packagereq>
       <packagereq type="default" variant="BaseOS">mtr</packagereq>
       <packagereq type="default" variant="BaseOS">nano</packagereq>
+      <packagereq type="default" variant="BaseOS">nvme-cli</packagereq>
       <packagereq type="default" variant="AppStream">pinfo</packagereq>
       <packagereq type="default" variant="AppStream" arch="ppc64le">ppc64-diag</packagereq>
       <packagereq type="default" variant="AppStream" arch="ppc64le">powerpc-utils</packagereq>
@@ -1208,6 +1207,7 @@
       <packagereq type="default" variant="BaseOS">mlocate</packagereq>
       <packagereq type="default" variant="BaseOS">mtr</packagereq>
       <packagereq type="default" variant="BaseOS">nano</packagereq>
+      <packagereq type="default" variant="BaseOS">nvme-cli</packagereq>
       <packagereq type="default" variant="AppStream">pinfo</packagereq>
       <packagereq type="default" variant="AppStream" arch="ppc64le">ppc64-diag</packagereq>
       <packagereq type="default" variant="AppStream" arch="ppc64le">powerpc-utils</packagereq>
@@ -1731,6 +1731,7 @@
       <packagereq variant="AppStream">setroubleshoot</packagereq>
       <packagereq variant="AppStream">telnet</packagereq>
       <packagereq variant="AppStream">xorg-x11-drv-libinput</packagereq>
+      <packagereq variant="AppStream" arch="x86_64">alsa-sof-firmware</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -2866,6 +2867,7 @@
       <packagereq type="default">bcc-doc</packagereq>
       <packagereq type="default">bcel</packagereq>
       <packagereq type="default">beust-jcommander</packagereq>
+      <packagereq type="default">bind-devel</packagereq>
       <packagereq type="default">bison-devel</packagereq>
       <packagereq type="default">blas-devel</packagereq>
       <packagereq type="default">bluez-libs-devel</packagereq>
@@ -2899,6 +2901,7 @@
       <packagereq type="default">colord-devel-docs</packagereq>
       <packagereq type="default">colord-gtk-devel</packagereq>
       <packagereq type="default">corosync-vqsim</packagereq>
+      <packagereq type="default">cppunit-devel</packagereq>
       <packagereq type="default">cracklib-devel</packagereq>
       <packagereq type="default">crash-devel</packagereq>
       <packagereq type="default">createrepo_c-devel</packagereq>
@@ -2947,6 +2950,7 @@
       <packagereq type="default">flac-devel</packagereq>
       <packagereq type="default">flatpak-devel</packagereq>
       <packagereq type="default">flex-devel</packagereq>
+      <packagereq type="default">flexiblas-devel</packagereq>
       <packagereq type="default">flite</packagereq>
       <packagereq type="default">flite-devel</packagereq>
       <packagereq type="default">fltk-devel</packagereq>
@@ -2955,6 +2959,8 @@
       <packagereq type="default">fontpackages-devel</packagereq>
       <packagereq type="default">freeipmi-devel</packagereq>
       <packagereq type="default">freerdp-devel</packagereq>
+      <packagereq type="default">fstrm-devel</packagereq>
+      <packagereq type="default">fstrm-utils</packagereq>
       <packagereq type="default">fuse-devel</packagereq>
       <packagereq type="default">fwupd-devel</packagereq>
       <packagereq type="default">gcc-plugin-devel</packagereq>
@@ -2964,6 +2970,7 @@
       <packagereq type="default">gdk-pixbuf2-xlib-devel</packagereq>
       <packagereq type="default">gdm-devel</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">gegl04-devel</packagereq>
+      <packagereq type="default">geoclue2-demos</packagereq>
       <packagereq type="default">geoclue2-devel</packagereq>
       <packagereq type="default">ghostscript-doc</packagereq>
       <packagereq type="default">ghostscript-tools-dvipdf</packagereq>
@@ -2985,6 +2992,7 @@
       <packagereq type="default">glm-doc</packagereq>
       <packagereq type="default" arch="aarch64,x86_64,ppc64le">gnome-bluetooth-libs-devel</packagereq>
       <packagereq type="default">gnome-common</packagereq>
+      <packagereq type="default">gnome-menus-devel</packagereq>
       <packagereq type="default" arch="x86_64,aarch64">gnu-efi</packagereq>
       <packagereq type="default" arch="x86_64,aarch64">gnu-efi-devel</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
@@ -2998,6 +3006,7 @@
       <packagereq type="default">graphviz-gd</packagereq>
       <packagereq type="default">graphviz-python3</packagereq>
       <packagereq type="default">grilo-devel</packagereq>
+      <packagereq type="default">gsl-devel</packagereq>
       <packagereq type="default">gsm-devel</packagereq>
       <packagereq type="default">gspell-devel</packagereq>
       <packagereq type="default">gspell-doc</packagereq>
@@ -3049,8 +3058,10 @@
       <packagereq type="default">lasso-devel</packagereq>
       <packagereq type="default">latex2html</packagereq>
       <packagereq type="default">lcms2-devel</packagereq>
+      <packagereq type="default">ldns-devel</packagereq>
       <packagereq type="default">leptonica</packagereq>
       <packagereq type="default">leptonica-devel</packagereq>
+      <packagereq type="default">liba52-devel</packagereq>
       <packagereq type="default">libao-devel</packagereq>
       <packagereq type="default">libappstream-glib-devel</packagereq>
       <packagereq type="default">libarchive-devel</packagereq>
@@ -3077,6 +3088,7 @@
       <packagereq type="default">libdb-devel-doc</packagereq>
       <packagereq type="default">libdb-sql</packagereq>
       <packagereq type="default">libdb-sql-devel</packagereq>
+      <packagereq type="default">libdecor-devel</packagereq>
       <packagereq type="default">libdnf-devel</packagereq>
       <packagereq type="default">libdvdread-devel</packagereq>
       <packagereq type="default">libecpg-devel</packagereq>
@@ -3090,6 +3102,7 @@
       <packagereq type="default">libfabric-devel</packagereq>
       <packagereq type="default">libfdisk-devel</packagereq>
       <packagereq type="default">libfdt-devel</packagereq>
+      <packagereq type="default">libfido2-devel</packagereq>
       <packagereq type="default">libfontenc-devel</packagereq>
       <packagereq type="default">libgee-devel</packagereq>
       <packagereq type="default">libgexiv2-devel</packagereq>
@@ -3125,13 +3138,15 @@
       <packagereq type="default">libmad-devel</packagereq>
       <packagereq type="default">libmaxminddb-devel</packagereq>
       <packagereq type="default">libmemcached-awesome-devel</packagereq>
+      <packagereq type="default">libmemcached-awesome-tools</packagereq>
       <packagereq type="default">libmicrohttpd-devel</packagereq>
       <packagereq type="default">libmicrohttpd-doc</packagereq>
+      <packagereq type="default">libmng-devel</packagereq>
       <packagereq type="default">libmnl-devel</packagereq>
       <packagereq type="default">libmodulemd-devel</packagereq>
       <packagereq type="default">libmount-devel</packagereq>
-      <packagereq type="default">libmpc-devel</packagereq>
       <packagereq type="default">libmspack-devel</packagereq>
+      <packagereq type="default">libmtp-devel</packagereq>
       <packagereq type="default">libnbd-devel</packagereq>
       <packagereq type="default">libnet-devel</packagereq>
       <packagereq type="default">libnetfilter_conntrack-devel</packagereq>
@@ -3149,6 +3164,7 @@
       <packagereq type="default">libopenraw-devel</packagereq>
       <packagereq type="default">libopenraw-gnome</packagereq>
       <packagereq type="default">libopenraw-gnome-devel</packagereq>
+      <packagereq type="default">libotr-devel</packagereq>
       <packagereq type="default">libpaper-devel</packagereq>
       <packagereq type="default">libpath_utils-devel</packagereq>
       <packagereq type="default">libpcap-devel</packagereq>
@@ -3177,11 +3193,15 @@
       <packagereq type="default">librepo-devel</packagereq>
       <packagereq type="default">librevenge-devel</packagereq>
       <packagereq type="default">librhsm-devel</packagereq>
+      <packagereq type="default" arch="ppc64le">librtas-devel</packagereq>
       <packagereq type="default">librx</packagereq>
       <packagereq type="default">librx-devel</packagereq>
+      <packagereq type="default">libsamplerate-devel</packagereq>
       <packagereq type="default">libseccomp-devel</packagereq>
+      <packagereq type="default">libselinux-static</packagereq>
       <packagereq type="default">libsemanage-devel</packagereq>
       <packagereq type="default">libsepol-static</packagereq>
+      <packagereq type="default" arch="ppc64le">libservicelog-devel</packagereq>
       <packagereq type="default">libshout-devel</packagereq>
       <packagereq type="default">libsigc++20-devel</packagereq>
       <packagereq type="default">libsigc++20-doc</packagereq>
@@ -3244,6 +3264,7 @@
       <packagereq type="default">libXres-devel</packagereq>
       <packagereq type="default">libXxf86vm-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
+      <packagereq type="default">libzip-devel</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">lockdev-devel</packagereq>
       <packagereq type="default">lttng-ust-devel</packagereq>
@@ -3340,6 +3361,7 @@
       <packagereq type="default">ModemManager-glib-devel</packagereq>
       <packagereq type="default">mpg123-devel</packagereq>
       <packagereq type="default">mtdev-devel</packagereq>
+      <packagereq type="default">multilib-rpm-config</packagereq>
       <packagereq type="default">munge-devel</packagereq>
       <packagereq type="default">mutter-devel</packagereq>
       <packagereq type="default" arch="x86_64">mvapich2-psm2-devel</packagereq>
@@ -3351,6 +3373,7 @@
       <packagereq type="default">nbdkit-devel</packagereq>
       <packagereq type="default">nbdkit-example-plugins</packagereq>
       <packagereq type="default">ndctl-devel</packagereq>
+      <packagereq type="default">nftables-devel</packagereq>
       <packagereq type="default">neon-devel</packagereq>
       <packagereq type="default">netpbm-devel</packagereq>
       <packagereq type="default">netpbm-doc</packagereq>
@@ -3361,6 +3384,7 @@
       <packagereq type="default">ninja-build</packagereq>
       <packagereq type="default">nispor-devel</packagereq>
       <packagereq type="default">npth-devel</packagereq>
+      <packagereq type="default">nmstate-devel</packagereq>
       <packagereq type="default">nss_hesiod</packagereq>
       <packagereq type="default">objectweb-asm</packagereq>
       <packagereq type="default">objenesis</packagereq>
@@ -3588,7 +3612,6 @@
       <packagereq type="default">emacs-cython-mode</packagereq>
       <packagereq type="default">python3-debug</packagereq>
       <packagereq type="default">python3-gobject-devel</packagereq>
-      <packagereq type="default">python3-greenlet-devel</packagereq>
       <packagereq type="default">python3-hivex</packagereq>
       <packagereq type="default">python3-idle</packagereq>
       <packagereq type="default">python3-imagesize</packagereq>
@@ -3625,6 +3648,8 @@
       <packagereq type="default" arch="x86_64">qatlib-tests</packagereq>
       <packagereq type="default" arch="x86_64">qatzip-devel</packagereq>
       <packagereq type="default">qdox</packagereq>
+      <packagereq type="default">qgpgme</packagereq>
+      <packagereq type="default">qgpgme-devel</packagereq>
       <packagereq type="default">qhull-devel</packagereq>
       <packagereq type="default">qt5-devel</packagereq>
       <packagereq type="default">qt5-qtbase-static</packagereq>
@@ -3649,9 +3674,8 @@
       <packagereq type="default">rubygem-rspec-expectations</packagereq>
       <packagereq type="default">rubygem-rspec-mocks</packagereq>
       <packagereq type="default">rubygem-rspec-support</packagereq>
+      <packagereq type="default">rubygem-thread_order</packagereq>
       <packagereq type="default" arch="s390x">s390utils-devel</packagereq>
-      <packagereq type="default">SDL2</packagereq>
-      <packagereq type="default">SDL2-devel</packagereq>
       <packagereq type="default">SDL2-static</packagereq>
       <packagereq type="default">samba-devel</packagereq>
       <packagereq type="default">samba-pidl</packagereq>
@@ -3660,6 +3684,7 @@
       <packagereq type="default">sanlock-devel</packagereq>
       <packagereq type="default">sblim-cmpi-devel</packagereq>
       <packagereq type="default">sblim-sfcc-devel</packagereq>
+      <packagereq type="default">sdl12-compat-devel</packagereq>
       <packagereq type="default">sendmail-milter-devel</packagereq>
       <packagereq type="default">sg3_utils-devel</packagereq>
       <packagereq type="default">shadow-utils-subid-devel</packagereq>
@@ -3683,12 +3708,15 @@
       <packagereq type="default">swig-doc</packagereq>
       <packagereq type="default">swig-gdb</packagereq>
       <packagereq type="default">taglib-devel</packagereq>
+      <packagereq type="default">tesseract-devel</packagereq>
       <packagereq type="default">texi2html</packagereq>
       <packagereq type="default">texinfo</packagereq>
       <packagereq type="default">texinfo-tex</packagereq>
       <packagereq type="default">texlive-lib-devel</packagereq>
       <packagereq type="default">tinycdb</packagereq>
       <packagereq type="default">tinycdb-devel</packagereq>
+      <packagereq type="default">tix</packagereq>
+      <packagereq type="default">tix-devel</packagereq>
       <packagereq type="default">tokyocabinet-devel</packagereq>
       <packagereq type="default">tog-pegasus-devel</packagereq>
       <packagereq type="default">tpm2-abrmd-devel</packagereq>
@@ -3696,6 +3724,7 @@
       <packagereq type="default">transfig</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">tss2-devel</packagereq>
       <packagereq type="default">turbojpeg-devel</packagereq>
+      <packagereq type="default">twolame-devel</packagereq>
       <packagereq type="default">uid_wrapper</packagereq>
       <packagereq type="default">unicode-ucd-unihan</packagereq>
       <packagereq type="default">unixODBC-devel</packagereq>
@@ -3704,8 +3733,10 @@
       <packagereq type="default">urw-base35-fonts-devel</packagereq>
       <packagereq type="default">usbredir-devel</packagereq>
       <packagereq type="default">userspace-rcu-devel</packagereq>
+      <packagereq type="default">utf8proc-devel</packagereq>
       <packagereq type="default">uuid-devel</packagereq>
       <packagereq type="default">vala</packagereq>
+      <packagereq type="default">varnish-devel</packagereq>
       <packagereq type="default" arch="x86_64">virt-v2v-man-pages-ja</packagereq>
       <packagereq type="default" arch="x86_64">virt-v2v-man-pages-uk</packagereq>
       <packagereq type="default">vte291-devel</packagereq>
@@ -3738,6 +3769,7 @@
       <packagereq type="default">xmvn-minimal</packagereq>
       <packagereq type="default">xmvn-mojo</packagereq>
       <packagereq type="default">xmvn-tools</packagereq>
+      <packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
       <packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
       <packagereq type="default">xorg-x11-drv-wacom-devel</packagereq>
       <packagereq type="default">xorg-x11-server-devel</packagereq>
@@ -3761,7 +3793,7 @@
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
     </optionlist>
   </environment>
   <environment variant="BaseOS">
@@ -3774,7 +3806,7 @@
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
     </optionlist>
   </environment>
   <environment>
@@ -3795,10 +3827,10 @@
       <groupid>dns-server</groupid>
       <groupid>file-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>hardware-monitoring</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>network-server</groupid>
@@ -3827,7 +3859,7 @@
       <groupid>hardware-monitoring</groupid>
       <groupid>headless-management</groupid>
       <groupid>internet-browser</groupid>
-      <groupid>multimedia</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
     </grouplist>
@@ -3836,8 +3868,8 @@
       <groupid>dns-server</groupid>
       <groupid>file-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>network-server</groupid>
@@ -3865,7 +3897,7 @@
       <groupid>headless-management</groupid>
       <groupid>freeipa-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-server</groupid>
       <groupid>smb-server</groupid>
@@ -3885,7 +3917,7 @@
     </grouplist>
     <optionlist>
       <groupid>python-web</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
     </optionlist>
   </environment>
   <environment>
@@ -3902,8 +3934,8 @@
     <optionlist>
       <groupid>debugging</groupid>
       <groupid>file-server</groupid>
-      <groupid>infiniband</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>network-server</groupid>
       <groupid>network-filesystem-client</groupid>
       <groupid>hardware-monitoring</groupid>
@@ -3912,7 +3944,7 @@
       <groupid>smb-server</groupid>
       <groupid>web-server</groupid>
       <groupid>dns-server</groupid>
-      <groupid>identity-management-server</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">identity-management-server</groupid>
       <groupid>ftp-server</groupid>
       <groupid>mail-server</groupid>
       <groupid>mariadb</groupid>
@@ -3934,7 +3966,7 @@
       <groupid>core</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
-      <groupid>multimedia</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>print-client</groupid>
       <groupid>internet-browser</groupid>
@@ -3943,7 +3975,7 @@
       <groupid>desktop-debugging</groupid>
       <groupid>dial-up</groupid>
       <groupid>gnome-desktop</groupid>
-      <groupid>gnome-apps</groupid>
+      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>virtualization-client</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid>virtualization-tools</groupid>
@@ -3958,22 +3990,22 @@
       <groupid default="true">platform-devel</groupid>
       <groupid default="true">emacs</groupid>
       <groupid>additional-devel</groupid>
-      <groupid>graphics</groupid>
-      <groupid>office-suite</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">graphics</groupid>
+      <groupid arch="x86_64">office-suite</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>python-web</groupid>
       <groupid>php</groupid>
       <groupid>web-servlet</groupid>
-      <groupid>identity-management-server</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">identity-management-server</groupid>
       <groupid>dns-server</groupid>
       <groupid>ftp-server</groupid>
       <groupid>mail-server</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>file-server</groupid>
       <groupid>mariadb</groupid>
       <groupid>postgresql</groupid>
       <groupid>virtualization-hypervisor</groupid>
-      <groupid>load-balancer</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">load-balancer</groupid>
       <groupid>legacy-x</groupid>
       <groupid>backup-client</groupid>
       <groupid>mainframe-access</groupid>
@@ -3994,21 +4026,21 @@
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
-      <groupid>multimedia</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>print-client</groupid>
       <groupid>desktop-debugging</groupid>
       <groupid>internet-browser</groupid>
       <groupid>gnome-desktop</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>java-platform</groupid>
     </grouplist>
     <optionlist>
-      <groupid>gnome-apps</groupid>
+      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>internet-applications</groupid>
-      <groupid>office-suite</groupid>
+      <groupid arch="x86_64">office-suite</groupid>
       <groupid>smart-card</groupid>
       <groupid>legacy-x</groupid>
       <groupid>backup-client</groupid>
@@ -4029,16 +4061,16 @@
       <groupid>gnome-desktop</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>hardware-support</groupid>
-      <groupid>multimedia</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
       <groupid>workstation-product</groupid>
     </grouplist>
     <optionlist>
-      <groupid>gnome-apps</groupid>
+      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
       <groupid>headless-management</groupid>
       <groupid>internet-applications</groupid>
-      <groupid>office-suite</groupid>
+      <groupid arch="x86_64">office-suite</groupid>
       <groupid>backup-client</groupid>
       <groupid>remote-desktop-clients</groupid>
       <groupid>smart-card</groupid>
@@ -4086,7 +4118,7 @@
       <groupid>web-server</groupid>
       <groupid>backup-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>identity-management-server</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">identity-management-server</groupid>
       <groupid>mail-server</groupid>
       <groupid>print-server</groupid>
     </grouplist>
@@ -4101,7 +4133,7 @@
       <groupid>debugging</groupid>
       <groupid>dial-up</groupid>
       <groupid>hardware-monitoring</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
       <groupid>large-systems</groupid>
       <groupid>legacy-unix</groupid>
       <groupid>mainframe-access</groupid>
@@ -4151,10 +4183,10 @@
     <display_order>80</display_order>
     <grouplist>
       <groupid>emacs</groupid>
-      <groupid>gnome-apps</groupid>
-      <groupid>graphics</groupid>
+      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
+      <groupid arch="x86_64,ppc64le,aarch64">graphics</groupid>
       <groupid>internet-applications</groupid>
-      <groupid>office-suite</groupid>
+      <groupid arch="x86_64">office-suite</groupid>
     </grouplist>
   </category>
 </comps>