diff --git a/comps-centos-8-stream.xml b/comps-centos-8-stream.xml
index 5025693..0f73b52 100644
--- a/comps-centos-8-stream.xml
+++ b/comps-centos-8-stream.xml
@@ -123,6 +123,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq variant="BaseOS">atlas-devel</packagereq>
+      <packagereq variant="BaseOS" arch="s390x">atlas-z14-devel</packagereq>
       <packagereq variant="BaseOS">audit-libs-devel</packagereq>
       <packagereq variant="BaseOS">bzip2-devel</packagereq>
       <packagereq variant="BaseOS">c-ares-devel</packagereq>
@@ -175,13 +176,13 @@
       <packagereq variant="AppStream">cups-devel</packagereq>
       <packagereq variant="AppStream">compat-libgfortran-48</packagereq>
       <packagereq variant="AppStream">dbus-glib-devel</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">evolution-data-server-devel</packagereq>
+      <packagereq variant="AppStream">evolution-data-server-devel</packagereq>
       <packagereq variant="AppStream" type="optional">flatpak</packagereq>
       <packagereq variant="AppStream" type="optional">flatpak-builder</packagereq>
       <packagereq variant="AppStream" type="optional">flatpak-session-helper</packagereq>
       <packagereq variant="AppStream" type="optional">flatpak-selinux</packagereq>
       <packagereq variant="AppStream">gd-devel</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">gnome-desktop3-devel</packagereq>
+      <packagereq variant="AppStream">gnome-desktop3-devel</packagereq>
       <packagereq variant="AppStream">gnutls-devel</packagereq>
       <packagereq variant="AppStream">gpm-devel</packagereq>
       <packagereq variant="AppStream">gstreamer1-devel</packagereq>
@@ -222,7 +223,7 @@
       <packagereq variant="AppStream">net-snmp-devel</packagereq>
       <packagereq variant="AppStream">newt-devel</packagereq>
       <packagereq variant="AppStream">openscap-devel</packagereq>
-      <packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">pulseaudio-libs-devel</packagereq>
+      <packagereq variant="AppStream">pulseaudio-libs-devel</packagereq>
       <packagereq variant="AppStream">protobuf-c</packagereq>
       <packagereq variant="AppStream">sane-backends-devel</packagereq>
       <packagereq variant="AppStream">scl-utils</packagereq>
@@ -559,8 +560,7 @@
       <packagereq variant="BaseOS" type="default">iwl2000-firmware</packagereq>
       <packagereq variant="BaseOS" type="default">iwl2030-firmware</packagereq>
       <packagereq variant="BaseOS" type="default">iwl3160-firmware</packagereq>
-      <packagereq variant="BaseOS" type="default">iwl3945-firmware</packagereq>
-      <packagereq variant="BaseOS" type="default">iwl4965-firmware</packagereq>
+      
       <packagereq variant="BaseOS" type="default">iwl5000-firmware</packagereq>
       <packagereq variant="BaseOS" type="default">iwl5150-firmware</packagereq>
       <packagereq variant="BaseOS" type="default">iwl6000-firmware</packagereq>
@@ -589,7 +589,6 @@
       <packagereq variant="BaseOS" type="optional">selinux-policy-mls</packagereq>
       <packagereq variant="BaseOS" type="optional" arch="x86_64">tboot</packagereq>
       <packagereq variant="AppStream" type="optional">initial-setup</packagereq>
-      <packagereq variant="AppStream" type="mandatory">dnf-plugin-spacewalk</packagereq>
     </packagelist>
   </group>
   <group>
@@ -661,6 +660,7 @@
       <packagereq variant="BaseOS" type="mandatory">strace</packagereq>
       <packagereq variant="BaseOS" type="default">elfutils</packagereq>
       <packagereq variant="BaseOS" type="default">kernel-tools</packagereq>
+      <packagereq variant="BaseOS" type="optional">memstrack</packagereq>
       <packagereq variant="BaseOS" type="default">trace-cmd</packagereq>
       <packagereq variant="BaseOS" type="optional" arch="x86_64">memtest86+</packagereq>
       <packagereq variant="AppStream" type="mandatory">gdb</packagereq>
@@ -676,6 +676,7 @@
       <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">bpftrace</packagereq>
+      <packagereq variant="AppStream" type="optional" arch="x86_64">xdp-tools</packagereq>
       <packagereq variant="AppStream" type="optional">gdb-gdbserver</packagereq>
       <packagereq variant="AppStream" type="optional">glibc-utils</packagereq>
       <packagereq variant="AppStream" type="optional">systemtap-client</packagereq>
@@ -751,12 +752,12 @@
       <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">crash-gcore-command</packagereq>
       <packagereq variant="AppStream" type="default" arch="x86_64">crash-ptdump-command</packagereq>
       <packagereq variant="AppStream" type="default">crash-trace-command</packagereq>
-      <packagereq variant="BaseOS" type="default" arch="aarch64,ppc64le,x86_64">libreport-gtk</packagereq>
+      <packagereq variant="BaseOS" type="default">libreport-gtk</packagereq>
       <packagereq variant="BaseOS" type="optional">tuna</packagereq>
       <packagereq variant="AppStream" type="optional">xrestop</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">abrt-desktop</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64">abrt-gui</packagereq>
-      <packagereq variant="AppStream" type="optional" arch="aarch64,ppc64le,x86_64">pcp-gui</packagereq>
+      <packagereq variant="AppStream" type="default">abrt-desktop</packagereq>
+      <packagereq variant="AppStream" type="optional">abrt-gui</packagereq>
+      <packagereq variant="AppStream" type="optional">pcp-gui</packagereq>
     </packagelist>
   </group>
   <group variant="BaseOS">
@@ -901,7 +902,7 @@
       <packagereq variant="BaseOS" type="optional">isns-utils</packagereq>
     </packagelist>
   </group>
-  <group arch="aarch64,x86_64,ppc64le">
+  <group arch="aarch64,s390x,x86_64,ppc64le">
     <id>gnome-desktop</id>
     <name>GNOME</name>
     <name xml:lang="af">GNOME</name>
@@ -1285,6 +1286,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="default" arch="x86_64">alsa-sof-firmware</packagereq>
       <packagereq type="default">bolt</packagereq>
       <packagereq type="default">iwl100-firmware</packagereq>
       <packagereq type="default">iwl1000-firmware</packagereq>
@@ -1293,8 +1295,7 @@
       <packagereq type="default">iwl2000-firmware</packagereq>
       <packagereq type="default">iwl2030-firmware</packagereq>
       <packagereq type="default">iwl3160-firmware</packagereq>
-      <packagereq type="default">iwl3945-firmware</packagereq>
-      <packagereq type="default">iwl4965-firmware</packagereq>
+      
       <packagereq type="default">iwl5000-firmware</packagereq>
       <packagereq type="default">iwl5150-firmware</packagereq>
       <packagereq type="default">iwl6000-firmware</packagereq>
@@ -2143,6 +2144,7 @@
       <packagereq variant="AppStream" type="optional">rsyslog-mysql</packagereq>
       <packagereq variant="AppStream" type="optional">rsyslog-pgsql</packagereq>
       <packagereq variant="AppStream" type="optional">rsyslog-relp</packagereq>
+      <packagereq variant="AppStream" type="optional">rsyslog-omamqp1</packagereq>
       <packagereq variant="AppStream" type="optional">tang</packagereq>
       <packagereq variant="AppStream" type="optional">tftp-server</packagereq>
     </packagelist>
@@ -2320,7 +2322,7 @@
       <packagereq variant="AppStream" type="default">pcp-export-pcp2xml</packagereq>
       <packagereq variant="AppStream" type="default">pcp-export-pcp2zabbix</packagereq>
       <packagereq variant="AppStream" type="default">pcp-export-zabbix-agent</packagereq>
-      <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">pcp-gui</packagereq>
+      <packagereq variant="AppStream" type="default">pcp-gui</packagereq>
       <packagereq variant="AppStream" type="default">pcp-import-collectl2pcp</packagereq>
       <packagereq variant="AppStream" type="default">pcp-import-ganglia2pcp</packagereq>
       <packagereq variant="AppStream" type="default">pcp-import-iostat2pcp</packagereq>
@@ -2328,7 +2330,6 @@
       <packagereq variant="AppStream" type="default">pcp-import-sar2pcp</packagereq>
       <packagereq variant="AppStream" type="default">pcp-libs</packagereq>
       <packagereq variant="AppStream" type="default">pcp-libs-devel</packagereq>
-      <packagereq variant="AppStream" type="default">pcp-manager</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-activemq</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-apache</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-bash</packagereq>
@@ -2340,7 +2341,6 @@
       <packagereq variant="AppStream" type="default">pcp-pmda-cisco</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-dbping</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-dm</packagereq>
-      <packagereq variant="AppStream" type="default">pcp-pmda-docker</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-ds389</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-ds389log</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-elasticsearch</packagereq>
@@ -2372,10 +2372,14 @@
       <packagereq variant="AppStream" type="default">pcp-pmda-nginx</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-nvidia-gpu</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-openmetrics</packagereq>
+      <packagereq variant="AppStream" type="default">pcp-pmda-openvswitch</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-oracle</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-pdns</packagereq>
       <packagereq variant="AppStream" type="default" arch="aarch64,ppc64le,x86_64">pcp-pmda-perfevent</packagereq>
+      <packagereq variant="AppStream" type="default">pcp-pmda-podman</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-postfix</packagereq>
+      <packagereq variant="AppStream" type="default">pcp-pmda-postgresql</packagereq>
+      <packagereq variant="AppStream" type="default">pcp-pmda-rabbitmq</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-redis</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-roomtemp</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-rpm</packagereq>
@@ -2386,6 +2390,7 @@
       <packagereq variant="AppStream" type="default">pcp-pmda-slurm</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-smart</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-snmp</packagereq>
+      <packagereq variant="AppStream" type="default">pcp-pmda-statsd</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-summary</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-systemd</packagereq>
       <packagereq variant="AppStream" type="default">pcp-pmda-trace</packagereq>
@@ -2396,7 +2401,6 @@
       <packagereq variant="AppStream" type="default">pcp-pmda-zswap</packagereq>
       <packagereq variant="AppStream" type="default">pcp-selinux</packagereq>
       <packagereq variant="AppStream" type="default">pcp-system-tools</packagereq>
-      <packagereq variant="AppStream" type="default">pcp-testsuite</packagereq>
       <packagereq variant="AppStream" type="default">grafana</packagereq>
       <packagereq variant="AppStream" type="default">grafana-pcp</packagereq>
       <packagereq variant="AppStream" type="default">pcp-zeroconf</packagereq>
@@ -2406,11 +2410,14 @@
       <packagereq variant="AppStream" type="default">perl-PCP-PMDA</packagereq>
       <packagereq variant="AppStream" type="default">python3-pcp</packagereq>
       <packagereq variant="AppStream" type="default">powertop</packagereq>
+      <packagereq variant="AppStream" type="optional">pcp-manager</packagereq>
+      <packagereq variant="AppStream" type="optional">pcp-pmda-docker</packagereq>
       <packagereq variant="AppStream" type="optional">fio</packagereq>
       <packagereq variant="AppStream" type="optional">tuned-utils</packagereq>
       <packagereq variant="AppStream" type="optional">iperf3</packagereq>
       <packagereq variant="AppStream" type="optional">systemtap</packagereq>
       <packagereq variant="AppStream" type="optional">valgrind</packagereq>
+      <packagereq variant="AppStream" type="optional">pcp-testsuite</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2639,6 +2646,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq variant="BaseOS" type="optional">atlas</packagereq>
+      <packagereq variant="BaseOS" type="optional" arch="s390x">atlas-z14</packagereq>
       <packagereq variant="BaseOS" type="optional">units</packagereq>
       <packagereq variant="AppStream" type="optional">fftw</packagereq>
       <packagereq variant="AppStream" type="optional">fftw-devel</packagereq>
@@ -2834,9 +2842,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq variant="BaseOS" type="mandatory">chrony</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release-eula</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release-stream</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">centos-stream-release</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">centos-stream-release-eula</packagereq>
       <packagereq variant="BaseOS" type="mandatory">polkit</packagereq>
       <packagereq variant="BaseOS" type="mandatory">realmd</packagereq>
       <packagereq variant="BaseOS" type="mandatory">timedatex</packagereq>
@@ -3045,9 +3052,8 @@
       <packagereq variant="BaseOS" type="mandatory">pciutils</packagereq>
       <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
       <packagereq variant="BaseOS" type="mandatory">quota</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release-eula</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release-stream</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">centos-stream-release</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">centos-stream-release-eula</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sudo</packagereq>
       <packagereq variant="BaseOS" type="mandatory">symlinks</packagereq>
       <packagereq variant="BaseOS" type="mandatory">systemd-udev</packagereq>
@@ -3077,6 +3083,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">plymouth</packagereq>
       <packagereq variant="BaseOS" type="default">realmd</packagereq>
@@ -3096,6 +3103,7 @@
       <packagereq variant="BaseOS" type="default">unzip</packagereq>
       <packagereq variant="BaseOS" type="default">usbutils</packagereq>
       <packagereq variant="BaseOS" type="default">vdo</packagereq>
+      <packagereq variant="BaseOS" type="optional">vdo-support</packagereq>
       <packagereq variant="BaseOS" type="default">kmod-kvdo</packagereq>
       <packagereq variant="BaseOS" type="default">virt-what</packagereq>
       <packagereq variant="BaseOS" type="default">which</packagereq>
@@ -3117,7 +3125,6 @@
       <packagereq variant="AppStream" type="default">tcpdump</packagereq>
       <packagereq variant="AppStream" type="default">wget</packagereq>
       <packagereq variant="AppStream" type="default">vim-enhanced</packagereq>
-      <packagereq variant="AppStream" type="default">dnf-plugin-spacewalk</packagereq>
       <packagereq variant="AppStream" type="default">insights-client</packagereq>
     </packagelist>
   </group>
@@ -3224,9 +3231,8 @@
       <packagereq variant="BaseOS" type="mandatory">pciutils</packagereq>
       <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
       <packagereq variant="BaseOS" type="mandatory">quota</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release-eula</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release-stream</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">centos-stream-release</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">centos-stream-release-eula</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sudo</packagereq>
       <packagereq variant="BaseOS" type="mandatory">symlinks</packagereq>
       <packagereq variant="BaseOS" type="mandatory">systemd-udev</packagereq>
@@ -3256,6 +3262,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">plymouth</packagereq>
       <packagereq variant="BaseOS" type="default">realmd</packagereq>
@@ -3275,6 +3282,7 @@
       <packagereq variant="BaseOS" type="default">unzip</packagereq>
       <packagereq variant="BaseOS" type="default">usbutils</packagereq>
       <packagereq variant="BaseOS" type="default">vdo</packagereq>
+      <packagereq variant="BaseOS" type="optional">vdo-support</packagereq>
       <packagereq variant="BaseOS" type="default">kmod-kvdo</packagereq>
       <packagereq variant="BaseOS" type="default">virt-what</packagereq>
       <packagereq variant="BaseOS" type="default">which</packagereq>
@@ -3961,7 +3969,7 @@
       <packagereq type="optional">mod_security_crs</packagereq>
     </packagelist>
   </group>
-  <group arch="aarch64,x86_64,ppc64le">
+  <group arch="aarch64,s390x,x86_64,ppc64le">
     <id>workstation-product</id>
     <name>Workstation product core</name>
     <name xml:lang="de">Workstation-Produktkern</name>
@@ -4028,9 +4036,8 @@
       <packagereq variant="BaseOS">psacct</packagereq>
       <packagereq variant="BaseOS">quota</packagereq>
       <packagereq variant="BaseOS">realmd</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release-eula</packagereq>
-      <packagereq variant="BaseOS" type="mandatory">centos-release-stream</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">centos-stream-release</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">centos-stream-release-eula</packagereq>
       <packagereq variant="BaseOS">rng-tools</packagereq>
       <packagereq variant="BaseOS">rsync</packagereq>
       <packagereq variant="BaseOS">sos</packagereq>
@@ -4064,7 +4071,6 @@
       <packagereq variant="AppStream">ibus-m17n</packagereq>
       <packagereq variant="AppStream">ibus-typing-booster</packagereq>
       <packagereq variant="AppStream">nmap-ncat</packagereq>
-      <packagereq variant="AppStream" arch="ppc64le,x86_64">pidgin</packagereq>
       <packagereq variant="AppStream">pinentry-gnome3</packagereq>
       <packagereq variant="AppStream">qgnomeplatform</packagereq>
       <packagereq variant="AppStream">qt5-qtbase</packagereq>
@@ -4758,6 +4764,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">open-vm-tools</packagereq>
+      <packagereq type="optional">open-vm-tools-sdmp</packagereq>
       <packagereq type="optional">open-vm-tools-desktop</packagereq>
     </packagelist>
   </group>
@@ -5567,6 +5574,7 @@
       <packagereq type="default">evolution-help</packagereq>
       <packagereq type="default">evolution-mapi</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">hexchat</packagereq>
+      <packagereq type="optional" arch="ppc64le,x86_64">pidgin</packagereq>
       <packagereq type="optional">thunderbird</packagereq>
     </packagelist>
   </group>
@@ -6295,6 +6303,7 @@
       <packagereq variant="AppStream" type="default">patchutils</packagereq>
       <packagereq variant="AppStream" type="default">perl-generators</packagereq>
       <packagereq variant="AppStream" type="default">perl-Fedora-VSP</packagereq>
+      <packagereq variant="AppStream" type="default">perl-Sys-Syslog</packagereq>
       <packagereq variant="AppStream" type="default" arch="aarch64,x86_64">pesign</packagereq>
       <packagereq variant="AppStream" type="default">source-highlight</packagereq>
       <packagereq variant="AppStream" type="default">systemtap</packagereq>
@@ -6425,24 +6434,14 @@
     <name xml:lang="ru">.NET Разработка ядра .NET</name>
     <name xml:lang="zh_CN">.NET 核心开发</name>
     <name xml:lang="zh_TW">.NET核心開發</name>
-    <description>Tools to develop .NET applications</description>
-    <description xml:lang="de">Tools zur Entwicklung von .NET-Anwendungen</description>
-    <description xml:lang="es">Herramientas para desarrollar aplicaciones.NET</description>
-    <description xml:lang="fr">Outils pour développer les applications .NET</description>
-    <description xml:lang="it">Strumenti per sviluppare applicazioni .NET</description>
-    <description xml:lang="ja">.NET アプリケーション開発用ツール</description>
-    <description xml:lang="ko">.NET 애플리케이션 개발을 위한 툴 </description>
-    <description xml:lang="pt">Ferramentas para desenvolver aplicações .net</description>
-    <description xml:lang="pt_BR">Ferramentas para desenvolver aplicações .net</description>
-    <description xml:lang="ru">Инструменты для разработки приложений .NET</description>
-    <description xml:lang="zh_CN">开发 .NET 应用程序的工具</description>
-    <description xml:lang="zh_TW">開發.NET應用程序的工具</description>
+    <description>Tools to develop .NET and .NET Core applications</description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional" arch="x86_64">dotnet-sdk-2.1</packagereq>
       <packagereq type="optional" arch="x86_64">dotnet-sdk-3.0</packagereq>
       <packagereq type="optional" arch="x86_64">dotnet-sdk-3.1</packagereq>
+      <packagereq type="optional" arch="x86_64">dotnet-sdk-5.0</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -7776,11 +7775,14 @@
       <packagereq type="optional" arch="x86_64">resource-agents-aliyun</packagereq>
     </packagelist>
   </group>
-
   <group>
     <id>rt</id>
     <name>RT</name>
-    <description>RHEL for Realtime packages.</description>
+    <name xml:lang="fr">RT</name>
+    <name xml:lang="ja">RT</name>
+    <name xml:lang="ko">RT</name>
+    <name xml:lang="zh_CN">RT</name>
+    <description>CentOS for Realtime packages.</description>
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">kernel-rt</packagereq>
@@ -7789,16 +7791,81 @@
       <packagereq type="default">kernel-rt-modules-extra</packagereq>
       <packagereq type="default">kernel-rt-devel</packagereq>
       <packagereq type="default">rt-setup</packagereq>
-      <packagereq type="default">rt-tests</packagereq>
       <packagereq type="default">rteval</packagereq>
       <packagereq type="default">rteval-loads</packagereq>
+      <packagereq type="optional">stress-ng</packagereq>
       <packagereq type="default">tuned-profiles-realtime</packagereq>
     </packagelist>
   </group>
   <group>
     <id>rt-debug</id>
     <name>RT-debug</name>
-    <description>RHEL for Realtime debug packages.</description>
+    <name xml:lang="de">RT-debug</name>
+    <name xml:lang="es">RT-depuración</name>
+    <name xml:lang="fr">RT-debug</name>
+    <name xml:lang="it">RT-debug</name>
+    <name xml:lang="ja">RT-debug</name>
+    <name xml:lang="ko">RT-debug</name>
+    <name xml:lang="pt">RT-debug</name>
+    <name xml:lang="pt_BR">RT-debug</name>
+    <name xml:lang="ru">RT-отладка</name>
+    <name xml:lang="zh_CN">RT-debug</name>
+    <name xml:lang="zh_TW">RT-debug</name>
+    <description>CentOS for Realtime debug packages.</description>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">kernel-rt-debug</packagereq>
+      <packagereq type="default">kernel-rt-debug-core</packagereq>
+      <packagereq type="default">kernel-rt-debug-modules</packagereq>
+      <packagereq type="default">kernel-rt-debug-modules-extra</packagereq>
+      <packagereq type="default">kernel-rt-debug-devel</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>nfv</id>
+    <name>NFV</name>
+    <name xml:lang="de">NFV</name>
+    <name xml:lang="es">NFV</name>
+    <name xml:lang="fr">NFV</name>
+    <name xml:lang="it">NFV</name>
+    <name xml:lang="ja">NFV</name>
+    <name xml:lang="ko">NFV</name>
+    <name xml:lang="pt">NFV</name>
+    <name xml:lang="pt_BR">NFV</name>
+    <name xml:lang="ru">ВНЕДОРОЖНИК</name>
+    <name xml:lang="zh_CN">NFV</name>
+    <name xml:lang="zh_TW">NFV</name>
+    <description>CentOS for Realtime for NFV packages.</description>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">kernel-rt</packagereq>
+      <packagereq type="default">kernel-rt-core</packagereq>
+      <packagereq type="default">kernel-rt-modules</packagereq>
+      <packagereq type="default">kernel-rt-modules-extra</packagereq>
+      <packagereq type="default">kernel-rt-kvm</packagereq>
+      <packagereq type="default">kernel-rt-devel</packagereq>
+      <packagereq type="default">rt-setup</packagereq>
+      <packagereq type="default">tuned-profiles-nfv</packagereq>
+      <packagereq type="default">tuned-profiles-nfv-host</packagereq>
+      <packagereq type="default">tuned-profiles-nfv-host-bin</packagereq>
+      <packagereq type="default">tuned-profiles-nfv-guest</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>nfv-debug</id>
+    <name>NFV-debug</name>
+    <name xml:lang="de">NFV-Debugging</name>
+    <name xml:lang="es">NFV-debug</name>
+    <name xml:lang="fr">NFV-debug</name>
+    <name xml:lang="it">NFV-debug</name>
+    <name xml:lang="ja">NFV-debug</name>
+    <name xml:lang="ko">NFV-debug</name>
+    <name xml:lang="pt">NFV-debug</name>
+    <name xml:lang="pt_BR">NFV-debug</name>
+    <name xml:lang="ru">NFV-отладчик</name>
+    <name xml:lang="zh_CN">NFV-debug</name>
+    <name xml:lang="zh_TW">NFV-debug</name>
+    <description>CentOS for Realtime for NFV debug packages.</description>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">kernel-rt-debug</packagereq>
@@ -7806,9 +7873,9 @@
       <packagereq type="default">kernel-rt-debug-modules</packagereq>
       <packagereq type="default">kernel-rt-debug-modules-extra</packagereq>
       <packagereq type="default">kernel-rt-debug-devel</packagereq>
+      <packagereq type="default">kernel-rt-debug-kvm</packagereq>
     </packagelist>
   </group>
-
   <group variant="PowerTools">
     <id>centos-powertools</id>
     <name>CentOS PowerTools</name>
@@ -7816,7 +7883,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">accountsservice-devel</packagereq>
+      <packagereq type="default">accountsservice-devel</packagereq>
       <packagereq type="default">ant-junit</packagereq>
       <packagereq type="default">antlr-C++</packagereq>
       <packagereq type="default">antlr-tool</packagereq>
@@ -7841,6 +7908,9 @@
       <packagereq type="default">avahi-compat-libdns_sd</packagereq>
       <packagereq type="default">avahi-compat-libdns_sd-devel</packagereq>
       <packagereq type="default">avahi-devel</packagereq>
+      <packagereq type="default">avahi-glib-devel</packagereq>
+      <packagereq type="default">avahi-gobject-devel</packagereq>
+      <packagereq type="default">avahi-ui-devel</packagereq>
       <packagereq type="default">babl-devel</packagereq>
       <packagereq type="default">babl-devel-docs</packagereq>
       <packagereq type="default">bcc-devel</packagereq>
@@ -7866,14 +7936,14 @@
       <packagereq type="default">boost-python3</packagereq>
       <packagereq type="default">boost-python3-devel</packagereq>
       <packagereq type="default">boost-static</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">brasero-devel</packagereq>
+      <packagereq type="default">brasero-devel</packagereq>
       <packagereq type="default">brlapi-devel</packagereq>
       <packagereq type="default">brotli-devel</packagereq>
       <packagereq type="default">bsf</packagereq>
       <packagereq type="default">bsh</packagereq>
       <packagereq type="default">cairomm-devel</packagereq>
       <packagereq type="default">cairomm-doc</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">cdparanoia-devel</packagereq>
+      <packagereq type="default">cdparanoia-devel</packagereq>
       <packagereq type="default">celt051-devel</packagereq>
       <packagereq type="default">cglib</packagereq>
       <packagereq type="default">clucene-core-devel</packagereq>
@@ -7886,7 +7956,7 @@
       <packagereq type="default">cogl-doc</packagereq>
       <packagereq type="default">colord-devel</packagereq>
       <packagereq type="default">colord-devel-docs</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">colord-gtk-devel</packagereq>
+      <packagereq type="default">colord-gtk-devel</packagereq>
       <packagereq type="default">compat-guile18</packagereq>
       <packagereq type="default">compat-guile18-devel</packagereq>
       <packagereq type="default">corosync-vqsim</packagereq>
@@ -7906,7 +7976,7 @@
       <packagereq type="default">dbus-c++-glib</packagereq>
       <packagereq type="default">dconf-devel</packagereq>
       <packagereq type="default">dejagnu</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">devhelp-devel</packagereq>
+      <packagereq type="default">devhelp-devel</packagereq>
       <packagereq type="default">device-mapper-devel</packagereq>
       <packagereq type="default">device-mapper-event-devel</packagereq>
       <packagereq type="default">device-mapper-multipath-devel</packagereq>
@@ -7938,14 +8008,14 @@
       <packagereq type="default">enca</packagereq>
       <packagereq type="default">enca-devel</packagereq>
       <packagereq type="default" arch="ppc64le,x86_64">enchant2-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">enchant-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">evolution-data-server-doc</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">evolution-data-server-perl</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">evolution-data-server-tests</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">evolution-devel</packagereq>
+      <packagereq type="default">enchant-devel</packagereq>
+      <packagereq type="default">evolution-data-server-doc</packagereq>
+      <packagereq type="default">evolution-data-server-perl</packagereq>
+      <packagereq type="default">evolution-data-server-tests</packagereq>
+      <packagereq type="default">evolution-devel</packagereq>
       <packagereq type="default">execstack</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">exempi-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">exiv2-devel</packagereq>
+      <packagereq type="default">exempi-devel</packagereq>
+      <packagereq type="default">exiv2-devel</packagereq>
       <packagereq type="default">exiv2-doc</packagereq>
       <packagereq type="default">felix-utils</packagereq>
       <packagereq type="default">fftw-doc</packagereq>
@@ -8014,8 +8084,8 @@
       <packagereq type="default">gmock</packagereq>
       <packagereq type="default">gmock-devel</packagereq>
       <packagereq type="default" arch="aarch64,x86_64,ppc64le">gnome-bluetooth-libs-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gnome-common</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gnome-menus-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">gnuplot-doc</packagereq>
@@ -8030,10 +8100,10 @@
       <packagereq type="default">graphviz-doc</packagereq>
       <packagereq type="default">graphviz-gd</packagereq>
       <packagereq type="default">graphviz-python3</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">grilo-devel</packagereq>
+      <packagereq type="default">grilo-devel</packagereq>
       <packagereq type="default">gsm-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gspell-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gspell-doc</packagereq>
+      <packagereq type="default">gspell-devel</packagereq>
+      <packagereq type="default">gspell-doc</packagereq>
       <packagereq type="default">gssdp-devel</packagereq>
       <packagereq type="default">gssdp-docs</packagereq>
       <packagereq type="default">gstreamer1-plugins-bad-free-devel</packagereq>
@@ -8046,8 +8116,8 @@
       <packagereq type="default">gtkmm30-devel</packagereq>
       <packagereq type="default">gtkmm30-doc</packagereq>
       <packagereq type="default">gtksourceview3-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gtkspell3-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">gtkspell-devel</packagereq>
+      <packagereq type="default">gtkspell3-devel</packagereq>
+      <packagereq type="default">gtkspell-devel</packagereq>
       <packagereq type="default">guile-devel</packagereq>
       <packagereq type="default">gupnp-devel</packagereq>
       <packagereq type="default">gupnp-igd-devel</packagereq>
@@ -8111,6 +8181,7 @@
       <packagereq type="default">libasyncns-devel</packagereq>
       <packagereq type="default">libatasmart-devel</packagereq>
       <packagereq type="default">libatomic_ops-devel</packagereq>
+      <packagereq type="default">libbabeltrace-devel</packagereq>
       <packagereq type="default">libbasicobjects-devel</packagereq>
       <packagereq type="default">libblockdev-devel</packagereq>
       <packagereq type="default">libblockdev-crypto-devel</packagereq>
@@ -8248,6 +8319,7 @@
       <packagereq type="default" arch="x86_64">libvmmalloc-debug</packagereq>
       <packagereq type="default">libproxy-devel</packagereq>
       <packagereq type="default">libpsm2-devel</packagereq>
+      <packagereq type="default">libpsl-devel</packagereq>
       <packagereq type="default">libpurple-devel</packagereq>
       <packagereq type="default">libpwquality-devel</packagereq>
       <packagereq type="default">libqhull</packagereq>
@@ -8272,6 +8344,7 @@
       <packagereq type="default">libsass</packagereq>
       <packagereq type="default">libsass-devel</packagereq>
       <packagereq type="default">libseccomp-devel</packagereq>
+      <packagereq type="default">libsemanage-devel</packagereq>
       <packagereq type="default">libsepol-static</packagereq>
       <packagereq type="default">libshout-devel</packagereq>
       <packagereq type="default">libsigc++20-devel</packagereq>
@@ -8294,6 +8367,7 @@
       <packagereq type="default">libunicap-devel</packagereq>
       <packagereq type="default">libuninameslist</packagereq>
       <packagereq type="default">libunistring-devel</packagereq>
+      <packagereq type="default">liburing-devel</packagereq>
       <packagereq type="default">libusb-devel</packagereq>
       <packagereq type="default">libusbmuxd-devel</packagereq>
       <packagereq type="default">libutempter-devel</packagereq>
@@ -8486,10 +8560,10 @@
       <packagereq type="default">msv-msv</packagereq>
       <packagereq type="default">mtdev-devel</packagereq>
       <packagereq type="default">munge-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">mutter-devel</packagereq>
+      <packagereq type="default">mutter-devel</packagereq>
       <packagereq type="default">mythes-devel</packagereq>
       <packagereq type="default">nasm</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">nautilus-devel</packagereq>
+      <packagereq type="default">nautilus-devel</packagereq>
       <packagereq type="default">ndctl-devel</packagereq>
       <packagereq type="default">neon-devel</packagereq>
       <packagereq type="default">netpbm-devel</packagereq>
@@ -8554,6 +8628,7 @@
       <packagereq type="default">pangomm-doc</packagereq>
       <packagereq type="default">papi-testsuite</packagereq>
       <packagereq type="default">parted-devel</packagereq>
+      <packagereq type="default">pcre2-tools</packagereq>
       <packagereq type="default">pcre-static</packagereq>
       <packagereq type="default">pcsc-lite-devel</packagereq>
       <packagereq type="default">perl-AnyEvent</packagereq>
@@ -8776,11 +8851,11 @@
       <packagereq type="default">qt5-qtquickcontrols2-devel</packagereq>
       <packagereq type="default">qt5-qttools-static</packagereq>
       <packagereq type="default">qt5-qtwayland-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">raptor2-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">rasqal-devel</packagereq>
+      <packagereq type="default">raptor2-devel</packagereq>
+      <packagereq type="default">rasqal-devel</packagereq>
       <packagereq type="default">re2c</packagereq>
       <packagereq type="default">recode-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">redland-devel</packagereq>
+      <packagereq type="default">redland-devel</packagereq>
       <packagereq type="default">rpcgen</packagereq>
       <packagereq type="default">rpcsvc-proto-devel</packagereq>
       <packagereq type="default">rrdtool-devel</packagereq>
@@ -8848,8 +8923,8 @@
       <packagereq type="default">turbojpeg-devel</packagereq>
       <packagereq type="default">uglify-js</packagereq>
       <packagereq type="default">uid_wrapper</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">upower-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">upower-devel-docs</packagereq>
+      <packagereq type="default">upower-devel</packagereq>
+      <packagereq type="default">upower-devel-docs</packagereq>
       <packagereq type="default">urw-base35-fonts-devel</packagereq>
       <packagereq type="default">usbredir-devel</packagereq>
       <packagereq type="default">userspace-rcu-devel</packagereq>
@@ -8904,7 +8979,7 @@
       <packagereq type="default">yajl-devel</packagereq>
       <packagereq type="default">yaml-cpp-devel</packagereq>
       <packagereq type="default">yasm</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">yelp-devel</packagereq>
+      <packagereq type="default">yelp-devel</packagereq>
       <packagereq type="default">zlib-static</packagereq>
       <packagereq type="default">zziplib-devel</packagereq>
     </packagelist>
@@ -9045,7 +9120,7 @@
       <groupid>virtualization-hypervisor</groupid>
     </optionlist>
   </environment>
-  <environment arch="aarch64,ppc64le,x86_64">
+  <environment arch="aarch64,s390x,ppc64le,x86_64">
     <id>graphical-server-environment</id>
     <name>Server with GUI</name>
     <name xml:lang="as">GUI ৰ সৈতে চাৰ্ভাৰ</name>
@@ -9099,6 +9174,7 @@
       <groupid>hardware-support</groupid>
       <groupid>hardware-monitoring</groupid>
       <groupid>headless-management</groupid>
+      <groupid>input-methods</groupid>
       <groupid>internet-browser</groupid>
       <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
@@ -10093,7 +10169,7 @@
       <groupid>scientific</groupid>
     </grouplist>
   </category>
-  <category arch="aarch64,ppc64le,x86_64">
+  <category arch="aarch64,s390x,ppc64le,x86_64">
     <id>desktops</id>
     <name>Desktops</name>
     <name xml:lang="af">Werkskerms</name>
@@ -10365,4 +10441,4 @@
       <groupid>office-suite</groupid>
     </grouplist>
   </category>
-</comps>
+</comps>
\ No newline at end of file