diff --git a/comps-centos-8-stream.xml b/comps-centos-8-stream.xml
index 107caed..9660c8b 100644
--- a/comps-centos-8-stream.xml
+++ b/comps-centos-8-stream.xml
@@ -8381,6 +8381,7 @@
       <packagereq type="default">libsndfile-devel</packagereq>
       <packagereq type="default">libspectre-devel</packagereq>
       <packagereq type="default">libsrtp-devel</packagereq>
+      <packagereq type="default">libss-devel</packagereq>
       <packagereq type="default">libsss_nss_idmap-devel</packagereq>
       <packagereq type="default">libstdc++-static</packagereq>
       <packagereq type="default">libstemmer-devel</packagereq>
@@ -8879,8 +8880,8 @@
       <packagereq type="default">python3-whoosh</packagereq>
       <packagereq type="default">python-sphinx-locale</packagereq>
       <packagereq type="default" arch="x86_64">qatlib-devel</packagereq>
-      <packagereq type="default">qatlib-tests</packagereq>
-      <packagereq type="default">qatzip-devel</packagereq>
+      <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-devel</packagereq>
       <packagereq type="default">qhull-devel</packagereq>
@@ -8979,6 +8980,7 @@
       <packagereq type="default">vala-devel</packagereq>
       <packagereq type="default">vte291-devel</packagereq>
       <packagereq type="default">wavpack-devel</packagereq>
+      <packagereq type="default">webrtc-audio-processing-devel</packagereq>
       <packagereq type="default">web-assets-devel</packagereq>
       <packagereq type="default">web-assets-filesystem</packagereq>
       <packagereq type="default">wireshark-devel</packagereq>
@@ -9050,7 +9052,7 @@
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">guest-agents</groupid>
     </optionlist>
   </environment>
   <environment variant="BaseOS">
@@ -9115,7 +9117,7 @@
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">guest-agents</groupid>
     </optionlist>
   </environment>
   <environment>
@@ -9151,10 +9153,10 @@
       <groupid>dns-server</groupid>
       <groupid>file-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">guest-agents</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>hardware-monitoring</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">infiniband</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>network-server</groupid>
@@ -9162,7 +9164,7 @@
       <groupid>smb-server</groupid>
       <groupid>web-server</groupid>
       <groupid>remote-system-management</groupid>
-      <groupid>virtualization-hypervisor</groupid>
+      <groupid arch="ppc64le,s390x,x86_64">virtualization-hypervisor</groupid>
     </optionlist>
   </environment>
   <environment arch="aarch64,s390x,ppc64le,x86_64">
@@ -9221,7 +9223,7 @@
       <groupid>headless-management</groupid>
       <groupid>input-methods</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>
@@ -9230,8 +9232,8 @@
       <groupid>dns-server</groupid>
       <groupid>file-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">guest-agents</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">infiniband</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>network-server</groupid>
@@ -9241,8 +9243,8 @@
       <groupid>remote-desktop-clients</groupid>
       <groupid>remote-system-management</groupid>
       <groupid>virtualization-client</groupid>
-      <groupid>virtualization-hypervisor</groupid>
-      <groupid>virtualization-tools</groupid>
+      <groupid arch="ppc64le,s390x,x86_64">virtualization-hypervisor</groupid>
+      <groupid arch="ppc64le,s390x,x86_64">virtualization-tools</groupid>
     </optionlist>
   </environment>
   <environment variant="BaseOS">
@@ -9281,7 +9283,7 @@
       <groupid>headless-management</groupid>
       <groupid>freeipa-server</groupid>
       <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">guest-agents</groupid>
       <groupid>mail-server</groupid>
       <groupid>network-server</groupid>
       <groupid>smb-server</groupid>
@@ -9405,7 +9407,7 @@
     </grouplist>
     <optionlist>
       <groupid>python-web</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">guest-agents</groupid>
     </optionlist>
   </environment>
   <environment>
@@ -9474,8 +9476,8 @@
     <optionlist>
       <groupid>debugging</groupid>
       <groupid>file-server</groupid>
-      <groupid>infiniband</groupid>
-      <groupid>guest-agents</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">infiniband</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">guest-agents</groupid>
       <groupid>network-server</groupid>
       <groupid>network-filesystem-client</groupid>
       <groupid>hardware-monitoring</groupid>
@@ -9492,7 +9494,7 @@
       <groupid>backup-server</groupid>
       <groupid>java-platform</groupid>
       <groupid>remote-system-management</groupid>
-      <groupid>virtualization-hypervisor</groupid>
+      <groupid arch="ppc64le,s390x,x86_64">virtualization-hypervisor</groupid>
     </optionlist>
   </environment>
   <environment variant="AppStream" arch="x86_64,ppc64le">
@@ -9558,7 +9560,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>
@@ -9569,8 +9571,8 @@
       <groupid>gnome-desktop</groupid>
       <groupid>gnome-apps</groupid>
       <groupid>virtualization-client</groupid>
-      <groupid>virtualization-hypervisor</groupid>
-      <groupid>virtualization-tools</groupid>
+      <groupid arch="ppc64le,s390x,x86_64">virtualization-hypervisor</groupid>
+      <groupid arch="ppc64le,s390x,x86_64">virtualization-tools</groupid>
       <groupid>web-server</groupid>
       <groupid>java-platform</groupid>
       <groupid>ruby-runtime</groupid>
@@ -9592,11 +9594,11 @@
       <groupid>dns-server</groupid>
       <groupid>ftp-server</groupid>
       <groupid>mail-server</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">infiniband</groupid>
       <groupid>file-server</groupid>
       <groupid>mariadb</groupid>
       <groupid>postgresql</groupid>
-      <groupid>virtualization-hypervisor</groupid>
+      <groupid arch="ppc64le,s390x,x86_64">virtualization-hypervisor</groupid>
       <groupid>load-balancer</groupid>
       <groupid>legacy-x</groupid>
       <groupid>backup-client</groupid>
@@ -9654,14 +9656,14 @@
       <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="aarch64,ppc64le,x86_64">guest-agents</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>java-platform</groupid>
     </grouplist>
@@ -9710,7 +9712,7 @@
       <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>
@@ -9786,8 +9788,8 @@
       <groupid>base</groupid>
       <groupid>core</groupid>
       <groupid>standard</groupid>
-      <groupid>virtualization-hypervisor</groupid>
-      <groupid>virtualization-tools</groupid>
+      <groupid arch="ppc64le,s390x,x86_64">virtualization-hypervisor</groupid>
+      <groupid arch="ppc64le,s390x,x86_64">virtualization-tools</groupid>
     </grouplist>
     <optionlist>
       <groupid>network-file-system-client</groupid>
@@ -10198,7 +10200,7 @@
       <groupid>debugging</groupid>
       <groupid>dial-up</groupid>
       <groupid>hardware-monitoring</groupid>
-      <groupid>infiniband</groupid>
+      <groupid arch="aarch64,ppc64le,x86_64">infiniband</groupid>
       <groupid>large-systems</groupid>
       <groupid>legacy-unix</groupid>
       <groupid>mainframe-access</groupid>