From f0ba2760d9e91c005ddf142f5d0e6031684e3a89 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Wed, 22 Jan 2025 18:14:22 +0300
Subject: [PATCH] Rename Certified variant to OS

---
 comps.xml                          | 3630 ++++++++++++++--------------
 msvsphere-9.conf                   |    2 +-
 msvsphere/additional_packages.conf |   10 +-
 msvsphere/filter_packages.conf     |    2 +-
 msvsphere/general.conf             |   11 +-
 prepopulate.json                   |    2 +-
 variants.xml                       |    2 +-
 7 files changed, 1834 insertions(+), 1825 deletions(-)

diff --git a/comps.xml b/comps.xml
index 88a88bc..6f57db3 100644
--- a/comps.xml
+++ b/comps.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//MSVSphere//DTD Comps info//EN" "comps.dtd">
 <comps>
-  <group variant="Certified">
+  <group variant="OS">
     <id>sphere-core-certified</id>
     <name>Core Certified</name>
     <description>Release files for Certified</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">sphere-release-identity-certified</packagereq>
+      <packagereq variant="OS" type="mandatory">sphere-release-identity-certified</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>additional-devel</id>
     <name>Additional Development</name>
     <name xml:lang="as">অতিৰিক্ত উন্নয়ন</name>
@@ -72,115 +72,115 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">hmaccalc</packagereq>
-      <packagereq variant="Certified" type="mandatory">lz4</packagereq>
-      <packagereq variant="Certified" type="mandatory">lzo</packagereq>
-      <packagereq variant="Certified" type="mandatory">alsa-lib-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">atlas-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">audit-libs-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">binutils-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">boost-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">bzip2-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">c-ares-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">compat-libgfortran-48</packagereq>
-      <packagereq variant="Certified" type="mandatory">cups-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">cyrus-sasl-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">dbus-glib-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">e2fsprogs-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">elfutils-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">elfutils-libelf-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">evolution-data-server-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">expat-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">fuse3-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gd-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gmp-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-desktop3-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnutls-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gpm-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gstreamer1-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gstreamer1-plugins-base-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gvfs-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">hunspell-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">iptables-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">java-1.8.0-openjdk-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libacl-devel</packagereq>
-	  <packagereq variant="Certified" type="mandatory">libaio-devel</packagereq>
-	  <packagereq variant="Certified" type="mandatory">libarchive-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libattr-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libblkid-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libcanberra-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libcap-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libcap-ng-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libcurl-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libdrm-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libffi-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libgcrypt-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libnl3-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libnotify-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpfm-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpmem-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpmemblk-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpmemlog-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpmemobj++-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpmemobj++-doc</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpmemobj-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpmempool-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpq-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">librsvg2-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">librsvg2-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">libselinux-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libsoup-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libssh-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libtiff-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libusbx-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libuuid-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libva-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXau-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXaw-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXinerama-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXmu-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXpm-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXrandr-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libxslt-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">lksctp-tools-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">lz4-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">lzo-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">motif-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">mpfr-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">net-snmp-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">newt-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">numactl-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">openscap-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">papi-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">pciutils-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">pcre-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">pipewire-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">pipewire-jack-audio-connection-kit-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">polkit-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">popt-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">rdma-core-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">readline-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">sane-backends-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">scl-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">scl-utils-build</packagereq>
-      <packagereq variant="Certified" type="mandatory">SDL2-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">slang-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">sqlite-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">startup-notification-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">systemd-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">tbb-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">tcl-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">tk-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">xfsprogs-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-proto-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">xz-devel</packagereq>
-      <packagereq variant="Certified" type="optional">flatpak</packagereq>
-      <packagereq variant="Certified" type="optional">flatpak-builder</packagereq>
-      <packagereq variant="Certified" type="optional">flatpak-selinux</packagereq>
-      <packagereq variant="Certified" type="optional">flatpak-session-helper</packagereq>
+      <packagereq variant="OS" type="mandatory">hmaccalc</packagereq>
+      <packagereq variant="OS" type="mandatory">lz4</packagereq>
+      <packagereq variant="OS" type="mandatory">lzo</packagereq>
+      <packagereq variant="OS" type="mandatory">alsa-lib-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">atlas-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">audit-libs-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">binutils-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">boost-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">bzip2-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">c-ares-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">compat-libgfortran-48</packagereq>
+      <packagereq variant="OS" type="mandatory">cups-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">cyrus-sasl-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">dbus-glib-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">e2fsprogs-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">elfutils-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">elfutils-libelf-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">evolution-data-server-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">expat-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">fuse3-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gd-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gmp-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-desktop3-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gnutls-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gpm-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gstreamer1-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gstreamer1-plugins-base-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gvfs-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">hunspell-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">iptables-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">java-1.8.0-openjdk-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libacl-devel</packagereq>
+	  <packagereq variant="OS" type="mandatory">libaio-devel</packagereq>
+	  <packagereq variant="OS" type="mandatory">libarchive-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libattr-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libblkid-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libcanberra-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libcap-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libcap-ng-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libcurl-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libdrm-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libffi-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libgcrypt-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libnl3-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libnotify-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libpfm-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libpmem-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libpmemblk-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libpmemlog-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libpmemobj++-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libpmemobj++-doc</packagereq>
+      <packagereq variant="OS" type="mandatory">libpmemobj-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libpmempool-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libpq-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">librsvg2-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">librsvg2-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">libselinux-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libsoup-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libssh-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libtiff-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libusbx-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libuuid-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libva-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXau-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXaw-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXinerama-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXmu-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXpm-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXrandr-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libxslt-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">lksctp-tools-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">lz4-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">lzo-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">motif-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">mpfr-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">net-snmp-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">newt-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">numactl-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">openscap-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">papi-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">pciutils-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">pcre-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">pipewire-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">pipewire-jack-audio-connection-kit-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">polkit-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">popt-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">rdma-core-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">readline-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">sane-backends-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">scl-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">scl-utils-build</packagereq>
+      <packagereq variant="OS" type="mandatory">SDL2-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">slang-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">sqlite-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">startup-notification-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">systemd-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">tbb-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">tcl-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">tk-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">xfsprogs-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-proto-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">xz-devel</packagereq>
+      <packagereq variant="OS" type="optional">flatpak</packagereq>
+      <packagereq variant="OS" type="optional">flatpak-builder</packagereq>
+      <packagereq variant="OS" type="optional">flatpak-selinux</packagereq>
+      <packagereq variant="OS" type="optional">flatpak-session-helper</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>anaconda-tools</id>
     <name>Anaconda tools</name>
     <name xml:lang="de">Anaconda-Werkzeuge</name>
@@ -196,39 +196,39 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">chrony</packagereq>
-      <packagereq variant="Certified" type="mandatory">cryptsetup</packagereq>
-      <packagereq variant="Certified" type="mandatory">device-mapper-multipath</packagereq>
-      <packagereq variant="Certified" type="mandatory">dosfstools</packagereq>
-      <packagereq variant="Certified" type="mandatory">dracut-network</packagereq>
-      <packagereq variant="Certified" type="mandatory">e2fsprogs</packagereq>
-      <packagereq variant="Certified" type="mandatory">efibootmgr</packagereq>
-      <packagereq variant="Certified" type="mandatory">fcoe-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">firewalld</packagereq>
-      <packagereq variant="Certified" type="mandatory">glibc-all-langpacks</packagereq>
-      <packagereq variant="Certified" type="mandatory">grub2-efi-x64</packagereq>
-      <packagereq variant="Certified" type="mandatory">grub2-efi-x64-cdboot</packagereq>
-      <packagereq variant="Certified" type="mandatory">grub2-pc</packagereq>
-      <packagereq variant="Certified" type="mandatory">grub2-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">grub2-tools-efi</packagereq>
-      <packagereq variant="Certified" type="mandatory">grub2-tools-extra</packagereq>
-      <packagereq variant="Certified" type="mandatory">iscsi-initiator-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">lvm2</packagereq>
-      <packagereq variant="Certified" type="mandatory">mdadm</packagereq>
-      <packagereq variant="Certified" type="mandatory">realmd</packagereq>
-      <packagereq variant="Certified" type="mandatory">restore</packagereq>
-      <packagereq variant="Certified" type="mandatory">shim-x64</packagereq>
-      <packagereq variant="Certified" type="mandatory">syslinux-extlinux</packagereq>
-      <packagereq variant="Certified" type="mandatory">teamd</packagereq>
-      <packagereq variant="Certified" type="mandatory">tmux</packagereq>
-      <packagereq variant="Certified" type="mandatory">xfsprogs</packagereq>
-      <packagereq variant="Certified" type="mandatory">authselect-compat</packagereq>
-      <packagereq variant="Certified" type="mandatory">kdump-anaconda-addon</packagereq>
-      <packagereq variant="Certified" type="mandatory">libblockdev-plugins-all</packagereq>
-      <packagereq variant="Certified" type="mandatory">libreport-plugin-bugzilla</packagereq>
+      <packagereq variant="OS" type="mandatory">chrony</packagereq>
+      <packagereq variant="OS" type="mandatory">cryptsetup</packagereq>
+      <packagereq variant="OS" type="mandatory">device-mapper-multipath</packagereq>
+      <packagereq variant="OS" type="mandatory">dosfstools</packagereq>
+      <packagereq variant="OS" type="mandatory">dracut-network</packagereq>
+      <packagereq variant="OS" type="mandatory">e2fsprogs</packagereq>
+      <packagereq variant="OS" type="mandatory">efibootmgr</packagereq>
+      <packagereq variant="OS" type="mandatory">fcoe-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">firewalld</packagereq>
+      <packagereq variant="OS" type="mandatory">glibc-all-langpacks</packagereq>
+      <packagereq variant="OS" type="mandatory">grub2-efi-x64</packagereq>
+      <packagereq variant="OS" type="mandatory">grub2-efi-x64-cdboot</packagereq>
+      <packagereq variant="OS" type="mandatory">grub2-pc</packagereq>
+      <packagereq variant="OS" type="mandatory">grub2-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">grub2-tools-efi</packagereq>
+      <packagereq variant="OS" type="mandatory">grub2-tools-extra</packagereq>
+      <packagereq variant="OS" type="mandatory">iscsi-initiator-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">lvm2</packagereq>
+      <packagereq variant="OS" type="mandatory">mdadm</packagereq>
+      <packagereq variant="OS" type="mandatory">realmd</packagereq>
+      <packagereq variant="OS" type="mandatory">restore</packagereq>
+      <packagereq variant="OS" type="mandatory">shim-x64</packagereq>
+      <packagereq variant="OS" type="mandatory">syslinux-extlinux</packagereq>
+      <packagereq variant="OS" type="mandatory">teamd</packagereq>
+      <packagereq variant="OS" type="mandatory">tmux</packagereq>
+      <packagereq variant="OS" type="mandatory">xfsprogs</packagereq>
+      <packagereq variant="OS" type="mandatory">authselect-compat</packagereq>
+      <packagereq variant="OS" type="mandatory">kdump-anaconda-addon</packagereq>
+      <packagereq variant="OS" type="mandatory">libblockdev-plugins-all</packagereq>
+      <packagereq variant="OS" type="mandatory">libreport-plugin-bugzilla</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>backup-client</id>
     <name>Backup Client</name>
     <name xml:lang="as">বেক-আপ ক্লাএন্ট</name>
@@ -294,11 +294,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="optional">bacula-client</packagereq>
-      <packagereq variant="Certified" type="optional">rear</packagereq>
+      <packagereq variant="OS" type="optional">bacula-client</packagereq>
+      <packagereq variant="OS" type="optional">rear</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>base</id>
     <name>Base</name>
     <name xml:lang="af">Basis</name>
@@ -389,91 +389,91 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">acl</packagereq>
-      <packagereq variant="Certified" type="mandatory">sphere-release</packagereq>
-      <packagereq variant="Certified" type="mandatory">at</packagereq>
-      <packagereq variant="Certified" type="mandatory">attr</packagereq>
-      <packagereq variant="Certified" type="mandatory">bc</packagereq>
-      <packagereq variant="Certified" type="mandatory">cpio</packagereq>
-      <packagereq variant="Certified" type="mandatory">crontabs</packagereq>
-      <packagereq variant="Certified" type="mandatory">cyrus-sasl-plain</packagereq>
-      <packagereq variant="Certified" type="mandatory">dbus</packagereq>
-      <packagereq variant="Certified" type="mandatory">ed</packagereq>
-      <packagereq variant="Certified" type="mandatory">file</packagereq>
-      <packagereq variant="Certified" type="mandatory">irqbalance</packagereq>
-      <packagereq variant="Certified" type="mandatory">logrotate</packagereq>
-      <packagereq variant="Certified" type="mandatory">lsof</packagereq>
-      <packagereq variant="Certified" type="mandatory">mcelog</packagereq>
-      <packagereq variant="Certified" type="mandatory">microcode_ctl</packagereq>
-      <packagereq variant="Certified" type="mandatory">net-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">pciutils</packagereq>
-      <packagereq variant="Certified" type="mandatory">psacct</packagereq>
-      <packagereq variant="Certified" type="mandatory">quota</packagereq>
-      <packagereq variant="Certified" type="mandatory">sudo</packagereq>
-      <packagereq variant="Certified" type="mandatory">symlinks</packagereq>
-      <packagereq variant="Certified" type="mandatory">systemd-udev</packagereq>
-      <packagereq variant="Certified" type="mandatory">tar</packagereq>
-      <packagereq variant="Certified" type="mandatory">tree</packagereq>
-      <packagereq variant="Certified" type="mandatory">tuned</packagereq>
-      <packagereq variant="Certified" type="mandatory">util-linux-user</packagereq>
-      <packagereq variant="Certified" type="default">bash-completion</packagereq>
-      <packagereq variant="Certified" type="default">bluez</packagereq>
-      <packagereq variant="Certified" type="default">bzip2</packagereq>
-      <packagereq variant="Certified" type="default">chrony</packagereq>
-      <packagereq variant="Certified" type="default">cockpit</packagereq>
-      <packagereq variant="Certified" type="default">cryptsetup</packagereq>
-      <packagereq variant="Certified" type="default">dos2unix</packagereq>
-      <packagereq variant="Certified" type="default">dosfstools</packagereq>
-      <packagereq variant="Certified" type="default">ethtool</packagereq>
-      <packagereq variant="Certified" type="default">gnupg2</packagereq>
-      <packagereq variant="Certified" type="default">iprutils</packagereq>
-      <packagereq variant="Certified" type="default">ledmon</packagereq>
-      <packagereq variant="Certified" type="default">lvm2</packagereq>
-      <packagereq variant="Certified" type="default">mailcap</packagereq>
-      <packagereq variant="Certified" type="default">man-pages</packagereq>
-      <packagereq variant="Certified" type="default">mdadm</packagereq>
-      <packagereq variant="Certified" type="default">mlocate</packagereq>
-      <packagereq variant="Certified" type="default">mtr</packagereq>
-      <packagereq variant="Certified" type="default">nano</packagereq>
-      <packagereq variant="Certified" type="default">nvme-cli</packagereq>
-      <packagereq variant="Certified" type="default">realmd</packagereq>
-      <packagereq variant="Certified" type="default">rsync</packagereq>
-      <packagereq variant="Certified" type="default">smartmontools</packagereq>
-      <packagereq variant="Certified" type="default">sos</packagereq>
-      <packagereq variant="Certified" type="default">sssd</packagereq>
-      <packagereq variant="Certified" type="default">strace</packagereq>
-      <packagereq variant="Certified" type="default">teamd</packagereq>
-      <packagereq variant="Certified" type="default">time</packagereq>
-      <packagereq variant="Certified" type="default">unzip</packagereq>
-      <packagereq variant="Certified" type="default">usbutils</packagereq>
-      <packagereq variant="Certified" type="default">virt-what</packagereq>
-      <packagereq variant="Certified" type="default">which</packagereq>
-      <packagereq variant="Certified" type="default">words</packagereq>
-      <packagereq variant="Certified" type="default">xfsdump</packagereq>
-      <packagereq variant="Certified" type="default">zip</packagereq>
-      <packagereq variant="Certified" type="optional">cifs-utils</packagereq>
-      <packagereq variant="Certified" type="optional">cockpit-doc</packagereq>
-      <packagereq variant="Certified" type="optional">fwupd</packagereq>
-      <packagereq variant="Certified" type="optional">ima-evm-utils</packagereq>
-      <packagereq variant="Certified" type="optional">nfs-utils</packagereq>
-      <packagereq variant="Certified" type="optional">nvmetcli</packagereq>
-      <packagereq variant="Certified" type="optional">traceroute</packagereq>
-      <packagereq variant="Certified" type="optional">zsh</packagereq>
-      <packagereq variant="Certified" type="mandatory">rsyslog-gnutls</packagereq>
-      <packagereq variant="Certified" type="mandatory">rsyslog-gssapi</packagereq>
-      <packagereq variant="Certified" type="mandatory">rsyslog-relp</packagereq>
-      <packagereq variant="Certified" type="default">blktrace</packagereq>
-      <packagereq variant="Certified" type="default">fprintd-pam</packagereq>
-      <packagereq variant="Certified" type="default">libstoragemgmt</packagereq>
-      <packagereq variant="Certified" type="default">nmap-ncat</packagereq>
-      <packagereq variant="Certified" type="default">pinfo</packagereq>
-      <packagereq variant="Certified" type="default">plymouth</packagereq>
-      <packagereq variant="Certified" type="default">tcpdump</packagereq>
-      <packagereq variant="Certified" type="default">vim-enhanced</packagereq>
-      <packagereq variant="Certified" type="default">wget</packagereq>
+      <packagereq variant="OS" type="mandatory">acl</packagereq>
+      <packagereq variant="OS" type="mandatory">sphere-release</packagereq>
+      <packagereq variant="OS" type="mandatory">at</packagereq>
+      <packagereq variant="OS" type="mandatory">attr</packagereq>
+      <packagereq variant="OS" type="mandatory">bc</packagereq>
+      <packagereq variant="OS" type="mandatory">cpio</packagereq>
+      <packagereq variant="OS" type="mandatory">crontabs</packagereq>
+      <packagereq variant="OS" type="mandatory">cyrus-sasl-plain</packagereq>
+      <packagereq variant="OS" type="mandatory">dbus</packagereq>
+      <packagereq variant="OS" type="mandatory">ed</packagereq>
+      <packagereq variant="OS" type="mandatory">file</packagereq>
+      <packagereq variant="OS" type="mandatory">irqbalance</packagereq>
+      <packagereq variant="OS" type="mandatory">logrotate</packagereq>
+      <packagereq variant="OS" type="mandatory">lsof</packagereq>
+      <packagereq variant="OS" type="mandatory">mcelog</packagereq>
+      <packagereq variant="OS" type="mandatory">microcode_ctl</packagereq>
+      <packagereq variant="OS" type="mandatory">net-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">pciutils</packagereq>
+      <packagereq variant="OS" type="mandatory">psacct</packagereq>
+      <packagereq variant="OS" type="mandatory">quota</packagereq>
+      <packagereq variant="OS" type="mandatory">sudo</packagereq>
+      <packagereq variant="OS" type="mandatory">symlinks</packagereq>
+      <packagereq variant="OS" type="mandatory">systemd-udev</packagereq>
+      <packagereq variant="OS" type="mandatory">tar</packagereq>
+      <packagereq variant="OS" type="mandatory">tree</packagereq>
+      <packagereq variant="OS" type="mandatory">tuned</packagereq>
+      <packagereq variant="OS" type="mandatory">util-linux-user</packagereq>
+      <packagereq variant="OS" type="default">bash-completion</packagereq>
+      <packagereq variant="OS" type="default">bluez</packagereq>
+      <packagereq variant="OS" type="default">bzip2</packagereq>
+      <packagereq variant="OS" type="default">chrony</packagereq>
+      <packagereq variant="OS" type="default">cockpit</packagereq>
+      <packagereq variant="OS" type="default">cryptsetup</packagereq>
+      <packagereq variant="OS" type="default">dos2unix</packagereq>
+      <packagereq variant="OS" type="default">dosfstools</packagereq>
+      <packagereq variant="OS" type="default">ethtool</packagereq>
+      <packagereq variant="OS" type="default">gnupg2</packagereq>
+      <packagereq variant="OS" type="default">iprutils</packagereq>
+      <packagereq variant="OS" type="default">ledmon</packagereq>
+      <packagereq variant="OS" type="default">lvm2</packagereq>
+      <packagereq variant="OS" type="default">mailcap</packagereq>
+      <packagereq variant="OS" type="default">man-pages</packagereq>
+      <packagereq variant="OS" type="default">mdadm</packagereq>
+      <packagereq variant="OS" type="default">mlocate</packagereq>
+      <packagereq variant="OS" type="default">mtr</packagereq>
+      <packagereq variant="OS" type="default">nano</packagereq>
+      <packagereq variant="OS" type="default">nvme-cli</packagereq>
+      <packagereq variant="OS" type="default">realmd</packagereq>
+      <packagereq variant="OS" type="default">rsync</packagereq>
+      <packagereq variant="OS" type="default">smartmontools</packagereq>
+      <packagereq variant="OS" type="default">sos</packagereq>
+      <packagereq variant="OS" type="default">sssd</packagereq>
+      <packagereq variant="OS" type="default">strace</packagereq>
+      <packagereq variant="OS" type="default">teamd</packagereq>
+      <packagereq variant="OS" type="default">time</packagereq>
+      <packagereq variant="OS" type="default">unzip</packagereq>
+      <packagereq variant="OS" type="default">usbutils</packagereq>
+      <packagereq variant="OS" type="default">virt-what</packagereq>
+      <packagereq variant="OS" type="default">which</packagereq>
+      <packagereq variant="OS" type="default">words</packagereq>
+      <packagereq variant="OS" type="default">xfsdump</packagereq>
+      <packagereq variant="OS" type="default">zip</packagereq>
+      <packagereq variant="OS" type="optional">cifs-utils</packagereq>
+      <packagereq variant="OS" type="optional">cockpit-doc</packagereq>
+      <packagereq variant="OS" type="optional">fwupd</packagereq>
+      <packagereq variant="OS" type="optional">ima-evm-utils</packagereq>
+      <packagereq variant="OS" type="optional">nfs-utils</packagereq>
+      <packagereq variant="OS" type="optional">nvmetcli</packagereq>
+      <packagereq variant="OS" type="optional">traceroute</packagereq>
+      <packagereq variant="OS" type="optional">zsh</packagereq>
+      <packagereq variant="OS" type="mandatory">rsyslog-gnutls</packagereq>
+      <packagereq variant="OS" type="mandatory">rsyslog-gssapi</packagereq>
+      <packagereq variant="OS" type="mandatory">rsyslog-relp</packagereq>
+      <packagereq variant="OS" type="default">blktrace</packagereq>
+      <packagereq variant="OS" type="default">fprintd-pam</packagereq>
+      <packagereq variant="OS" type="default">libstoragemgmt</packagereq>
+      <packagereq variant="OS" type="default">nmap-ncat</packagereq>
+      <packagereq variant="OS" type="default">pinfo</packagereq>
+      <packagereq variant="OS" type="default">plymouth</packagereq>
+      <packagereq variant="OS" type="default">tcpdump</packagereq>
+      <packagereq variant="OS" type="default">vim-enhanced</packagereq>
+      <packagereq variant="OS" type="default">wget</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>base-x</id>
     <name>base-x</name>
     <name xml:lang="de">base-x</name>
@@ -502,21 +502,21 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">glx-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">mesa-dri-drivers</packagereq>
-      <packagereq variant="Certified" type="mandatory">plymouth-system-theme</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-drv-evdev</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-drv-fbdev</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-drv-libinput</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-drv-vmware</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-drv-wacom</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-xauth</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-xinit</packagereq>
+      <packagereq variant="OS" type="mandatory">glx-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">mesa-dri-drivers</packagereq>
+      <packagereq variant="OS" type="mandatory">plymouth-system-theme</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-drv-evdev</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-drv-fbdev</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-drv-libinput</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-drv-vmware</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-drv-wacom</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-server-Xorg</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-xauth</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-xinit</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>conflicts-appstream</id>
     <name>Conflicts AppStream</name>
     <name xml:lang="de">Konflikte AppStream</name>
@@ -544,7 +544,7 @@
     <uservisible>false</uservisible>
     <packagelist/>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>conflicts-baseos</id>
     <name>Conflicts BaseOS</name>
     <name xml:lang="de">Konflikte BaseOS</name>
@@ -571,11 +571,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">coreutils-single</packagereq>
-      <packagereq variant="Certified" type="mandatory">libcurl-minimal</packagereq>
+      <packagereq variant="OS" type="mandatory">coreutils-single</packagereq>
+      <packagereq variant="OS" type="mandatory">libcurl-minimal</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>console-internet</id>
     <name>Console Internet Tools</name>
     <name xml:lang="as">কনচৌল ইন্টাৰনেট সঁজুলি</name>
@@ -637,16 +637,16 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="optional">fetchmail</packagereq>
-      <packagereq variant="Certified" type="optional">ftp</packagereq>
-      <packagereq variant="Certified" type="optional">irssi</packagereq>
-      <packagereq variant="Certified" type="optional">lftp</packagereq>
-      <packagereq variant="Certified" type="optional">mutt</packagereq>
-      <packagereq variant="Certified" type="optional">procmail</packagereq>
-      <packagereq variant="Certified" type="optional">whois</packagereq>
+      <packagereq variant="OS" type="optional">fetchmail</packagereq>
+      <packagereq variant="OS" type="optional">ftp</packagereq>
+      <packagereq variant="OS" type="optional">irssi</packagereq>
+      <packagereq variant="OS" type="optional">lftp</packagereq>
+      <packagereq variant="OS" type="optional">mutt</packagereq>
+      <packagereq variant="OS" type="optional">procmail</packagereq>
+      <packagereq variant="OS" type="optional">whois</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>container-management</id>
     <name>Container Management</name>
     <name xml:lang="de">Containerverwaltung</name>
@@ -674,17 +674,17 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">containernetworking-plugins</packagereq>
-      <packagereq variant="Certified" type="mandatory">docker-buildx-plugin</packagereq>
-      <packagereq variant="Certified" type="mandatory">docker-ce-cli</packagereq>
-      <packagereq variant="Certified" type="mandatory">docker-ce-rootless-extras</packagereq>
-      <packagereq variant="Certified" type="mandatory">docker-ce</packagereq>
-      <packagereq variant="Certified" type="mandatory">docker-compose-plugin</packagereq>
-      <packagereq variant="Certified" type="mandatory">docker-compose-switch</packagereq>
-      <packagereq variant="Certified" type="optional">python3-psutil</packagereq>
+      <packagereq variant="OS" type="mandatory">containernetworking-plugins</packagereq>
+      <packagereq variant="OS" type="mandatory">docker-buildx-plugin</packagereq>
+      <packagereq variant="OS" type="mandatory">docker-ce-cli</packagereq>
+      <packagereq variant="OS" type="mandatory">docker-ce-rootless-extras</packagereq>
+      <packagereq variant="OS" type="mandatory">docker-ce</packagereq>
+      <packagereq variant="OS" type="mandatory">docker-compose-plugin</packagereq>
+      <packagereq variant="OS" type="mandatory">docker-compose-switch</packagereq>
+      <packagereq variant="OS" type="optional">python3-psutil</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>core</id>
     <name>Core</name>
     <name xml:lang="af">Kern</name>
@@ -773,96 +773,96 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">audit</packagereq>
-      <packagereq variant="Certified" type="mandatory">basesystem</packagereq>
-      <packagereq variant="Certified" type="mandatory">bash</packagereq>
-      <packagereq variant="Certified" type="mandatory">coreutils</packagereq>
-      <packagereq variant="Certified" type="mandatory">chkconfig</packagereq>
-      <packagereq variant="Certified" type="mandatory">cronie</packagereq>
-      <packagereq variant="Certified" type="mandatory">crypto-policies</packagereq>
-      <packagereq variant="Certified" type="mandatory">crypto-policies-scripts</packagereq>
-      <packagereq variant="Certified" type="mandatory">curl</packagereq>
-      <packagereq variant="Certified" type="mandatory">dnf</packagereq>
-      <packagereq variant="Certified" type="mandatory">e2fsprogs</packagereq>
-      <packagereq variant="Certified" type="mandatory">filesystem</packagereq>
-      <packagereq variant="Certified" type="mandatory">firewalld</packagereq>
-      <packagereq variant="Certified" type="mandatory">glibc</packagereq>
-      <packagereq variant="Certified" type="mandatory">grubby</packagereq>
-      <packagereq variant="Certified" type="mandatory">hostname</packagereq>
-      <packagereq variant="Certified" type="mandatory">initscripts</packagereq>
-      <packagereq variant="Certified" type="mandatory">iproute</packagereq>
-      <packagereq variant="Certified" type="mandatory">iproute-tc</packagereq>
-      <packagereq variant="Certified" type="mandatory">iputils</packagereq>
-      <packagereq variant="Certified" type="mandatory">irqbalance</packagereq>
-      <packagereq variant="Certified" type="mandatory">kbd</packagereq>
-      <packagereq variant="Certified" type="mandatory">kexec-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">less</packagereq>
-      <packagereq variant="Certified" type="mandatory">logrotate</packagereq>
-      <packagereq variant="Certified" type="mandatory">man-db</packagereq>
-      <packagereq variant="Certified" type="mandatory">ncurses</packagereq>
-      <packagereq variant="Certified" type="mandatory">openssh-clients</packagereq>
-      <packagereq variant="Certified" type="mandatory">openssh-server</packagereq>
-      <packagereq variant="Certified" type="mandatory">p11-kit</packagereq>
-      <packagereq variant="Certified" type="mandatory">parted</packagereq>
-      <packagereq variant="Certified" type="mandatory">passwd</packagereq>
-      <packagereq variant="Certified" type="mandatory">policycoreutils</packagereq>
-      <packagereq variant="Certified" type="mandatory">procps-ng</packagereq>
-      <packagereq variant="Certified" type="mandatory">rootfiles</packagereq>
-      <packagereq variant="Certified" type="mandatory">rpm</packagereq>
-      <packagereq variant="Certified" type="mandatory">rpm-plugin-audit</packagereq>
-      <packagereq variant="Certified" type="mandatory">selinux-policy-targeted</packagereq>
-      <packagereq variant="Certified" type="mandatory">setup</packagereq>
-      <packagereq variant="Certified" type="mandatory">shadow-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">sssd-common</packagereq>
-      <packagereq variant="Certified" type="mandatory">sssd-kcm</packagereq>
-      <packagereq variant="Certified" type="mandatory">sudo</packagereq>
-      <packagereq variant="Certified" type="mandatory">systemd</packagereq>
-      <packagereq variant="Certified" type="mandatory">util-linux</packagereq>
-      <packagereq variant="Certified" type="mandatory">vim-minimal</packagereq>
-      <packagereq variant="Certified" type="mandatory">xfsprogs</packagereq>
-      <packagereq variant="Certified" type="mandatory">yum</packagereq>
-      <packagereq variant="Certified" type="default">authselect</packagereq>
-      <packagereq variant="Certified" type="default">dnf-plugins-core</packagereq>
-      <packagereq variant="Certified" type="default">dracut-config-rescue</packagereq>
-      <packagereq variant="Certified" type="default">initscripts-rename-device</packagereq>
-      <packagereq variant="Certified" type="default">iwl100-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl1000-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl105-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl135-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl2000-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl2030-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl3160-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl5000-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl5150-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl6000g2a-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl6050-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl7260-firmware</packagereq>
-      <packagereq variant="Certified" type="default">kernel-tools</packagereq>
-      <packagereq variant="Certified" type="default">libsysfs</packagereq>
-      <packagereq variant="Certified" type="default">linux-firmware</packagereq>
-      <packagereq variant="Certified" type="default">lshw</packagereq>
-      <packagereq variant="Certified" type="default">lsscsi</packagereq>
-      <packagereq variant="Certified" type="default">microcode_ctl</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-team</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-tui</packagereq>
-      <packagereq variant="Certified" type="default">prefixdevname</packagereq>
-      <packagereq variant="Certified" type="default">sg3_utils</packagereq>
-      <packagereq variant="Certified" type="default">sg3_utils-libs</packagereq>
-      <packagereq variant="Certified" type="optional">dracut-config-generic</packagereq>
-      <packagereq variant="Certified" type="optional">dracut-network</packagereq>
-      <packagereq variant="Certified" type="optional">rdma-core</packagereq>
-      <packagereq variant="Certified" type="optional">selinux-policy-mls</packagereq>
-      <packagereq variant="Certified" type="optional">tboot</packagereq>
-      <packagereq variant="Certified" type="mandatory">rsyslog</packagereq>
-      <packagereq variant="Certified" type="default">compat-openssl11</packagereq>
-      <packagereq variant="Certified" type="default">python3-libselinux</packagereq>
-      <packagereq variant="Certified" type="optional">initial-setup</packagereq>      
-      <packagereq variant="Certified" type="mandatory">openssl-gost-engine</packagereq>
-      <packagereq variant="Certified" type="optional">htop</packagereq>
+      <packagereq variant="OS" type="mandatory">audit</packagereq>
+      <packagereq variant="OS" type="mandatory">basesystem</packagereq>
+      <packagereq variant="OS" type="mandatory">bash</packagereq>
+      <packagereq variant="OS" type="mandatory">coreutils</packagereq>
+      <packagereq variant="OS" type="mandatory">chkconfig</packagereq>
+      <packagereq variant="OS" type="mandatory">cronie</packagereq>
+      <packagereq variant="OS" type="mandatory">crypto-policies</packagereq>
+      <packagereq variant="OS" type="mandatory">crypto-policies-scripts</packagereq>
+      <packagereq variant="OS" type="mandatory">curl</packagereq>
+      <packagereq variant="OS" type="mandatory">dnf</packagereq>
+      <packagereq variant="OS" type="mandatory">e2fsprogs</packagereq>
+      <packagereq variant="OS" type="mandatory">filesystem</packagereq>
+      <packagereq variant="OS" type="mandatory">firewalld</packagereq>
+      <packagereq variant="OS" type="mandatory">glibc</packagereq>
+      <packagereq variant="OS" type="mandatory">grubby</packagereq>
+      <packagereq variant="OS" type="mandatory">hostname</packagereq>
+      <packagereq variant="OS" type="mandatory">initscripts</packagereq>
+      <packagereq variant="OS" type="mandatory">iproute</packagereq>
+      <packagereq variant="OS" type="mandatory">iproute-tc</packagereq>
+      <packagereq variant="OS" type="mandatory">iputils</packagereq>
+      <packagereq variant="OS" type="mandatory">irqbalance</packagereq>
+      <packagereq variant="OS" type="mandatory">kbd</packagereq>
+      <packagereq variant="OS" type="mandatory">kexec-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">less</packagereq>
+      <packagereq variant="OS" type="mandatory">logrotate</packagereq>
+      <packagereq variant="OS" type="mandatory">man-db</packagereq>
+      <packagereq variant="OS" type="mandatory">ncurses</packagereq>
+      <packagereq variant="OS" type="mandatory">openssh-clients</packagereq>
+      <packagereq variant="OS" type="mandatory">openssh-server</packagereq>
+      <packagereq variant="OS" type="mandatory">p11-kit</packagereq>
+      <packagereq variant="OS" type="mandatory">parted</packagereq>
+      <packagereq variant="OS" type="mandatory">passwd</packagereq>
+      <packagereq variant="OS" type="mandatory">policycoreutils</packagereq>
+      <packagereq variant="OS" type="mandatory">procps-ng</packagereq>
+      <packagereq variant="OS" type="mandatory">rootfiles</packagereq>
+      <packagereq variant="OS" type="mandatory">rpm</packagereq>
+      <packagereq variant="OS" type="mandatory">rpm-plugin-audit</packagereq>
+      <packagereq variant="OS" type="mandatory">selinux-policy-targeted</packagereq>
+      <packagereq variant="OS" type="mandatory">setup</packagereq>
+      <packagereq variant="OS" type="mandatory">shadow-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">sssd-common</packagereq>
+      <packagereq variant="OS" type="mandatory">sssd-kcm</packagereq>
+      <packagereq variant="OS" type="mandatory">sudo</packagereq>
+      <packagereq variant="OS" type="mandatory">systemd</packagereq>
+      <packagereq variant="OS" type="mandatory">util-linux</packagereq>
+      <packagereq variant="OS" type="mandatory">vim-minimal</packagereq>
+      <packagereq variant="OS" type="mandatory">xfsprogs</packagereq>
+      <packagereq variant="OS" type="mandatory">yum</packagereq>
+      <packagereq variant="OS" type="default">authselect</packagereq>
+      <packagereq variant="OS" type="default">dnf-plugins-core</packagereq>
+      <packagereq variant="OS" type="default">dracut-config-rescue</packagereq>
+      <packagereq variant="OS" type="default">initscripts-rename-device</packagereq>
+      <packagereq variant="OS" type="default">iwl100-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl1000-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl105-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl135-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl2000-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl2030-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl3160-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl5000-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl5150-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl6000g2a-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl6050-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl7260-firmware</packagereq>
+      <packagereq variant="OS" type="default">kernel-tools</packagereq>
+      <packagereq variant="OS" type="default">libsysfs</packagereq>
+      <packagereq variant="OS" type="default">linux-firmware</packagereq>
+      <packagereq variant="OS" type="default">lshw</packagereq>
+      <packagereq variant="OS" type="default">lsscsi</packagereq>
+      <packagereq variant="OS" type="default">microcode_ctl</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-team</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-tui</packagereq>
+      <packagereq variant="OS" type="default">prefixdevname</packagereq>
+      <packagereq variant="OS" type="default">sg3_utils</packagereq>
+      <packagereq variant="OS" type="default">sg3_utils-libs</packagereq>
+      <packagereq variant="OS" type="optional">dracut-config-generic</packagereq>
+      <packagereq variant="OS" type="optional">dracut-network</packagereq>
+      <packagereq variant="OS" type="optional">rdma-core</packagereq>
+      <packagereq variant="OS" type="optional">selinux-policy-mls</packagereq>
+      <packagereq variant="OS" type="optional">tboot</packagereq>
+      <packagereq variant="OS" type="mandatory">rsyslog</packagereq>
+      <packagereq variant="OS" type="default">compat-openssl11</packagereq>
+      <packagereq variant="OS" type="default">python3-libselinux</packagereq>
+      <packagereq variant="OS" type="optional">initial-setup</packagereq>      
+      <packagereq variant="OS" type="mandatory">openssl-gost-engine</packagereq>
+      <packagereq variant="OS" type="optional">htop</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>debugging</id>
     <name>Debugging Tools</name>
     <name xml:lang="as">ডিবাগ কৰা সঁজুলিসমূহ</name>
@@ -927,22 +927,22 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">gdb</packagereq>
-      <packagereq variant="Certified" type="mandatory">libreport-cli</packagereq>
-      <packagereq variant="Certified" type="mandatory">systemtap-runtime</packagereq>
-      <packagereq variant="Certified" type="default">crash</packagereq>
-      <packagereq variant="Certified" type="default">crash-gcore-command</packagereq>
-      <packagereq variant="Certified" type="default">crash-trace-command</packagereq>
-      <packagereq variant="Certified" type="default">valgrind</packagereq>
-      <packagereq variant="Certified" type="default">valgrind-devel</packagereq>
-      <packagereq variant="Certified" type="optional">bpftrace</packagereq>
-      <packagereq variant="Certified" type="optional">gdb-gdbserver</packagereq>
-      <packagereq variant="Certified" type="optional">glibc-utils</packagereq>
-      <packagereq variant="Certified" type="optional">systemtap-client</packagereq>
-      <packagereq variant="Certified" type="optional">systemtap-initscript</packagereq>
+      <packagereq variant="OS" type="mandatory">gdb</packagereq>
+      <packagereq variant="OS" type="mandatory">libreport-cli</packagereq>
+      <packagereq variant="OS" type="mandatory">systemtap-runtime</packagereq>
+      <packagereq variant="OS" type="default">crash</packagereq>
+      <packagereq variant="OS" type="default">crash-gcore-command</packagereq>
+      <packagereq variant="OS" type="default">crash-trace-command</packagereq>
+      <packagereq variant="OS" type="default">valgrind</packagereq>
+      <packagereq variant="OS" type="default">valgrind-devel</packagereq>
+      <packagereq variant="OS" type="optional">bpftrace</packagereq>
+      <packagereq variant="OS" type="optional">gdb-gdbserver</packagereq>
+      <packagereq variant="OS" type="optional">glibc-utils</packagereq>
+      <packagereq variant="OS" type="optional">systemtap-client</packagereq>
+      <packagereq variant="OS" type="optional">systemtap-initscript</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>desktop-debugging</id>
     <name>Desktop Debugging and Performance Tools</name>
     <name xml:lang="as">ডেস্কটপ ডিবাগ আৰু কাৰ্য্যক্ষমতাৰ সম্বন্ধীয় সঁজুলিসমূহ</name>
@@ -1007,14 +1007,14 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">crash</packagereq>
-      <packagereq variant="Certified" type="default">crash-gcore-command</packagereq>
-      <packagereq variant="Certified" type="default">crash-trace-command</packagereq>
-      <packagereq variant="Certified" type="optional">pcp-gui</packagereq>
-      <packagereq variant="Certified" type="optional">xrestop</packagereq>
+      <packagereq variant="OS" type="default">crash</packagereq>
+      <packagereq variant="OS" type="default">crash-gcore-command</packagereq>
+      <packagereq variant="OS" type="default">crash-trace-command</packagereq>
+      <packagereq variant="OS" type="optional">pcp-gui</packagereq>
+      <packagereq variant="OS" type="optional">xrestop</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>development</id>
     <name>Development Tools</name>
     <name xml:lang="af">Ontwikkelingsnutsgoed</name>
@@ -1128,46 +1128,46 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">binutils</packagereq>
-      <packagereq variant="Certified" type="mandatory">make</packagereq>
-      <packagereq variant="Certified" type="mandatory">pkgconf</packagereq>
-      <packagereq variant="Certified" type="mandatory">pkgconf-m4</packagereq>
-      <packagereq variant="Certified" type="mandatory">pkgconf-pkg-config</packagereq>
-      <packagereq variant="Certified" type="mandatory">rpm-sign</packagereq>
-      <packagereq variant="Certified" type="mandatory">strace</packagereq>
-      <packagereq variant="Certified" type="mandatory">autoconf</packagereq>
-      <packagereq variant="Certified" type="mandatory">automake</packagereq>
-      <packagereq variant="Certified" type="mandatory">bison</packagereq>
-      <packagereq variant="Certified" type="mandatory">flex</packagereq>
-      <packagereq variant="Certified" type="mandatory">gcc</packagereq>
-      <packagereq variant="Certified" type="mandatory">gcc-c++</packagereq>
-      <packagereq variant="Certified" type="mandatory">gdb</packagereq>
-      <packagereq variant="Certified" type="mandatory">glibc-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libtool</packagereq>
-      <packagereq variant="Certified" type="mandatory">redhat-rpm-config</packagereq>
-      <packagereq variant="Certified" type="mandatory">rpm-build</packagereq>
-      <packagereq variant="Certified" type="default">asciidoc</packagereq>
-      <packagereq variant="Certified" type="default">byacc</packagereq>
-      <packagereq variant="Certified" type="default">diffstat</packagereq>
-      <packagereq variant="Certified" type="default">git</packagereq>
-      <packagereq variant="Certified" type="default">intltool</packagereq>
-      <packagereq variant="Certified" type="default">jna</packagereq>
-      <packagereq variant="Certified" type="default">ltrace</packagereq>
-      <packagereq variant="Certified" type="default">patchutils</packagereq>
-      <packagereq variant="Certified" type="default">perl-Fedora-VSP</packagereq>
-      <packagereq variant="Certified" type="default">perl-generators</packagereq>
-      <packagereq variant="Certified" type="default">pesign</packagereq>
-      <packagereq variant="Certified" type="default">source-highlight</packagereq>
-      <packagereq variant="Certified" type="default">systemtap</packagereq>
-      <packagereq variant="Certified" type="default">valgrind</packagereq>
-      <packagereq variant="Certified" type="default">valgrind-devel</packagereq>
-      <packagereq variant="Certified" type="optional">cmake</packagereq>
-      <packagereq variant="Certified" type="optional">expect</packagereq>
-      <packagereq variant="Certified" type="optional">rpmdevtools</packagereq>
-      <packagereq variant="Certified" type="optional">rpmlint</packagereq>
+      <packagereq variant="OS" type="mandatory">binutils</packagereq>
+      <packagereq variant="OS" type="mandatory">make</packagereq>
+      <packagereq variant="OS" type="mandatory">pkgconf</packagereq>
+      <packagereq variant="OS" type="mandatory">pkgconf-m4</packagereq>
+      <packagereq variant="OS" type="mandatory">pkgconf-pkg-config</packagereq>
+      <packagereq variant="OS" type="mandatory">rpm-sign</packagereq>
+      <packagereq variant="OS" type="mandatory">strace</packagereq>
+      <packagereq variant="OS" type="mandatory">autoconf</packagereq>
+      <packagereq variant="OS" type="mandatory">automake</packagereq>
+      <packagereq variant="OS" type="mandatory">bison</packagereq>
+      <packagereq variant="OS" type="mandatory">flex</packagereq>
+      <packagereq variant="OS" type="mandatory">gcc</packagereq>
+      <packagereq variant="OS" type="mandatory">gcc-c++</packagereq>
+      <packagereq variant="OS" type="mandatory">gdb</packagereq>
+      <packagereq variant="OS" type="mandatory">glibc-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libtool</packagereq>
+      <packagereq variant="OS" type="mandatory">redhat-rpm-config</packagereq>
+      <packagereq variant="OS" type="mandatory">rpm-build</packagereq>
+      <packagereq variant="OS" type="default">asciidoc</packagereq>
+      <packagereq variant="OS" type="default">byacc</packagereq>
+      <packagereq variant="OS" type="default">diffstat</packagereq>
+      <packagereq variant="OS" type="default">git</packagereq>
+      <packagereq variant="OS" type="default">intltool</packagereq>
+      <packagereq variant="OS" type="default">jna</packagereq>
+      <packagereq variant="OS" type="default">ltrace</packagereq>
+      <packagereq variant="OS" type="default">patchutils</packagereq>
+      <packagereq variant="OS" type="default">perl-Fedora-VSP</packagereq>
+      <packagereq variant="OS" type="default">perl-generators</packagereq>
+      <packagereq variant="OS" type="default">pesign</packagereq>
+      <packagereq variant="OS" type="default">source-highlight</packagereq>
+      <packagereq variant="OS" type="default">systemtap</packagereq>
+      <packagereq variant="OS" type="default">valgrind</packagereq>
+      <packagereq variant="OS" type="default">valgrind-devel</packagereq>
+      <packagereq variant="OS" type="optional">cmake</packagereq>
+      <packagereq variant="OS" type="optional">expect</packagereq>
+      <packagereq variant="OS" type="optional">rpmdevtools</packagereq>
+      <packagereq variant="OS" type="optional">rpmlint</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>dial-up</id>
     <name>Dial-up Networking Support</name>
     <name xml:lang="ar">دعم شبكات الاتصال الهاتفي</name>
@@ -1233,14 +1233,14 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">ppp</packagereq>
-      <packagereq variant="Certified" type="default">lrzsz</packagereq>
-      <packagereq variant="Certified" type="default">minicom</packagereq>
-      <packagereq variant="Certified" type="default">ModemManager</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-adsl</packagereq>
+      <packagereq variant="OS" type="mandatory">ppp</packagereq>
+      <packagereq variant="OS" type="default">lrzsz</packagereq>
+      <packagereq variant="OS" type="default">minicom</packagereq>
+      <packagereq variant="OS" type="default">ModemManager</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-adsl</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>dns-server</id>
     <name>DNS Name Server</name>
     <name xml:lang="af">DNS-naambediener</name>
@@ -1396,23 +1396,23 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">bind-chroot</packagereq>
-      <packagereq variant="Certified" type="optional">bind</packagereq>
-      <packagereq variant="Certified" type="optional">unbound</packagereq>
+      <packagereq variant="OS" type="default">bind-chroot</packagereq>
+      <packagereq variant="OS" type="optional">bind</packagereq>
+      <packagereq variant="OS" type="optional">unbound</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>dotnet</id>
     <name>.NET Development</name>
     <description>Tools to develop and/or run .NET applications</description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="optional">dotnet-sdk-6.0</packagereq>
-      <packagereq variant="Certified" type="optional">dotnet-sdk-8.0</packagereq>
+      <packagereq variant="OS" type="optional">dotnet-sdk-6.0</packagereq>
+      <packagereq variant="OS" type="optional">dotnet-sdk-8.0</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>emacs</id>
     <name>Emacs</name>
     <name xml:lang="af">Emacs</name>
@@ -1508,12 +1508,12 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">emacs</packagereq>
-      <packagereq variant="Certified" type="optional">emacs-lucid</packagereq>
-      <packagereq variant="Certified" type="optional">emacs-nox</packagereq>
+      <packagereq variant="OS" type="mandatory">emacs</packagereq>
+      <packagereq variant="OS" type="optional">emacs-lucid</packagereq>
+      <packagereq variant="OS" type="optional">emacs-nox</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>file-server</id>
     <name>File and Storage Server</name>
     <name xml:lang="as">ফাইল আৰু সংৰক্ষণ চাৰ্ভাৰ</name>
@@ -1572,18 +1572,18 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">cifs-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">gssproxy</packagereq>
-      <packagereq variant="Certified" type="mandatory">nfs-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">nfs4-acl-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">samba</packagereq>
-      <packagereq variant="Certified" type="mandatory">samba-common-tools</packagereq>
-      <packagereq variant="Certified" type="optional">isns-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">targetcli</packagereq>
-      <packagereq variant="Certified" type="mandatory">samba-winbind-clients</packagereq>
+      <packagereq variant="OS" type="mandatory">cifs-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">gssproxy</packagereq>
+      <packagereq variant="OS" type="mandatory">nfs-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">nfs4-acl-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">samba</packagereq>
+      <packagereq variant="OS" type="mandatory">samba-common-tools</packagereq>
+      <packagereq variant="OS" type="optional">isns-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">targetcli</packagereq>
+      <packagereq variant="OS" type="mandatory">samba-winbind-clients</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>fonts</id>
     <name>Fonts</name>
     <name xml:lang="ar">خطوط</name>
@@ -1654,168 +1654,168 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">dejavu-sans-fonts</packagereq>
-      <packagereq variant="Certified" type="default">dejavu-sans-mono-fonts</packagereq>
-      <packagereq variant="Certified" type="default">dejavu-serif-fonts</packagereq>
-      <packagereq variant="Certified" type="default">abattis-cantarell-fonts</packagereq>
-      <packagereq variant="Certified" type="default">google-noto-emoji-color-fonts</packagereq>
-      <packagereq variant="Certified" type="default">google-noto-sans-cjk-ttc-fonts</packagereq>
-      <packagereq variant="Certified" type="default">google-noto-sans-gurmukhi-fonts</packagereq>
-      <packagereq variant="Certified" type="default">google-noto-sans-sinhala-vf-fonts</packagereq>
-      <packagereq variant="Certified" type="default">google-noto-serif-cjk-ttc-fonts</packagereq>
-      <packagereq variant="Certified" type="default">jomolhari-fonts</packagereq>
-      <packagereq variant="Certified" type="default">julietaula-montserrat-fonts</packagereq>
-      <packagereq variant="Certified" type="default">khmer-os-system-fonts</packagereq>
-      <packagereq variant="Certified" type="default">liberation-mono-fonts</packagereq>
-      <packagereq variant="Certified" type="default">liberation-sans-fonts</packagereq>
-      <packagereq variant="Certified" type="default">liberation-serif-fonts</packagereq>
-      <packagereq variant="Certified" type="default">lohit-assamese-fonts</packagereq>
-      <packagereq variant="Certified" type="default">lohit-bengali-fonts</packagereq>
-      <packagereq variant="Certified" type="default">lohit-devanagari-fonts</packagereq>
-      <packagereq variant="Certified" type="default">lohit-gujarati-fonts</packagereq>
-      <packagereq variant="Certified" type="default">lohit-kannada-fonts</packagereq>
-      <packagereq variant="Certified" type="default">lohit-odia-fonts</packagereq>
-      <packagereq variant="Certified" type="default">lohit-tamil-fonts</packagereq>
-      <packagereq variant="Certified" type="default">lohit-telugu-fonts</packagereq>
-      <packagereq variant="Certified" type="default">paktype-naskh-basic-fonts</packagereq>
-      <packagereq variant="Certified" type="default">pt-sans-fonts</packagereq>
-      <packagereq variant="Certified" type="default">sil-abyssinica-fonts</packagereq>
-      <packagereq variant="Certified" type="default">sil-nuosu-fonts</packagereq>
-      <packagereq variant="Certified" type="default">sil-padauk-fonts</packagereq>
-      <packagereq variant="Certified" type="default">smc-meera-fonts</packagereq>
-      <packagereq variant="Certified" type="default">stix-fonts</packagereq>
-      <packagereq variant="Certified" type="default">thai-scalable-waree-fonts</packagereq>
-      <packagereq variant="Certified" type="default">fontconfig-font-replacements</packagereq>
-      <packagereq variant="Certified" type="default">fontconfig-enhanced-defaults</packagereq>
-      <packagereq variant="Certified" type="default">google-roboto-condensed-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">fontawesome-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-droid-sans-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-droid-sans-mono-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-droid-serif-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-armenian-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-avestan-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-bengali-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-bengali-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-brahmi-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-carian-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-cherokee-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-coptic-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-deseret-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-devanagari-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-ethiopic-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-georgian-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-glagolitic-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-gujarati-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-gujarati-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-hebrew-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-kaithi-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-kannada-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-kannada-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-kayah-li-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-khmer-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-khmer-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-lao-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-lao-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-lycian-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-lydian-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-malayalam-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-malayalam-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-nko-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-old-south-arabian-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-old-turkic-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-osmanya-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-phoenician-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-shavian-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-sinhala-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-symbols-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-tamil-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-tamil-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-telugu-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-telugu-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-thaana-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-thai-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-thai-ui-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-ugaritic-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-sans-vai-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-serif-armenian-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-serif-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-serif-georgian-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-serif-khmer-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-serif-lao-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">google-noto-serif-thai-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">gubbi-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-art-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-book-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-decorative-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-digital-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-farsi-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-letter-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-naskh-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-office-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-one-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-pen-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-poster-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-qurn-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-screen-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-title-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">kacst-titlel-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">khmer-os-battambang-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">khmer-os-bokor-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">khmer-os-content-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">khmer-os-fasthand-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">khmer-os-freehand-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">khmer-os-handwritten-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">khmer-os-metal-chrieng-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">khmer-os-muol-fonts-all</packagereq>
-      <packagereq variant="Certified" type="optional">khmer-os-siemreap-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">lato-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">lohit-gurmukhi-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">lohit-marathi-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">madan-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">navilu-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">open-sans-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">overpass-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">paktype-naqsh-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">paktype-tehreer-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">saab-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">sil-scheherazade-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">smc-rachana-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-garuda-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-kinnari-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-loma-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-norasi-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-purisa-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-sawasdee-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-tlwgmono-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-tlwgtypewriter-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-tlwgtypist-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-tlwgtypo-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">thai-scalable-umpush-fonts</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-100dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-75dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-cyrillic</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ethiopic</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-14-100dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-14-75dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-15-100dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-15-75dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-2-75dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-misc</packagereq>
-      <packagereq variant="Certified" type="optional">xorg-x11-fonts-Type1</packagereq>
+      <packagereq variant="OS" type="default">dejavu-sans-fonts</packagereq>
+      <packagereq variant="OS" type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq variant="OS" type="default">dejavu-serif-fonts</packagereq>
+      <packagereq variant="OS" type="default">abattis-cantarell-fonts</packagereq>
+      <packagereq variant="OS" type="default">google-noto-emoji-color-fonts</packagereq>
+      <packagereq variant="OS" type="default">google-noto-sans-cjk-ttc-fonts</packagereq>
+      <packagereq variant="OS" type="default">google-noto-sans-gurmukhi-fonts</packagereq>
+      <packagereq variant="OS" type="default">google-noto-sans-sinhala-vf-fonts</packagereq>
+      <packagereq variant="OS" type="default">google-noto-serif-cjk-ttc-fonts</packagereq>
+      <packagereq variant="OS" type="default">jomolhari-fonts</packagereq>
+      <packagereq variant="OS" type="default">julietaula-montserrat-fonts</packagereq>
+      <packagereq variant="OS" type="default">khmer-os-system-fonts</packagereq>
+      <packagereq variant="OS" type="default">liberation-mono-fonts</packagereq>
+      <packagereq variant="OS" type="default">liberation-sans-fonts</packagereq>
+      <packagereq variant="OS" type="default">liberation-serif-fonts</packagereq>
+      <packagereq variant="OS" type="default">lohit-assamese-fonts</packagereq>
+      <packagereq variant="OS" type="default">lohit-bengali-fonts</packagereq>
+      <packagereq variant="OS" type="default">lohit-devanagari-fonts</packagereq>
+      <packagereq variant="OS" type="default">lohit-gujarati-fonts</packagereq>
+      <packagereq variant="OS" type="default">lohit-kannada-fonts</packagereq>
+      <packagereq variant="OS" type="default">lohit-odia-fonts</packagereq>
+      <packagereq variant="OS" type="default">lohit-tamil-fonts</packagereq>
+      <packagereq variant="OS" type="default">lohit-telugu-fonts</packagereq>
+      <packagereq variant="OS" type="default">paktype-naskh-basic-fonts</packagereq>
+      <packagereq variant="OS" type="default">pt-sans-fonts</packagereq>
+      <packagereq variant="OS" type="default">sil-abyssinica-fonts</packagereq>
+      <packagereq variant="OS" type="default">sil-nuosu-fonts</packagereq>
+      <packagereq variant="OS" type="default">sil-padauk-fonts</packagereq>
+      <packagereq variant="OS" type="default">smc-meera-fonts</packagereq>
+      <packagereq variant="OS" type="default">stix-fonts</packagereq>
+      <packagereq variant="OS" type="default">thai-scalable-waree-fonts</packagereq>
+      <packagereq variant="OS" type="default">fontconfig-font-replacements</packagereq>
+      <packagereq variant="OS" type="default">fontconfig-enhanced-defaults</packagereq>
+      <packagereq variant="OS" type="default">google-roboto-condensed-fonts</packagereq>
+      <packagereq variant="OS" type="optional">fontawesome-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-droid-sans-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-droid-sans-mono-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-droid-serif-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-armenian-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-avestan-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-bengali-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-bengali-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-brahmi-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-carian-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-cherokee-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-coptic-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-deseret-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-devanagari-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-ethiopic-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-georgian-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-glagolitic-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-gujarati-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-gujarati-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-hebrew-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-kaithi-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-kannada-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-kannada-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-kayah-li-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-khmer-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-khmer-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-lao-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-lao-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-lycian-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-lydian-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-malayalam-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-malayalam-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-nko-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-old-south-arabian-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-old-turkic-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-osmanya-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-phoenician-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-shavian-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-sinhala-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-symbols-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-tamil-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-tamil-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-telugu-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-telugu-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-thaana-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-thai-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-thai-ui-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-ugaritic-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-sans-vai-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-serif-armenian-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-serif-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-serif-georgian-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-serif-khmer-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-serif-lao-fonts</packagereq>
+      <packagereq variant="OS" type="optional">google-noto-serif-thai-fonts</packagereq>
+      <packagereq variant="OS" type="optional">gubbi-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-art-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-book-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-decorative-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-digital-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-farsi-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-letter-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-naskh-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-office-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-one-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-pen-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-poster-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-qurn-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-screen-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-title-fonts</packagereq>
+      <packagereq variant="OS" type="optional">kacst-titlel-fonts</packagereq>
+      <packagereq variant="OS" type="optional">khmer-os-battambang-fonts</packagereq>
+      <packagereq variant="OS" type="optional">khmer-os-bokor-fonts</packagereq>
+      <packagereq variant="OS" type="optional">khmer-os-content-fonts</packagereq>
+      <packagereq variant="OS" type="optional">khmer-os-fasthand-fonts</packagereq>
+      <packagereq variant="OS" type="optional">khmer-os-freehand-fonts</packagereq>
+      <packagereq variant="OS" type="optional">khmer-os-handwritten-fonts</packagereq>
+      <packagereq variant="OS" type="optional">khmer-os-metal-chrieng-fonts</packagereq>
+      <packagereq variant="OS" type="optional">khmer-os-muol-fonts-all</packagereq>
+      <packagereq variant="OS" type="optional">khmer-os-siemreap-fonts</packagereq>
+      <packagereq variant="OS" type="optional">lato-fonts</packagereq>
+      <packagereq variant="OS" type="optional">lohit-gurmukhi-fonts</packagereq>
+      <packagereq variant="OS" type="optional">lohit-marathi-fonts</packagereq>
+      <packagereq variant="OS" type="optional">madan-fonts</packagereq>
+      <packagereq variant="OS" type="optional">navilu-fonts</packagereq>
+      <packagereq variant="OS" type="optional">open-sans-fonts</packagereq>
+      <packagereq variant="OS" type="optional">overpass-fonts</packagereq>
+      <packagereq variant="OS" type="optional">paktype-naqsh-fonts</packagereq>
+      <packagereq variant="OS" type="optional">paktype-tehreer-fonts</packagereq>
+      <packagereq variant="OS" type="optional">paratype-pt-sans-caption-fonts</packagereq>
+      <packagereq variant="OS" type="optional">saab-fonts</packagereq>
+      <packagereq variant="OS" type="optional">sil-scheherazade-fonts</packagereq>
+      <packagereq variant="OS" type="optional">smc-rachana-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-garuda-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-kinnari-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-loma-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-norasi-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-purisa-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-sawasdee-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-tlwgmono-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-tlwgtypewriter-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-tlwgtypist-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-tlwgtypo-fonts</packagereq>
+      <packagereq variant="OS" type="optional">thai-scalable-umpush-fonts</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-100dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-75dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-cyrillic</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ethiopic</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-14-100dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-14-75dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-15-100dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-15-75dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-2-100dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-2-75dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-misc</packagereq>
+      <packagereq variant="OS" type="optional">xorg-x11-fonts-Type1</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>ftp-server</id>
     <name>FTP Server</name>
     <name xml:lang="af">FTP-bediener</name>
@@ -1973,10 +1973,10 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">vsftpd</packagereq>
+      <packagereq variant="OS" type="mandatory">vsftpd</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>gnome-apps</id>
     <name>GNOME Applications</name>
     <name xml:lang="as">GNOME এপ্লিকেচনসমূহ</name>
@@ -2034,11 +2034,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">brasero</packagereq>
-      <packagereq variant="Certified" type="mandatory">brasero-nautilus</packagereq>
+      <packagereq variant="OS" type="mandatory">brasero</packagereq>
+      <packagereq variant="OS" type="mandatory">brasero-nautilus</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>gnome-desktop</id>
     <name>GNOME</name>
     <name xml:lang="af">GNOME</name>
@@ -2113,119 +2113,119 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">at-spi2-atk</packagereq>
-      <packagereq variant="Certified" type="mandatory">at-spi2-core</packagereq>
-      <packagereq variant="Certified" type="mandatory">avahi-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">baobab</packagereq>
-      <packagereq variant="Certified" type="mandatory">cheese</packagereq>
-      <packagereq variant="Certified" type="mandatory">chrome-gnome-shell</packagereq>
-      <packagereq variant="Certified" type="mandatory">dconf</packagereq>
-      <packagereq variant="Certified" type="mandatory">eog</packagereq>
-      <packagereq variant="Certified" type="mandatory">evince</packagereq>
-      <packagereq variant="Certified" type="mandatory">evince-nautilus</packagereq>
-      <packagereq variant="Certified" type="mandatory">fprintd-pam</packagereq>
-      <packagereq variant="Certified" type="mandatory">gdm</packagereq>
-      <packagereq variant="Certified" type="mandatory">gedit</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-bluetooth</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-calculator</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-characters</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-classic-session</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-color-manager</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-control-center</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-disk-utility</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-initial-setup</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-logs</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-remote-desktop</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-screenshot</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-session-wayland-session</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-session-xsession</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-settings-daemon</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-shell</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-shell-extension-background-logo</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-software</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-system-monitor</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-terminal</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-terminal-nautilus</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnome-user-docs</packagereq>
-      <packagereq variant="Certified" type="mandatory">gvfs-fuse</packagereq>
-      <packagereq variant="Certified" type="mandatory">gvfs-goa</packagereq>
-      <packagereq variant="Certified" type="mandatory">gvfs-gphoto2</packagereq>
-      <packagereq variant="Certified" type="mandatory">gvfs-mtp</packagereq>
-      <packagereq variant="Certified" type="mandatory">gvfs-smb</packagereq>
-      <packagereq variant="Certified" type="mandatory">libcanberra-gtk3</packagereq>
-      <packagereq variant="Certified" type="mandatory">librsvg2</packagereq>
-      <packagereq variant="Certified" type="mandatory">libsane-hpaio</packagereq>
-      <packagereq variant="Certified" type="mandatory">mesa-dri-drivers</packagereq>
-      <packagereq variant="Certified" type="mandatory">nautilus</packagereq>
-      <packagereq variant="Certified" type="mandatory">orca</packagereq>
-      <packagereq variant="Certified" type="mandatory">PackageKit-command-not-found</packagereq>
-      <packagereq variant="Certified" type="mandatory">PackageKit-gtk3-module</packagereq>
-      <packagereq variant="Certified" type="mandatory">sane-backends-drivers-scanners</packagereq>
-      <packagereq variant="Certified" type="mandatory">sushi</packagereq>
-      <packagereq variant="Certified" type="mandatory">tracker</packagereq>
-      <packagereq variant="Certified" type="mandatory">tracker-miners</packagereq>
-      <packagereq variant="Certified" type="mandatory">xdg-desktop-portal</packagereq>
-      <packagereq variant="Certified" type="mandatory">xdg-desktop-portal-gnome</packagereq>
-      <packagereq variant="Certified" type="mandatory">xdg-desktop-portal-gtk</packagereq>
-      <packagereq variant="Certified" type="mandatory">xdg-user-dirs-gtk</packagereq>
-      <packagereq variant="Certified" type="mandatory">yelp</packagereq>
-      <packagereq variant="Certified" type="mandatory">yelp-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">avahi</packagereq>
-      <packagereq variant="Certified" type="mandatory">glib-networking</packagereq>
-      <packagereq variant="Certified" type="mandatory">glibc-all-langpacks</packagereq>
-      <packagereq variant="Certified" type="mandatory">ModemManager</packagereq>
-      <packagereq variant="Certified" type="mandatory">NetworkManager-adsl</packagereq>
-      <packagereq variant="Certified" type="mandatory">polkit</packagereq>
-      <packagereq variant="Certified" type="mandatory">sphere-backgrounds</packagereq>
-      <packagereq variant="Certified" type="default">samba-common-tools</packagereq>
-      <packagereq variant="Certified" type="default">realmd</packagereq>
-      <packagereq variant="Certified" type="default">gnome-extensions-app</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-drive-menu</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-places-menu</packagereq>
-      <packagereq variant="Certified" type="default">gnome-tweaks</packagereq>
-      <packagereq variant="Certified" type="mandatory">celluloid</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-l2tp-gnome</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-openconnect-gnome</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-openvpn-gnome</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-pptp-gnome</packagereq>
-      <packagereq variant="Certified" type="default">driver-manager</packagereq>
-      <packagereq variant="Certified" type="default">sphere-desktop-selector</packagereq>
-      <packagereq variant="Certified" type="default">file-roller</packagereq>
-      <packagereq variant="Certified" type="default">file-roller-nautilus</packagereq>
-      <packagereq variant="Certified" type="default">gnome-calendar</packagereq>
-      <packagereq variant="Certified" type="default">gnome-epub-thumbnailer</packagereq>
-      <packagereq variant="Certified" type="default">gnome-kiosk</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-appindicator</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-arcmenu</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-dash-to-panel</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-dash-to-dock</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-desktop-icons-ng</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-disable-gestures-2021</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-notification-banner-reloaded</packagereq>
-      <packagereq variant="Certified" type="default">gnome-shell-extension-no-overview</packagereq>
-      <packagereq variant="Certified" type="default">initial-setup-gui</packagereq>
-      <packagereq variant="Certified" type="default">msvsphere-configs-gnome</packagereq>
-      <packagereq variant="Certified" type="default">msvsphere-configs-gnome-software</packagereq>
-      <packagereq variant="Certified" type="default">ntfs-3g</packagereq>
-      <packagereq variant="Certified" type="default">ntfs-3g-system-compression</packagereq>
-      <packagereq variant="Certified" type="default">hardinfo</packagereq>
-      <packagereq variant="Certified" type="default">kora-icon-theme</packagereq>
-      <packagereq variant="Certified" type="default">libheif</packagereq>
-      <packagereq variant="Certified" type="default">simple-scan</packagereq>
-      <packagereq variant="Certified" type="optional">gedit-plugins</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-backgrounds</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-shell-extension-apps-menu</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-shell-extension-auto-move-windows</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-shell-extension-launch-new-instance</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-shell-extension-native-window-placement</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-shell-extension-screenshot-window-sizer</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-shell-extension-user-theme</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-shell-extension-window-list</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-shell-extension-windowsNavigator</packagereq>
-      <packagereq variant="Certified" type="optional">gnome-shell-extension-workspace-indicator</packagereq>
+      <packagereq variant="OS" type="mandatory">at-spi2-atk</packagereq>
+      <packagereq variant="OS" type="mandatory">at-spi2-core</packagereq>
+      <packagereq variant="OS" type="mandatory">avahi-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">baobab</packagereq>
+      <packagereq variant="OS" type="mandatory">cheese</packagereq>
+      <packagereq variant="OS" type="mandatory">chrome-gnome-shell</packagereq>
+      <packagereq variant="OS" type="mandatory">dconf</packagereq>
+      <packagereq variant="OS" type="mandatory">eog</packagereq>
+      <packagereq variant="OS" type="mandatory">evince</packagereq>
+      <packagereq variant="OS" type="mandatory">evince-nautilus</packagereq>
+      <packagereq variant="OS" type="mandatory">fprintd-pam</packagereq>
+      <packagereq variant="OS" type="mandatory">gdm</packagereq>
+      <packagereq variant="OS" type="mandatory">gedit</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-bluetooth</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-calculator</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-characters</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-classic-session</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-color-manager</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-control-center</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-disk-utility</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-initial-setup</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-logs</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-remote-desktop</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-screenshot</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-session-wayland-session</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-session-xsession</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-settings-daemon</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-shell</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-shell-extension-background-logo</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-software</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-system-monitor</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-terminal</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-terminal-nautilus</packagereq>
+      <packagereq variant="OS" type="mandatory">gnome-user-docs</packagereq>
+      <packagereq variant="OS" type="mandatory">gvfs-fuse</packagereq>
+      <packagereq variant="OS" type="mandatory">gvfs-goa</packagereq>
+      <packagereq variant="OS" type="mandatory">gvfs-gphoto2</packagereq>
+      <packagereq variant="OS" type="mandatory">gvfs-mtp</packagereq>
+      <packagereq variant="OS" type="mandatory">gvfs-smb</packagereq>
+      <packagereq variant="OS" type="mandatory">libcanberra-gtk3</packagereq>
+      <packagereq variant="OS" type="mandatory">librsvg2</packagereq>
+      <packagereq variant="OS" type="mandatory">libsane-hpaio</packagereq>
+      <packagereq variant="OS" type="mandatory">mesa-dri-drivers</packagereq>
+      <packagereq variant="OS" type="mandatory">nautilus</packagereq>
+      <packagereq variant="OS" type="mandatory">orca</packagereq>
+      <packagereq variant="OS" type="mandatory">PackageKit-command-not-found</packagereq>
+      <packagereq variant="OS" type="mandatory">PackageKit-gtk3-module</packagereq>
+      <packagereq variant="OS" type="mandatory">sane-backends-drivers-scanners</packagereq>
+      <packagereq variant="OS" type="mandatory">sushi</packagereq>
+      <packagereq variant="OS" type="mandatory">tracker</packagereq>
+      <packagereq variant="OS" type="mandatory">tracker-miners</packagereq>
+      <packagereq variant="OS" type="mandatory">xdg-desktop-portal</packagereq>
+      <packagereq variant="OS" type="mandatory">xdg-desktop-portal-gnome</packagereq>
+      <packagereq variant="OS" type="mandatory">xdg-desktop-portal-gtk</packagereq>
+      <packagereq variant="OS" type="mandatory">xdg-user-dirs-gtk</packagereq>
+      <packagereq variant="OS" type="mandatory">yelp</packagereq>
+      <packagereq variant="OS" type="mandatory">yelp-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">avahi</packagereq>
+      <packagereq variant="OS" type="mandatory">glib-networking</packagereq>
+      <packagereq variant="OS" type="mandatory">glibc-all-langpacks</packagereq>
+      <packagereq variant="OS" type="mandatory">ModemManager</packagereq>
+      <packagereq variant="OS" type="mandatory">NetworkManager-adsl</packagereq>
+      <packagereq variant="OS" type="mandatory">polkit</packagereq>
+      <packagereq variant="OS" type="mandatory">sphere-backgrounds</packagereq>
+      <packagereq variant="OS" type="default">samba-common-tools</packagereq>
+      <packagereq variant="OS" type="default">realmd</packagereq>
+      <packagereq variant="OS" type="default">gnome-extensions-app</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-drive-menu</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-places-menu</packagereq>
+      <packagereq variant="OS" type="default">gnome-tweaks</packagereq>
+      <packagereq variant="OS" type="mandatory">celluloid</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-l2tp-gnome</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-openconnect-gnome</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-openvpn-gnome</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-pptp-gnome</packagereq>
+      <packagereq variant="OS" type="default">driver-manager</packagereq>
+      <packagereq variant="OS" type="default">sphere-desktop-selector</packagereq>
+      <packagereq variant="OS" type="default">file-roller</packagereq>
+      <packagereq variant="OS" type="default">file-roller-nautilus</packagereq>
+      <packagereq variant="OS" type="default">gnome-calendar</packagereq>
+      <packagereq variant="OS" type="default">gnome-epub-thumbnailer</packagereq>
+      <packagereq variant="OS" type="default">gnome-kiosk</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-appindicator</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-arcmenu</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-dash-to-panel</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-dash-to-dock</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-desktop-icons-ng</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-disable-gestures-2021</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-notification-banner-reloaded</packagereq>
+      <packagereq variant="OS" type="default">gnome-shell-extension-no-overview</packagereq>
+      <packagereq variant="OS" type="default">initial-setup-gui</packagereq>
+      <packagereq variant="OS" type="default">msvsphere-configs-gnome</packagereq>
+      <packagereq variant="OS" type="default">msvsphere-configs-gnome-software</packagereq>
+      <packagereq variant="OS" type="default">ntfs-3g</packagereq>
+      <packagereq variant="OS" type="default">ntfs-3g-system-compression</packagereq>
+      <packagereq variant="OS" type="default">hardinfo</packagereq>
+      <packagereq variant="OS" type="default">kora-icon-theme</packagereq>
+      <packagereq variant="OS" type="default">libheif</packagereq>
+      <packagereq variant="OS" type="default">simple-scan</packagereq>
+      <packagereq variant="OS" type="optional">gedit-plugins</packagereq>
+      <packagereq variant="OS" type="optional">gnome-backgrounds</packagereq>
+      <packagereq variant="OS" type="optional">gnome-shell-extension-apps-menu</packagereq>
+      <packagereq variant="OS" type="optional">gnome-shell-extension-auto-move-windows</packagereq>
+      <packagereq variant="OS" type="optional">gnome-shell-extension-launch-new-instance</packagereq>
+      <packagereq variant="OS" type="optional">gnome-shell-extension-native-window-placement</packagereq>
+      <packagereq variant="OS" type="optional">gnome-shell-extension-screenshot-window-sizer</packagereq>
+      <packagereq variant="OS" type="optional">gnome-shell-extension-user-theme</packagereq>
+      <packagereq variant="OS" type="optional">gnome-shell-extension-window-list</packagereq>
+      <packagereq variant="OS" type="optional">gnome-shell-extension-windowsNavigator</packagereq>
+      <packagereq variant="OS" type="optional">gnome-shell-extension-workspace-indicator</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>graphical-admin-tools</id>
     <name>Graphical Administration Tools</name>
     <name xml:lang="as">গ্ৰাফিকেল পদ্ধতিত ব্যৱহাৰযোগ্য প্ৰশাসনিক সঁজুলিসমূহ</name>
@@ -2289,14 +2289,14 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="optional">gnome-disk-utility</packagereq>
-      <packagereq variant="Certified" type="optional">policycoreutils-gui</packagereq>
-      <packagereq variant="Certified" type="optional">setroubleshoot</packagereq>
-      <packagereq variant="Certified" type="optional">wireshark</packagereq>
-      <packagereq variant="Certified" type="optional">setools-console</packagereq>
+      <packagereq variant="OS" type="optional">gnome-disk-utility</packagereq>
+      <packagereq variant="OS" type="optional">policycoreutils-gui</packagereq>
+      <packagereq variant="OS" type="optional">setroubleshoot</packagereq>
+      <packagereq variant="OS" type="optional">wireshark</packagereq>
+      <packagereq variant="OS" type="optional">setools-console</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>graphics</id>
     <name>Graphics Creation Tools</name>
     <name xml:lang="as">গ্ৰাফিক্স নিৰ্মাণৰ বাবে ব্যৱহাৰযোগ্য সঁজুলিসমূহ</name>
@@ -2361,13 +2361,13 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">libsane-hpaio</packagereq>
-      <packagereq variant="Certified" type="default">sane-backends-drivers-scanners</packagereq>
-      <packagereq variant="Certified" type="optional">dcraw</packagereq>
-      <packagereq variant="Certified" type="optional">netpbm-progs</packagereq>
+      <packagereq variant="OS" type="default">libsane-hpaio</packagereq>
+      <packagereq variant="OS" type="default">sane-backends-drivers-scanners</packagereq>
+      <packagereq variant="OS" type="optional">dcraw</packagereq>
+      <packagereq variant="OS" type="optional">netpbm-progs</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>guest-agents</id>
     <name>Guest Agents</name>
     <name xml:lang="as">অতিথি সহায়ক</name>
@@ -2426,12 +2426,12 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">hyperv-daemons</packagereq>
-      <packagereq variant="Certified" type="mandatory">open-vm-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">qemu-guest-agent</packagereq>
+      <packagereq variant="OS" type="mandatory">hyperv-daemons</packagereq>
+      <packagereq variant="OS" type="mandatory">open-vm-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">qemu-guest-agent</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>guest-desktop-agents</id>
     <name>Guest Desktop Agents</name>
     <name xml:lang="as">অতিথি ডেস্কটপ সহায়কসমূহ</name>
@@ -2490,13 +2490,13 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">hyperv-daemons</packagereq>
-      <packagereq variant="Certified" type="mandatory">open-vm-tools-desktop</packagereq>
-      <packagereq variant="Certified" type="mandatory">qemu-guest-agent</packagereq>
-      <packagereq variant="Certified" type="mandatory">spice-vdagent</packagereq>
+      <packagereq variant="OS" type="mandatory">hyperv-daemons</packagereq>
+      <packagereq variant="OS" type="mandatory">open-vm-tools-desktop</packagereq>
+      <packagereq variant="OS" type="mandatory">qemu-guest-agent</packagereq>
+      <packagereq variant="OS" type="mandatory">spice-vdagent</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>hardware-monitoring</id>
     <name>Hardware Monitoring Utilities</name>
     <name xml:lang="as">হাৰ্ডৱেৰ পৰ্যবেক্ষণ সঁজুলিসমূহ</name>
@@ -2555,14 +2555,14 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">mcelog</packagereq>
-      <packagereq variant="Certified" type="default">smartmontools</packagereq>
-      <packagereq variant="Certified" type="optional">intel-cmt-cat</packagereq>
-      <packagereq variant="Certified" type="default">rasdaemon</packagereq>
-      <packagereq variant="Certified" type="optional">lm_sensors</packagereq>
+      <packagereq variant="OS" type="default">mcelog</packagereq>
+      <packagereq variant="OS" type="default">smartmontools</packagereq>
+      <packagereq variant="OS" type="optional">intel-cmt-cat</packagereq>
+      <packagereq variant="OS" type="default">rasdaemon</packagereq>
+      <packagereq variant="OS" type="optional">lm_sensors</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>hardware-support</id>
     <name>Hardware Support</name>
     <name xml:lang="de">Hardware-Support</name>
@@ -2590,31 +2590,31 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">bolt</packagereq>
-      <packagereq variant="Certified" type="default">iwl100-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl1000-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl105-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl135-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl2000-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl2030-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl3160-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl5000-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl5150-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl6000g2a-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl6000g2b-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl6050-firmware</packagereq>
-      <packagereq variant="Certified" type="default">iwl7260-firmware</packagereq>
-      <packagereq variant="Certified" type="default">libertas-sd8787-firmware</packagereq>
-      <packagereq variant="Certified" type="default">netronome-firmware</packagereq>
-      <packagereq variant="Certified" type="default">usb_modeswitch</packagereq>
-      <packagereq variant="Certified" type="optional">lsscsi</packagereq>
-      <packagereq variant="Certified" type="optional">opensc</packagereq>
-      <packagereq variant="Certified" type="optional">openssl-pkcs11</packagereq>
-      <packagereq variant="Certified" type="optional">pcsc-lite</packagereq>
-      <packagereq variant="Certified" type="optional">pcsc-lite-ccid</packagereq>
+      <packagereq variant="OS" type="default">bolt</packagereq>
+      <packagereq variant="OS" type="default">iwl100-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl1000-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl105-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl135-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl2000-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl2030-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl3160-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl5000-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl5150-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl6000g2a-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl6000g2b-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl6050-firmware</packagereq>
+      <packagereq variant="OS" type="default">iwl7260-firmware</packagereq>
+      <packagereq variant="OS" type="default">libertas-sd8787-firmware</packagereq>
+      <packagereq variant="OS" type="default">netronome-firmware</packagereq>
+      <packagereq variant="OS" type="default">usb_modeswitch</packagereq>
+      <packagereq variant="OS" type="optional">lsscsi</packagereq>
+      <packagereq variant="OS" type="optional">opensc</packagereq>
+      <packagereq variant="OS" type="optional">openssl-pkcs11</packagereq>
+      <packagereq variant="OS" type="optional">pcsc-lite</packagereq>
+      <packagereq variant="OS" type="optional">pcsc-lite-ccid</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>headless-management</id>
     <name>Headless Management</name>
     <name xml:lang="de">Kopfloses Management</name>
@@ -2642,18 +2642,18 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">cockpit-packagekit</packagereq>
-      <packagereq variant="Certified" type="mandatory">cockpit-storaged</packagereq>
-      <packagereq variant="Certified" type="mandatory">setroubleshoot-server</packagereq>
-      <packagereq variant="Certified" type="mandatory">PackageKit</packagereq>
-      <packagereq variant="Certified" type="default">sscg</packagereq>
-      <packagereq variant="Certified" type="mandatory">cockpit-bridge</packagereq>
-      <packagereq variant="Certified" type="mandatory">cockpit-system</packagereq>
-      <packagereq variant="Certified" type="mandatory">cockpit-ws</packagereq>
-      <packagereq variant="Certified" type="mandatory">openssh-server</packagereq>
+      <packagereq variant="OS" type="mandatory">cockpit-packagekit</packagereq>
+      <packagereq variant="OS" type="mandatory">cockpit-storaged</packagereq>
+      <packagereq variant="OS" type="mandatory">setroubleshoot-server</packagereq>
+      <packagereq variant="OS" type="mandatory">PackageKit</packagereq>
+      <packagereq variant="OS" type="default">sscg</packagereq>
+      <packagereq variant="OS" type="mandatory">cockpit-bridge</packagereq>
+      <packagereq variant="OS" type="mandatory">cockpit-system</packagereq>
+      <packagereq variant="OS" type="mandatory">cockpit-ws</packagereq>
+      <packagereq variant="OS" type="mandatory">openssh-server</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>infiniband</id>
     <name>Infiniband Support</name>
     <name xml:lang="as">Infiniband সমৰ্থন</name>
@@ -2699,23 +2699,23 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">libibverbs</packagereq>
-      <packagereq variant="Certified" type="mandatory">libibverbs-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">librdmacm</packagereq>
-      <packagereq variant="Certified" type="mandatory">librdmacm-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">rdma-core</packagereq>
-      <packagereq variant="Certified" type="default">ibacm</packagereq>
-      <packagereq variant="Certified" type="default">iwpmd</packagereq>
-      <packagereq variant="Certified" type="default">libibumad</packagereq>
-      <packagereq variant="Certified" type="default">perftest</packagereq>
-      <packagereq variant="Certified" type="default">srp_daemon</packagereq>
-      <packagereq variant="Certified" type="optional">opensm</packagereq>
-      <packagereq variant="Certified" type="default">infiniband-diags</packagereq>
-      <packagereq variant="Certified" type="default">mstflint</packagereq>
-      <packagereq variant="Certified" type="optional">libvma</packagereq>
+      <packagereq variant="OS" type="mandatory">libibverbs</packagereq>
+      <packagereq variant="OS" type="mandatory">libibverbs-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">librdmacm</packagereq>
+      <packagereq variant="OS" type="mandatory">librdmacm-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">rdma-core</packagereq>
+      <packagereq variant="OS" type="default">ibacm</packagereq>
+      <packagereq variant="OS" type="default">iwpmd</packagereq>
+      <packagereq variant="OS" type="default">libibumad</packagereq>
+      <packagereq variant="OS" type="default">perftest</packagereq>
+      <packagereq variant="OS" type="default">srp_daemon</packagereq>
+      <packagereq variant="OS" type="optional">opensm</packagereq>
+      <packagereq variant="OS" type="default">infiniband-diags</packagereq>
+      <packagereq variant="OS" type="default">mstflint</packagereq>
+      <packagereq variant="OS" type="optional">libvma</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>input-methods</id>
     <name>Input Methods</name>
     <name xml:lang="ar">طرق الإدخال</name>
@@ -2781,21 +2781,21 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="conditional" requires="gtk2">gtk2-immodule-xim</packagereq>
-      <packagereq variant="Certified" type="conditional" requires="gtk3">gtk3-immodule-xim</packagereq>
-      <packagereq variant="Certified" type="conditional" requires="gtk2">ibus-gtk2</packagereq>
-      <packagereq variant="Certified" type="conditional" requires="gtk3">ibus-gtk3</packagereq>
-      <packagereq variant="Certified" type="default">ibus-anthy</packagereq>
-      <packagereq variant="Certified" type="default">ibus-hangul</packagereq>
-      <packagereq variant="Certified" type="default">ibus-libpinyin</packagereq>
-      <packagereq variant="Certified" type="default">ibus-libzhuyin</packagereq>
-      <packagereq variant="Certified" type="default">ibus-m17n</packagereq>
-      <packagereq variant="Certified" type="default">ibus-typing-booster</packagereq>
-      <packagereq variant="Certified" type="optional">ibus-table</packagereq>
-      <packagereq variant="Certified" type="optional">ibus-table-array30</packagereq>
+      <packagereq variant="OS" type="conditional" requires="gtk2">gtk2-immodule-xim</packagereq>
+      <packagereq variant="OS" type="conditional" requires="gtk3">gtk3-immodule-xim</packagereq>
+      <packagereq variant="OS" type="conditional" requires="gtk2">ibus-gtk2</packagereq>
+      <packagereq variant="OS" type="conditional" requires="gtk3">ibus-gtk3</packagereq>
+      <packagereq variant="OS" type="default">ibus-anthy</packagereq>
+      <packagereq variant="OS" type="default">ibus-hangul</packagereq>
+      <packagereq variant="OS" type="default">ibus-libpinyin</packagereq>
+      <packagereq variant="OS" type="default">ibus-libzhuyin</packagereq>
+      <packagereq variant="OS" type="default">ibus-m17n</packagereq>
+      <packagereq variant="OS" type="default">ibus-typing-booster</packagereq>
+      <packagereq variant="OS" type="optional">ibus-table</packagereq>
+      <packagereq variant="OS" type="optional">ibus-table-array30</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>internet-applications</id>
     <name>Internet Applications</name>
     <name xml:lang="as">ইন্টাৰনেট এপ্লিকেচনসমূহ</name>
@@ -2860,15 +2860,15 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">evolution</packagereq>
-      <packagereq variant="Certified" type="default">evolution-ews</packagereq>
-      <packagereq variant="Certified" type="default">evolution-help</packagereq>
-      <packagereq variant="Certified" type="default">evolution-mapi</packagereq>
-      <packagereq variant="Certified" type="default">hexchat</packagereq>
-      <packagereq variant="Certified" type="optional">thunderbird</packagereq>
+      <packagereq variant="OS" type="default">evolution</packagereq>
+      <packagereq variant="OS" type="default">evolution-ews</packagereq>
+      <packagereq variant="OS" type="default">evolution-help</packagereq>
+      <packagereq variant="OS" type="default">evolution-mapi</packagereq>
+      <packagereq variant="OS" type="default">hexchat</packagereq>
+      <packagereq variant="OS" type="optional">thunderbird</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>internet-browser-chromium</id>
     <name>Internet Browser Chromium</name>
     <name xml:lang="as">ইন্টাৰনেট ব্ৰাউছাৰ Chromium</name>
@@ -2914,11 +2914,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">chromium</packagereq>
-      <packagereq variant="Certified" type="mandatory">mozilla-openh264</packagereq>
+      <packagereq variant="OS" type="mandatory">chromium</packagereq>
+      <packagereq variant="OS" type="mandatory">mozilla-openh264</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>internet-browser-firefox</id>
     <name>Internet Browser Firefox</name>
     <name xml:lang="as">ইন্টাৰনেট ব্ৰাউছাৰ Firefox</name>
@@ -2964,11 +2964,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">firefox</packagereq>
-      <packagereq variant="Certified" type="mandatory">mozilla-openh264</packagereq>
+      <packagereq variant="OS" type="mandatory">firefox</packagereq>
+      <packagereq variant="OS" type="mandatory">mozilla-openh264</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>java-development</id>
     <name>Java Development</name>
     <name xml:lang="am">የጃቫ እድገት</name>
@@ -3112,50 +3112,50 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">ant</packagereq>
-      <packagereq variant="Certified" type="default">ant-antlr</packagereq>
-      <packagereq variant="Certified" type="default">ant-apache-bcel</packagereq>
-      <packagereq variant="Certified" type="default">ant-apache-bsf</packagereq>
-      <packagereq variant="Certified" type="default">ant-apache-oro</packagereq>
-      <packagereq variant="Certified" type="default">ant-apache-regexp</packagereq>
-      <packagereq variant="Certified" type="default">ant-apache-resolver</packagereq>
-      <packagereq variant="Certified" type="default">ant-apache-xalan2</packagereq>
-      <packagereq variant="Certified" type="default">ant-commons-logging</packagereq>
-      <packagereq variant="Certified" type="default">ant-commons-net</packagereq>
-      <packagereq variant="Certified" type="default">ant-javamail</packagereq>
-      <packagereq variant="Certified" type="default">ant-jdepend</packagereq>
-      <packagereq variant="Certified" type="default">ant-jmf</packagereq>
-      <packagereq variant="Certified" type="default">ant-jsch</packagereq>
-      <packagereq variant="Certified" type="default">ant-junit</packagereq>
-      <packagereq variant="Certified" type="default">ant-junit5</packagereq>
-      <packagereq variant="Certified" type="default">ant-swing</packagereq>
-      <packagereq variant="Certified" type="default">ant-testutil</packagereq>
-      <packagereq variant="Certified" type="default">ant-xz</packagereq>
-      <packagereq variant="Certified" type="default">java-1.8.0-openjdk-demo</packagereq>
-      <packagereq variant="Certified" type="default">java-1.8.0-openjdk-devel</packagereq>
-      <packagereq variant="Certified" type="default">java-1.8.0-openjdk-javadoc</packagereq>
-      <packagereq variant="Certified" type="default">java-1.8.0-openjdk-javadoc-zip</packagereq>
-      <packagereq variant="Certified" type="default">java-1.8.0-openjdk-src</packagereq>
-      <packagereq variant="Certified" type="default">java-11-openjdk-demo</packagereq>
-      <packagereq variant="Certified" type="default">java-11-openjdk-devel</packagereq>
-      <packagereq variant="Certified" type="default">java-11-openjdk-javadoc</packagereq>
-      <packagereq variant="Certified" type="default">java-11-openjdk-javadoc-zip</packagereq>
-      <packagereq variant="Certified" type="default">java-11-openjdk-jmods</packagereq>
-      <packagereq variant="Certified" type="default">java-11-openjdk-src</packagereq>
-      <packagereq variant="Certified" type="default">java-11-openjdk-static-libs</packagereq>
-      <packagereq variant="Certified" type="default">java-17-openjdk-demo</packagereq>
-      <packagereq variant="Certified" type="default">java-17-openjdk-devel</packagereq>
-      <packagereq variant="Certified" type="default">java-17-openjdk-javadoc</packagereq>
-      <packagereq variant="Certified" type="default">java-17-openjdk-javadoc-zip</packagereq>
-      <packagereq variant="Certified" type="default">java-17-openjdk-jmods</packagereq>
-      <packagereq variant="Certified" type="default">java-17-openjdk-src</packagereq>
-      <packagereq variant="Certified" type="default">java-17-openjdk-static-libs</packagereq>
-      <packagereq variant="Certified" type="default">log4j</packagereq>
-      <packagereq variant="Certified" type="default">log4j-jcl</packagereq>
-      <packagereq variant="Certified" type="default">log4j-slf4j</packagereq>
+      <packagereq variant="OS" type="default">ant</packagereq>
+      <packagereq variant="OS" type="default">ant-antlr</packagereq>
+      <packagereq variant="OS" type="default">ant-apache-bcel</packagereq>
+      <packagereq variant="OS" type="default">ant-apache-bsf</packagereq>
+      <packagereq variant="OS" type="default">ant-apache-oro</packagereq>
+      <packagereq variant="OS" type="default">ant-apache-regexp</packagereq>
+      <packagereq variant="OS" type="default">ant-apache-resolver</packagereq>
+      <packagereq variant="OS" type="default">ant-apache-xalan2</packagereq>
+      <packagereq variant="OS" type="default">ant-commons-logging</packagereq>
+      <packagereq variant="OS" type="default">ant-commons-net</packagereq>
+      <packagereq variant="OS" type="default">ant-javamail</packagereq>
+      <packagereq variant="OS" type="default">ant-jdepend</packagereq>
+      <packagereq variant="OS" type="default">ant-jmf</packagereq>
+      <packagereq variant="OS" type="default">ant-jsch</packagereq>
+      <packagereq variant="OS" type="default">ant-junit</packagereq>
+      <packagereq variant="OS" type="default">ant-junit5</packagereq>
+      <packagereq variant="OS" type="default">ant-swing</packagereq>
+      <packagereq variant="OS" type="default">ant-testutil</packagereq>
+      <packagereq variant="OS" type="default">ant-xz</packagereq>
+      <packagereq variant="OS" type="default">java-1.8.0-openjdk-demo</packagereq>
+      <packagereq variant="OS" type="default">java-1.8.0-openjdk-devel</packagereq>
+      <packagereq variant="OS" type="default">java-1.8.0-openjdk-javadoc</packagereq>
+      <packagereq variant="OS" type="default">java-1.8.0-openjdk-javadoc-zip</packagereq>
+      <packagereq variant="OS" type="default">java-1.8.0-openjdk-src</packagereq>
+      <packagereq variant="OS" type="default">java-11-openjdk-demo</packagereq>
+      <packagereq variant="OS" type="default">java-11-openjdk-devel</packagereq>
+      <packagereq variant="OS" type="default">java-11-openjdk-javadoc</packagereq>
+      <packagereq variant="OS" type="default">java-11-openjdk-javadoc-zip</packagereq>
+      <packagereq variant="OS" type="default">java-11-openjdk-jmods</packagereq>
+      <packagereq variant="OS" type="default">java-11-openjdk-src</packagereq>
+      <packagereq variant="OS" type="default">java-11-openjdk-static-libs</packagereq>
+      <packagereq variant="OS" type="default">java-17-openjdk-demo</packagereq>
+      <packagereq variant="OS" type="default">java-17-openjdk-devel</packagereq>
+      <packagereq variant="OS" type="default">java-17-openjdk-javadoc</packagereq>
+      <packagereq variant="OS" type="default">java-17-openjdk-javadoc-zip</packagereq>
+      <packagereq variant="OS" type="default">java-17-openjdk-jmods</packagereq>
+      <packagereq variant="OS" type="default">java-17-openjdk-src</packagereq>
+      <packagereq variant="OS" type="default">java-17-openjdk-static-libs</packagereq>
+      <packagereq variant="OS" type="default">log4j</packagereq>
+      <packagereq variant="OS" type="default">log4j-jcl</packagereq>
+      <packagereq variant="OS" type="default">log4j-slf4j</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>java-platform</id>
     <name>Java Platform</name>
     <name xml:lang="as">Java প্লেটফৰ্ম</name>
@@ -3219,12 +3219,12 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">java-1.8.0-openjdk</packagereq>
-      <packagereq variant="Certified" type="default">java-11-openjdk</packagereq>
-      <packagereq variant="Certified" type="default">java-17-openjdk</packagereq>
+      <packagereq variant="OS" type="default">java-1.8.0-openjdk</packagereq>
+      <packagereq variant="OS" type="default">java-11-openjdk</packagereq>
+      <packagereq variant="OS" type="default">java-17-openjdk</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>large-systems</id>
     <name>Large Systems Performance</name>
     <name xml:lang="as">ডাঙৰ চিস্টেমসমূহৰ পৰিৱেশন</name>
@@ -3286,13 +3286,13 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">numactl</packagereq>
-      <packagereq variant="Certified" type="mandatory">numad</packagereq>
-      <packagereq variant="Certified" type="default">hwloc</packagereq>
-      <packagereq variant="Certified" type="optional">numatop</packagereq>
+      <packagereq variant="OS" type="mandatory">numactl</packagereq>
+      <packagereq variant="OS" type="mandatory">numad</packagereq>
+      <packagereq variant="OS" type="default">hwloc</packagereq>
+      <packagereq variant="OS" type="optional">numatop</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>legacy-unix</id>
     <name>Legacy UNIX Compatibility</name>
     <name xml:lang="as">কিম্বদন্তি UNIX ৰ সৈতে সংগতি</name>
@@ -3354,10 +3354,10 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="optional">mksh</packagereq>
+      <packagereq variant="OS" type="optional">mksh</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>legacy-x</id>
     <name>Legacy X Window System Compatibility</name>
     <name xml:lang="as">কিম্বদন্তি X উইন্ডো চিস্টেম সংগতি</name>
@@ -3419,16 +3419,16 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">libXmu</packagereq>
-      <packagereq variant="Certified" type="default">libXp</packagereq>
-      <packagereq variant="Certified" type="default">motif</packagereq>
-      <packagereq variant="Certified" type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
-      <packagereq variant="Certified" type="default">xorg-x11-fonts-misc</packagereq>
-      <packagereq variant="Certified" type="default">xorg-x11-fonts-Type1</packagereq>
-      <packagereq variant="Certified" type="optional">xterm</packagereq>
+      <packagereq variant="OS" type="default">libXmu</packagereq>
+      <packagereq variant="OS" type="default">libXp</packagereq>
+      <packagereq variant="OS" type="default">motif</packagereq>
+      <packagereq variant="OS" type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
+      <packagereq variant="OS" type="default">xorg-x11-fonts-misc</packagereq>
+      <packagereq variant="OS" type="default">xorg-x11-fonts-Type1</packagereq>
+      <packagereq variant="OS" type="optional">xterm</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>mail-server</id>
     <name>Mail Server</name>
     <name xml:lang="af">Posbediener</name>
@@ -3578,22 +3578,22 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">dovecot</packagereq>
-      <packagereq variant="Certified" type="default">postfix</packagereq>
-      <packagereq variant="Certified" type="default">spamassassin</packagereq>
-      <packagereq variant="Certified" type="default">cyrus-sasl</packagereq>
-      <packagereq variant="Certified" type="optional">cyrus-imapd</packagereq>
-      <packagereq variant="Certified" type="optional">dovecot-pigeonhole</packagereq>
-      <packagereq variant="Certified" type="optional">postfix-cdb</packagereq>
-      <packagereq variant="Certified" type="optional">postfix-ldap</packagereq>
-      <packagereq variant="Certified" type="optional">postfix-pcre</packagereq>
-      <packagereq variant="Certified" type="optional">postfix-sqlite</packagereq>
-      <packagereq variant="Certified" type="optional">sendmail</packagereq>
-      <packagereq variant="Certified" type="optional">sendmail-cf</packagereq>
-      <packagereq variant="Certified" type="optional">sendmail-doc</packagereq>
+      <packagereq variant="OS" type="default">dovecot</packagereq>
+      <packagereq variant="OS" type="default">postfix</packagereq>
+      <packagereq variant="OS" type="default">spamassassin</packagereq>
+      <packagereq variant="OS" type="default">cyrus-sasl</packagereq>
+      <packagereq variant="OS" type="optional">cyrus-imapd</packagereq>
+      <packagereq variant="OS" type="optional">dovecot-pigeonhole</packagereq>
+      <packagereq variant="OS" type="optional">postfix-cdb</packagereq>
+      <packagereq variant="OS" type="optional">postfix-ldap</packagereq>
+      <packagereq variant="OS" type="optional">postfix-pcre</packagereq>
+      <packagereq variant="OS" type="optional">postfix-sqlite</packagereq>
+      <packagereq variant="OS" type="optional">sendmail</packagereq>
+      <packagereq variant="OS" type="optional">sendmail-cf</packagereq>
+      <packagereq variant="OS" type="optional">sendmail-doc</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>mainframe-access</id>
     <name>Mainframe Access</name>
     <name xml:lang="as">মেইন-ফ্ৰেম ব্যৱহাৰৰ সুবিধা</name>
@@ -3658,10 +3658,10 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">x3270-text</packagereq>
+      <packagereq variant="OS" type="default">x3270-text</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>multimedia</id>
     <name>Multimedia</name>
     <name xml:lang="ar">وسائط متعددة</name>
@@ -3725,31 +3725,31 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">alsa-ucm</packagereq>
-      <packagereq variant="Certified" type="mandatory">alsa-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">deadbeef-plugins</packagereq>
-      <packagereq variant="Certified" type="mandatory">deadbeef</packagereq>
-      <packagereq variant="Certified" type="mandatory">gstreamer1-plugin-libav</packagereq>
-      <packagereq variant="Certified" type="mandatory">gstreamer1-plugin-openh264</packagereq>
-      <packagereq variant="Certified" type="mandatory">gstreamer1-plugins-bad-free</packagereq>
-      <packagereq variant="Certified" type="mandatory">gstreamer1-plugins-bad-freeworld</packagereq>
-      <packagereq variant="Certified" type="mandatory">gstreamer1-plugins-good</packagereq>
-      <packagereq variant="Certified" type="mandatory">gstreamer1-plugins-ugly-free</packagereq>
-      <packagereq variant="Certified" type="mandatory">gstreamer1-plugins-ugly</packagereq>
-      <packagereq variant="Certified" type="mandatory">libdvdcss</packagereq>
-      <packagereq variant="Certified" type="mandatory">mpv</packagereq>
-      <packagereq variant="Certified" type="mandatory">PackageKit-gstreamer-plugin</packagereq>
-      <packagereq variant="Certified" type="mandatory">pipewire-alsa</packagereq>
-      <packagereq variant="Certified" type="mandatory">pipewire-gstreamer</packagereq>
-      <packagereq variant="Certified" type="mandatory">pipewire-jack-audio-connection-kit</packagereq>
-      <packagereq variant="Certified" type="mandatory">pipewire-module-xrdp</packagereq>
-      <packagereq variant="Certified" type="mandatory">pipewire-pulseaudio</packagereq>
-      <packagereq variant="Certified" type="mandatory">pipewire-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">pipewire</packagereq>
-      <packagereq variant="Certified" type="optional">pavucontrol</packagereq>
+      <packagereq variant="OS" type="mandatory">alsa-ucm</packagereq>
+      <packagereq variant="OS" type="mandatory">alsa-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">deadbeef-plugins</packagereq>
+      <packagereq variant="OS" type="mandatory">deadbeef</packagereq>
+      <packagereq variant="OS" type="mandatory">gstreamer1-plugin-libav</packagereq>
+      <packagereq variant="OS" type="mandatory">gstreamer1-plugin-openh264</packagereq>
+      <packagereq variant="OS" type="mandatory">gstreamer1-plugins-bad-free</packagereq>
+      <packagereq variant="OS" type="mandatory">gstreamer1-plugins-bad-freeworld</packagereq>
+      <packagereq variant="OS" type="mandatory">gstreamer1-plugins-good</packagereq>
+      <packagereq variant="OS" type="mandatory">gstreamer1-plugins-ugly-free</packagereq>
+      <packagereq variant="OS" type="mandatory">gstreamer1-plugins-ugly</packagereq>
+      <packagereq variant="OS" type="mandatory">libdvdcss</packagereq>
+      <packagereq variant="OS" type="mandatory">mpv</packagereq>
+      <packagereq variant="OS" type="mandatory">PackageKit-gstreamer-plugin</packagereq>
+      <packagereq variant="OS" type="mandatory">pipewire-alsa</packagereq>
+      <packagereq variant="OS" type="mandatory">pipewire-gstreamer</packagereq>
+      <packagereq variant="OS" type="mandatory">pipewire-jack-audio-connection-kit</packagereq>
+      <packagereq variant="OS" type="mandatory">pipewire-module-xrdp</packagereq>
+      <packagereq variant="OS" type="mandatory">pipewire-pulseaudio</packagereq>
+      <packagereq variant="OS" type="mandatory">pipewire-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">pipewire</packagereq>
+      <packagereq variant="OS" type="optional">pavucontrol</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>network-file-system-client</id>
     <name>Network File System Client</name>
     <name xml:lang="as">নেটৱাৰ্ক ফাইল চিস্টেম ক্লাএন্ট</name>
@@ -3811,21 +3811,21 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">autofs</packagereq>
-      <packagereq variant="Certified" type="mandatory">cifs-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">device-mapper-multipath</packagereq>
-      <packagereq variant="Certified" type="mandatory">fcoe-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">gssproxy</packagereq>
-      <packagereq variant="Certified" type="mandatory">iscsi-initiator-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">lldpad</packagereq>
-      <packagereq variant="Certified" type="mandatory">nfs-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">nfs4-acl-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">samba-client</packagereq>
-      <packagereq variant="Certified" type="mandatory">targetcli</packagereq>
-      <packagereq variant="Certified" type="optional">cachefilesd</packagereq>
+      <packagereq variant="OS" type="mandatory">autofs</packagereq>
+      <packagereq variant="OS" type="mandatory">cifs-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">device-mapper-multipath</packagereq>
+      <packagereq variant="OS" type="mandatory">fcoe-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">gssproxy</packagereq>
+      <packagereq variant="OS" type="mandatory">iscsi-initiator-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">lldpad</packagereq>
+      <packagereq variant="OS" type="mandatory">nfs-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">nfs4-acl-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">samba-client</packagereq>
+      <packagereq variant="OS" type="mandatory">targetcli</packagereq>
+      <packagereq variant="OS" type="optional">cachefilesd</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>network-server</id>
     <name>Network Servers</name>
     <name xml:lang="af">Netwerkbedieners</name>
@@ -3982,24 +3982,24 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="optional">dhcp-server</packagereq>
-      <packagereq variant="Certified" type="optional">krb5-server</packagereq>
-      <packagereq variant="Certified" type="optional">syslinux</packagereq>
-      <packagereq variant="Certified" type="optional">dnsmasq</packagereq>
-      <packagereq variant="Certified" type="optional">freeradius</packagereq>
-      <packagereq variant="Certified" type="optional">frr</packagereq>
-      <packagereq variant="Certified" type="optional">idn2</packagereq>
-      <packagereq variant="Certified" type="optional">libreswan</packagereq>
-      <packagereq variant="Certified" type="optional">radvd</packagereq>
-      <packagereq variant="Certified" type="optional">rsyslog-gnutls</packagereq>
-      <packagereq variant="Certified" type="optional">rsyslog-gssapi</packagereq>
-      <packagereq variant="Certified" type="optional">rsyslog-mysql</packagereq>
-      <packagereq variant="Certified" type="optional">rsyslog-pgsql</packagereq>
-      <packagereq variant="Certified" type="optional">rsyslog-relp</packagereq>
-      <packagereq variant="Certified" type="optional">tang</packagereq>
+      <packagereq variant="OS" type="optional">dhcp-server</packagereq>
+      <packagereq variant="OS" type="optional">krb5-server</packagereq>
+      <packagereq variant="OS" type="optional">syslinux</packagereq>
+      <packagereq variant="OS" type="optional">dnsmasq</packagereq>
+      <packagereq variant="OS" type="optional">freeradius</packagereq>
+      <packagereq variant="OS" type="optional">frr</packagereq>
+      <packagereq variant="OS" type="optional">idn2</packagereq>
+      <packagereq variant="OS" type="optional">libreswan</packagereq>
+      <packagereq variant="OS" type="optional">radvd</packagereq>
+      <packagereq variant="OS" type="optional">rsyslog-gnutls</packagereq>
+      <packagereq variant="OS" type="optional">rsyslog-gssapi</packagereq>
+      <packagereq variant="OS" type="optional">rsyslog-mysql</packagereq>
+      <packagereq variant="OS" type="optional">rsyslog-pgsql</packagereq>
+      <packagereq variant="OS" type="optional">rsyslog-relp</packagereq>
+      <packagereq variant="OS" type="optional">tang</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>network-tools</id>
     <name>Networking Tools</name>
     <name xml:lang="as">নেটৱাৰ্ক ব্যৱস্থাৰ বিভিন্ন সঁজুলিসমূহ</name>
@@ -4064,23 +4064,23 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">tcpdump</packagereq>
-      <packagereq variant="Certified" type="default">libreswan</packagereq>
-      <packagereq variant="Certified" type="default">nmap-ncat</packagereq>
-      <packagereq variant="Certified" type="default">socat</packagereq>
-      <packagereq variant="Certified" type="optional">mrtg</packagereq>
-      <packagereq variant="Certified" type="optional">nmap</packagereq>
-      <packagereq variant="Certified" type="optional">nmstate</packagereq>
-      <packagereq variant="Certified" type="optional">wireshark</packagereq>
-      <packagereq variant="Certified" type="optional">xdp-tools</packagereq>
-      <packagereq variant="Certified" type="optional">ipset</packagereq>
-      <packagereq variant="Certified" type="optional">iptraf-ng</packagereq>
-      <packagereq variant="Certified" type="optional">lksctp-tools</packagereq>
-      <packagereq variant="Certified" type="optional">netlabel_tools</packagereq>
-      <packagereq variant="Certified" type="optional">stunnel</packagereq>
+      <packagereq variant="OS" type="mandatory">tcpdump</packagereq>
+      <packagereq variant="OS" type="default">libreswan</packagereq>
+      <packagereq variant="OS" type="default">nmap-ncat</packagereq>
+      <packagereq variant="OS" type="default">socat</packagereq>
+      <packagereq variant="OS" type="optional">mrtg</packagereq>
+      <packagereq variant="OS" type="optional">nmap</packagereq>
+      <packagereq variant="OS" type="optional">nmstate</packagereq>
+      <packagereq variant="OS" type="optional">wireshark</packagereq>
+      <packagereq variant="OS" type="optional">xdp-tools</packagereq>
+      <packagereq variant="OS" type="optional">ipset</packagereq>
+      <packagereq variant="OS" type="optional">iptraf-ng</packagereq>
+      <packagereq variant="OS" type="optional">lksctp-tools</packagereq>
+      <packagereq variant="OS" type="optional">netlabel_tools</packagereq>
+      <packagereq variant="OS" type="optional">stunnel</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>networkmanager-submodules</id>
     <name>Common NetworkManager submodules</name>
     <name xml:lang="fr">Sous-modules de NetworkManager communément utilisés</name>
@@ -4097,14 +4097,14 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">dnsmasq</packagereq>
-      <packagereq variant="Certified" type="default">iptables-nft</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-bluetooth</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-wifi</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-wwan</packagereq>
+      <packagereq variant="OS" type="default">dnsmasq</packagereq>
+      <packagereq variant="OS" type="default">iptables-nft</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-bluetooth</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-wifi</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-wwan</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>office-suite</id>
     <name>Office Suite and Productivity</name>
     <name xml:lang="as">কাৰ্যালয় গোট আৰু কাৰ্য্যক্ষমতা</name>
@@ -4169,20 +4169,20 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">libreoffice-calc</packagereq>
-      <packagereq variant="Certified" type="default">libreoffice-draw</packagereq>
-      <packagereq variant="Certified" type="default">libreoffice-emailmerge</packagereq>
-      <packagereq variant="Certified" type="default">libreoffice-graphicfilter</packagereq>
-      <packagereq variant="Certified" type="default">libreoffice-impress</packagereq>
-      <packagereq variant="Certified" type="default">libreoffice-math</packagereq>
-      <packagereq variant="Certified" type="default">libreoffice-writer</packagereq>
-      <packagereq variant="Certified" type="optional">libreoffice-base</packagereq>
-      <packagereq variant="Certified" type="optional">libreoffice-ogltrans</packagereq>
-      <packagereq variant="Certified" type="optional">libreoffice-pyuno</packagereq>
-      <packagereq variant="Certified" type="optional">libreoffice-wiki-publisher</packagereq>
+      <packagereq variant="OS" type="default">libreoffice-calc</packagereq>
+      <packagereq variant="OS" type="default">libreoffice-draw</packagereq>
+      <packagereq variant="OS" type="default">libreoffice-emailmerge</packagereq>
+      <packagereq variant="OS" type="default">libreoffice-graphicfilter</packagereq>
+      <packagereq variant="OS" type="default">libreoffice-impress</packagereq>
+      <packagereq variant="OS" type="default">libreoffice-math</packagereq>
+      <packagereq variant="OS" type="default">libreoffice-writer</packagereq>
+      <packagereq variant="OS" type="optional">libreoffice-base</packagereq>
+      <packagereq variant="OS" type="optional">libreoffice-ogltrans</packagereq>
+      <packagereq variant="OS" type="optional">libreoffice-pyuno</packagereq>
+      <packagereq variant="OS" type="optional">libreoffice-wiki-publisher</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>ostree-support</id>
     <name>Image based rpm-ostree support</name>
     <name xml:lang="fr">Prise en charge de rpm-ostree basée-image</name>
@@ -4205,12 +4205,12 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">nss-altfiles</packagereq>
-      <packagereq variant="Certified" type="mandatory">ostree-grub2</packagereq>
-      <packagereq variant="Certified" type="mandatory">rpm-ostree</packagereq>
+      <packagereq variant="OS" type="mandatory">nss-altfiles</packagereq>
+      <packagereq variant="OS" type="mandatory">ostree-grub2</packagereq>
+      <packagereq variant="OS" type="mandatory">rpm-ostree</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>performance</id>
     <name>Performance Tools</name>
     <name xml:lang="as">কাৰ্য্যক্ষমতা সম্বন্ধীয় সঁজুলিসমূহ</name>
@@ -4275,124 +4275,124 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">blktrace</packagereq>
-      <packagereq variant="Certified" type="mandatory">sysstat</packagereq>
-      <packagereq variant="Certified" type="default">grafana</packagereq>
-      <packagereq variant="Certified" type="default">grafana-pcp</packagereq>
-      <packagereq variant="Certified" type="default">iowatcher</packagereq>
-      <packagereq variant="Certified" type="default">pcp</packagereq>
-      <packagereq variant="Certified" type="default">pcp-conf</packagereq>
-      <packagereq variant="Certified" type="default">pcp-devel</packagereq>
-      <packagereq variant="Certified" type="default">pcp-doc</packagereq>
-      <packagereq variant="Certified" type="default">pcp-export-pcp2elasticsearch</packagereq>
-      <packagereq variant="Certified" type="default">pcp-export-pcp2graphite</packagereq>
-      <packagereq variant="Certified" type="default">pcp-export-pcp2influxdb</packagereq>
-      <packagereq variant="Certified" type="default">pcp-export-pcp2json</packagereq>
-      <packagereq variant="Certified" type="default">pcp-export-pcp2spark</packagereq>
-      <packagereq variant="Certified" type="default">pcp-export-pcp2xml</packagereq>
-      <packagereq variant="Certified" type="default">pcp-export-pcp2zabbix</packagereq>
-      <packagereq variant="Certified" type="default">pcp-export-zabbix-agent</packagereq>
-      <packagereq variant="Certified" type="default">pcp-gui</packagereq>
-      <packagereq variant="Certified" type="default">pcp-import-collectl2pcp</packagereq>
-      <packagereq variant="Certified" type="default">pcp-import-ganglia2pcp</packagereq>
-      <packagereq variant="Certified" type="default">pcp-import-iostat2pcp</packagereq>
-      <packagereq variant="Certified" type="default">pcp-import-mrtg2pcp</packagereq>
-      <packagereq variant="Certified" type="default">pcp-import-sar2pcp</packagereq>
-      <packagereq variant="Certified" type="default">pcp-libs</packagereq>
-      <packagereq variant="Certified" type="default">pcp-libs-devel</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-activemq</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-apache</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-bash</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-bcc</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-bind2</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-bonding</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-bpf</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-bpftrace</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-cifs</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-cisco</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-dbping</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-denki</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-dm</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-docker</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-ds389</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-ds389log</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-elasticsearch</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-gfs2</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-gluster</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-gpfs</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-gpsd</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-haproxy</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-infiniband</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-json</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-kvm</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-libvirt</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-lio</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-lmsensors</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-logger</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-lustre</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-lustrecomm</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-mailq</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-memcache</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-mic</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-mongodb</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-mounts</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-mssql</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-mysql</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-named</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-netcheck</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-netfilter</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-news</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-nfsclient</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-nginx</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-nvidia-gpu</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-openmetrics</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-oracle</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-pdns</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-perfevent</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-postfix</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-redis</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-roomtemp</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-rsyslog</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-samba</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-sendmail</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-shping</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-slurm</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-smart</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-snmp</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-summary</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-systemd</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-trace</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-unbound</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-weblog</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-zimbra</packagereq>
-      <packagereq variant="Certified" type="default">pcp-pmda-zswap</packagereq>
-      <packagereq variant="Certified" type="default">pcp-selinux</packagereq>
-      <packagereq variant="Certified" type="default">pcp-system-tools</packagereq>
-      <packagereq variant="Certified" type="default">pcp-testsuite</packagereq>
-      <packagereq variant="Certified" type="default">pcp-zeroconf</packagereq>
-      <packagereq variant="Certified" type="default">perf</packagereq>
-      <packagereq variant="Certified" type="default">perl-PCP-LogImport</packagereq>
-      <packagereq variant="Certified" type="default">perl-PCP-LogSummary</packagereq>
-      <packagereq variant="Certified" type="default">perl-PCP-MMV</packagereq>
-      <packagereq variant="Certified" type="default">perl-PCP-PMDA</packagereq>
-      <packagereq variant="Certified" type="default">powertop</packagereq>
-      <packagereq variant="Certified" type="default">python3-pcp</packagereq>
-      <packagereq variant="Certified" type="default">elfutils</packagereq>
-      <packagereq variant="Certified" type="default">iotop</packagereq>
-      <packagereq variant="Certified" type="default">strace</packagereq>
-      <packagereq variant="Certified" type="optional">hdparm</packagereq>
-      <packagereq variant="Certified" type="optional">tuned-profiles-cpu-partitioning</packagereq>
-      <packagereq variant="Certified" type="optional">fio</packagereq>
-      <packagereq variant="Certified" type="optional">iperf3</packagereq>
-      <packagereq variant="Certified" type="optional">libpfm</packagereq>
-      <packagereq variant="Certified" type="optional">papi</packagereq>
-      <packagereq variant="Certified" type="optional">papi-devel</packagereq>
-      <packagereq variant="Certified" type="optional">systemtap</packagereq>
-      <packagereq variant="Certified" type="optional">tuned-utils</packagereq>
-      <packagereq variant="Certified" type="optional">valgrind</packagereq>
+      <packagereq variant="OS" type="mandatory">blktrace</packagereq>
+      <packagereq variant="OS" type="mandatory">sysstat</packagereq>
+      <packagereq variant="OS" type="default">grafana</packagereq>
+      <packagereq variant="OS" type="default">grafana-pcp</packagereq>
+      <packagereq variant="OS" type="default">iowatcher</packagereq>
+      <packagereq variant="OS" type="default">pcp</packagereq>
+      <packagereq variant="OS" type="default">pcp-conf</packagereq>
+      <packagereq variant="OS" type="default">pcp-devel</packagereq>
+      <packagereq variant="OS" type="default">pcp-doc</packagereq>
+      <packagereq variant="OS" type="default">pcp-export-pcp2elasticsearch</packagereq>
+      <packagereq variant="OS" type="default">pcp-export-pcp2graphite</packagereq>
+      <packagereq variant="OS" type="default">pcp-export-pcp2influxdb</packagereq>
+      <packagereq variant="OS" type="default">pcp-export-pcp2json</packagereq>
+      <packagereq variant="OS" type="default">pcp-export-pcp2spark</packagereq>
+      <packagereq variant="OS" type="default">pcp-export-pcp2xml</packagereq>
+      <packagereq variant="OS" type="default">pcp-export-pcp2zabbix</packagereq>
+      <packagereq variant="OS" type="default">pcp-export-zabbix-agent</packagereq>
+      <packagereq variant="OS" type="default">pcp-gui</packagereq>
+      <packagereq variant="OS" type="default">pcp-import-collectl2pcp</packagereq>
+      <packagereq variant="OS" type="default">pcp-import-ganglia2pcp</packagereq>
+      <packagereq variant="OS" type="default">pcp-import-iostat2pcp</packagereq>
+      <packagereq variant="OS" type="default">pcp-import-mrtg2pcp</packagereq>
+      <packagereq variant="OS" type="default">pcp-import-sar2pcp</packagereq>
+      <packagereq variant="OS" type="default">pcp-libs</packagereq>
+      <packagereq variant="OS" type="default">pcp-libs-devel</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-activemq</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-apache</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-bash</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-bcc</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-bind2</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-bonding</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-bpf</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-bpftrace</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-cifs</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-cisco</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-dbping</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-denki</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-dm</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-docker</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-ds389</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-ds389log</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-elasticsearch</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-gfs2</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-gluster</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-gpfs</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-gpsd</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-haproxy</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-infiniband</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-json</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-kvm</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-libvirt</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-lio</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-lmsensors</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-logger</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-lustre</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-lustrecomm</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-mailq</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-memcache</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-mic</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-mongodb</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-mounts</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-mssql</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-mysql</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-named</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-netcheck</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-netfilter</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-news</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-nfsclient</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-nginx</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-nvidia-gpu</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-openmetrics</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-oracle</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-pdns</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-perfevent</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-postfix</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-redis</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-roomtemp</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-rsyslog</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-samba</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-sendmail</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-shping</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-slurm</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-smart</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-snmp</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-summary</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-systemd</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-trace</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-unbound</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-weblog</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-zimbra</packagereq>
+      <packagereq variant="OS" type="default">pcp-pmda-zswap</packagereq>
+      <packagereq variant="OS" type="default">pcp-selinux</packagereq>
+      <packagereq variant="OS" type="default">pcp-system-tools</packagereq>
+      <packagereq variant="OS" type="default">pcp-testsuite</packagereq>
+      <packagereq variant="OS" type="default">pcp-zeroconf</packagereq>
+      <packagereq variant="OS" type="default">perf</packagereq>
+      <packagereq variant="OS" type="default">perl-PCP-LogImport</packagereq>
+      <packagereq variant="OS" type="default">perl-PCP-LogSummary</packagereq>
+      <packagereq variant="OS" type="default">perl-PCP-MMV</packagereq>
+      <packagereq variant="OS" type="default">perl-PCP-PMDA</packagereq>
+      <packagereq variant="OS" type="default">powertop</packagereq>
+      <packagereq variant="OS" type="default">python3-pcp</packagereq>
+      <packagereq variant="OS" type="default">elfutils</packagereq>
+      <packagereq variant="OS" type="default">iotop</packagereq>
+      <packagereq variant="OS" type="default">strace</packagereq>
+      <packagereq variant="OS" type="optional">hdparm</packagereq>
+      <packagereq variant="OS" type="optional">tuned-profiles-cpu-partitioning</packagereq>
+      <packagereq variant="OS" type="optional">fio</packagereq>
+      <packagereq variant="OS" type="optional">iperf3</packagereq>
+      <packagereq variant="OS" type="optional">libpfm</packagereq>
+      <packagereq variant="OS" type="optional">papi</packagereq>
+      <packagereq variant="OS" type="optional">papi-devel</packagereq>
+      <packagereq variant="OS" type="optional">systemtap</packagereq>
+      <packagereq variant="OS" type="optional">tuned-utils</packagereq>
+      <packagereq variant="OS" type="optional">valgrind</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>platform-devel</id>
     <name>Platform Development</name>
     <name xml:lang="as">প্লেটফৰ্ম উন্নয়ন</name>
@@ -4451,77 +4451,77 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">atk-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">cairo-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">dbus-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">desktop-file-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">fontconfig-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">freetype-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">glib2-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">glibc-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gtk2-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">gtk2-devel-docs</packagereq>
-      <packagereq variant="Certified" type="mandatory">gtk3-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">krb5-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libdb-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libICE-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libjpeg-turbo-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libpng-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libSM-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libstdc++-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libX11-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXext-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXft-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXi-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libxml2-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXrender-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXScrnSaver-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libxshmfence-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXt-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXtst-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXv-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">libXxf86dga-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">mesa-libGL-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">mesa-libGLU-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">mesa-libGLw-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">ncurses-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">nss-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">openldap-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">openssl-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">pam-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">pango-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qt3d-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtbase-mysql</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtbase-odbc</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtbase-postgresql</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtconnectivity-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtdoc</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtgraphicaleffects</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtimageformats</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtlocation-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtmultimedia-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtquickcontrols</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtquickcontrols2</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtscript-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtsensors-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtserialbus</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtserialport-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtsvg-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qttools-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qttranslations</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtwayland</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtwebchannel-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtwebsockets-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtx11extras-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtxmlpatterns-devel</packagereq>
-      <packagereq variant="Certified" type="mandatory">zlib-devel</packagereq>
-      <packagereq variant="Certified" type="optional">spirv-tools</packagereq>
-      <packagereq variant="Certified" type="optional">spirv-tools-libs</packagereq>
-      <packagereq variant="Certified" type="optional">vulkan-tools</packagereq>
-      <packagereq variant="Certified" type="optional">vulkan-validation-layers</packagereq>
+      <packagereq variant="OS" type="mandatory">atk-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">cairo-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">dbus-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">desktop-file-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">fontconfig-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">freetype-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">glib2-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">glibc-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gtk2-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">gtk2-devel-docs</packagereq>
+      <packagereq variant="OS" type="mandatory">gtk3-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">krb5-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libdb-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libICE-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libjpeg-turbo-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libpng-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libSM-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libstdc++-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libX11-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXext-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXft-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXi-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libxml2-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXrender-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXScrnSaver-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libxshmfence-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXt-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXtst-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXv-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">libXxf86dga-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">mesa-libGL-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">mesa-libGLU-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">mesa-libGLw-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">ncurses-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">nss-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">openldap-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">openssl-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">pam-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">pango-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qt3d-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtbase-mysql</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtbase-odbc</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtbase-postgresql</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtconnectivity-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtdoc</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtgraphicaleffects</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtimageformats</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtlocation-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtmultimedia-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtquickcontrols</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtquickcontrols2</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtscript-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtsensors-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtserialbus</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtserialport-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtsvg-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qttools-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qttranslations</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtwayland</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtwebchannel-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtwebsockets-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtx11extras-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtxmlpatterns-devel</packagereq>
+      <packagereq variant="OS" type="mandatory">zlib-devel</packagereq>
+      <packagereq variant="OS" type="optional">spirv-tools</packagereq>
+      <packagereq variant="OS" type="optional">spirv-tools-libs</packagereq>
+      <packagereq variant="OS" type="optional">vulkan-tools</packagereq>
+      <packagereq variant="OS" type="optional">vulkan-validation-layers</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>platform-kvm</id>
     <name>KVM platform specific packages</name>
     <name xml:lang="de">KVM plattformspezifische Pakete</name>
@@ -4550,10 +4550,10 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">qemu-guest-agent</packagereq>
+      <packagereq variant="OS" type="mandatory">qemu-guest-agent</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>platform-microsoft</id>
     <name>Hyper-v platform specific packages</name>
     <name xml:lang="de">Hyper-V plattformspezifische Pakete</name>
@@ -4582,10 +4582,10 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">hyperv-daemons</packagereq>
+      <packagereq variant="OS" type="default">hyperv-daemons</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>platform-vmware</id>
     <name>VMware platform specific packages</name>
     <name xml:lang="de">VMware plattformspezifische Pakete</name>
@@ -4614,12 +4614,12 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">open-vm-tools</packagereq>
-      <packagereq variant="Certified" type="optional">open-vm-tools-desktop</packagereq>
-      <packagereq variant="Certified" type="optional">open-vm-tools-sdmp</packagereq>
+      <packagereq variant="OS" type="default">open-vm-tools</packagereq>
+      <packagereq variant="OS" type="optional">open-vm-tools-desktop</packagereq>
+      <packagereq variant="OS" type="optional">open-vm-tools-sdmp</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>print-server</id>
     <name>Printing Server</name>
     <name xml:lang="ru">Сервер печати</name>
@@ -4628,11 +4628,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">cups</packagereq>
-      <packagereq variant="Certified" type="mandatory">cups-lpd</packagereq>
+      <packagereq variant="OS" type="mandatory">cups</packagereq>
+      <packagereq variant="OS" type="mandatory">cups-lpd</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>print-client</id>
     <name>Printing Client</name>
     <name xml:lang="as">প্ৰিন্টিং ক্লাএন্ট</name>
@@ -4694,21 +4694,21 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">cups</packagereq>
-      <packagereq variant="Certified" type="mandatory">cups-pk-helper</packagereq>
-      <packagereq variant="Certified" type="mandatory">enscript</packagereq>
-      <packagereq variant="Certified" type="default">colord</packagereq>
-      <packagereq variant="Certified" type="default">gutenprint</packagereq>
-      <packagereq variant="Certified" type="default">gutenprint-cups</packagereq>
-      <packagereq variant="Certified" type="default">gutenprint-doc</packagereq>
-      <packagereq variant="Certified" type="default">paps</packagereq>
-      <packagereq variant="Certified" type="default">pnm2ppa</packagereq>
-      <packagereq variant="Certified" type="default">system-config-printer-udev</packagereq>
-      <packagereq variant="Certified" type="optional">bluez-cups</packagereq>
-      <packagereq variant="Certified" type="optional">hplip</packagereq>
+      <packagereq variant="OS" type="mandatory">cups</packagereq>
+      <packagereq variant="OS" type="mandatory">cups-pk-helper</packagereq>
+      <packagereq variant="OS" type="mandatory">enscript</packagereq>
+      <packagereq variant="OS" type="default">colord</packagereq>
+      <packagereq variant="OS" type="default">gutenprint</packagereq>
+      <packagereq variant="OS" type="default">gutenprint-cups</packagereq>
+      <packagereq variant="OS" type="default">gutenprint-doc</packagereq>
+      <packagereq variant="OS" type="default">paps</packagereq>
+      <packagereq variant="OS" type="default">pnm2ppa</packagereq>
+      <packagereq variant="OS" type="default">system-config-printer-udev</packagereq>
+      <packagereq variant="OS" type="optional">bluez-cups</packagereq>
+      <packagereq variant="OS" type="optional">hplip</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>python-web</id>
     <name>Python Web</name>
     <name xml:lang="de">Python Web</name>
@@ -4751,10 +4751,10 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">libcurl</packagereq>
+      <packagereq variant="OS" type="mandatory">libcurl</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>remote-desktop-clients</id>
     <name>Remote Desktop Clients</name>
     <name xml:lang="as">দূৰৰ ডেস্কটপ ক্লাএন্ট</name>
@@ -4789,12 +4789,12 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">remmina</packagereq>
-      <packagereq variant="Certified" type="optional">freerdp</packagereq>
-      <packagereq variant="Certified" type="optional">tigervnc</packagereq>
+      <packagereq variant="OS" type="default">remmina</packagereq>
+      <packagereq variant="OS" type="optional">freerdp</packagereq>
+      <packagereq variant="OS" type="optional">tigervnc</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>remote-system-management</id>
     <name>Remote Management for Linux</name>
     <name xml:lang="as">Linux ৰ বাবে দূৰৱৰ্তী ব্যৱস্থাপনা</name>
@@ -4836,21 +4836,21 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">cockpit</packagereq>
-      <packagereq variant="Certified" type="default">net-snmp</packagereq>
-      <packagereq variant="Certified" type="default">net-snmp-utils</packagereq>
-      <packagereq variant="Certified" type="default">rhel-system-roles</packagereq>
-      <packagereq variant="Certified" type="default">sblim-cmpi-base</packagereq>
-      <packagereq variant="Certified" type="default">tog-pegasus</packagereq>
-      <packagereq variant="Certified" type="default">wsmancli</packagereq>
-      <packagereq variant="Certified" type="optional">openwsman-server</packagereq>
-      <packagereq variant="Certified" type="optional">sblim-indication_helper</packagereq>
-      <packagereq variant="Certified" type="optional">sblim-sfcb</packagereq>
-      <packagereq variant="Certified" type="optional">sblim-wbemcli</packagereq>
-      <packagereq variant="Certified" type="optional">setroubleshoot-server</packagereq>
+      <packagereq variant="OS" type="default">cockpit</packagereq>
+      <packagereq variant="OS" type="default">net-snmp</packagereq>
+      <packagereq variant="OS" type="default">net-snmp-utils</packagereq>
+      <packagereq variant="OS" type="default">rhel-system-roles</packagereq>
+      <packagereq variant="OS" type="default">sblim-cmpi-base</packagereq>
+      <packagereq variant="OS" type="default">tog-pegasus</packagereq>
+      <packagereq variant="OS" type="default">wsmancli</packagereq>
+      <packagereq variant="OS" type="optional">openwsman-server</packagereq>
+      <packagereq variant="OS" type="optional">sblim-indication_helper</packagereq>
+      <packagereq variant="OS" type="optional">sblim-sfcb</packagereq>
+      <packagereq variant="OS" type="optional">sblim-wbemcli</packagereq>
+      <packagereq variant="OS" type="optional">setroubleshoot-server</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>rpm-development-tools</id>
     <name>RPM Development Tools</name>
     <name xml:lang="de">RPM Entwicklungswerkzeuge</name>
@@ -4873,13 +4873,13 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">redhat-rpm-config</packagereq>
-      <packagereq variant="Certified" type="mandatory">rpm-build</packagereq>
-      <packagereq variant="Certified" type="default">rpmdevtools</packagereq>
-      <packagereq variant="Certified" type="optional">rpmlint</packagereq>
+      <packagereq variant="OS" type="mandatory">redhat-rpm-config</packagereq>
+      <packagereq variant="OS" type="mandatory">rpm-build</packagereq>
+      <packagereq variant="OS" type="default">rpmdevtools</packagereq>
+      <packagereq variant="OS" type="optional">rpmlint</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>scientific</id>
     <name>Scientific Support</name>
     <name xml:lang="as">বৈজ্ঞানিক সমৰ্থন</name>
@@ -4941,20 +4941,20 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="optional">fftw</packagereq>
-      <packagereq variant="Certified" type="optional">fftw-devel</packagereq>
-      <packagereq variant="Certified" type="optional">fftw-static</packagereq>
-      <packagereq variant="Certified" type="optional">lapack</packagereq>
-      <packagereq variant="Certified" type="optional">mpich-devel</packagereq>
-      <packagereq variant="Certified" type="optional">openmpi</packagereq>
-      <packagereq variant="Certified" type="optional">openmpi-devel</packagereq>
-      <packagereq variant="Certified" type="optional">python3-numpy</packagereq>
-      <packagereq variant="Certified" type="optional">python3-scipy</packagereq>
-      <packagereq variant="Certified" type="optional">atlas</packagereq>
-      <packagereq variant="Certified" type="optional">units</packagereq>
+      <packagereq variant="OS" type="optional">fftw</packagereq>
+      <packagereq variant="OS" type="optional">fftw-devel</packagereq>
+      <packagereq variant="OS" type="optional">fftw-static</packagereq>
+      <packagereq variant="OS" type="optional">lapack</packagereq>
+      <packagereq variant="OS" type="optional">mpich-devel</packagereq>
+      <packagereq variant="OS" type="optional">openmpi</packagereq>
+      <packagereq variant="OS" type="optional">openmpi-devel</packagereq>
+      <packagereq variant="OS" type="optional">python3-numpy</packagereq>
+      <packagereq variant="OS" type="optional">python3-scipy</packagereq>
+      <packagereq variant="OS" type="optional">atlas</packagereq>
+      <packagereq variant="OS" type="optional">units</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>security-tools</id>
     <name>Security Tools</name>
     <name xml:lang="as">নিৰাপত্তা বিষয়ক সামগ্ৰীৰ সঁজুলি</name>
@@ -5020,21 +5020,21 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">scap-security-guide</packagereq>
-      <packagereq variant="Certified" type="optional">hmaccalc</packagereq>
-      <packagereq variant="Certified" type="optional">tpm2-tools</packagereq>
-      <packagereq variant="Certified" type="optional">tss2</packagereq>
-      <packagereq variant="Certified" type="optional">aide</packagereq>
-      <packagereq variant="Certified" type="optional">openscap</packagereq>
-      <packagereq variant="Certified" type="optional">openscap-engine-sce</packagereq>
-      <packagereq variant="Certified" type="optional">openscap-utils</packagereq>
-      <packagereq variant="Certified" type="optional">scap-security-guide-doc</packagereq>
-      <packagereq variant="Certified" type="optional">scap-workbench</packagereq>
-      <packagereq variant="Certified" type="optional">secure-delete</packagereq>
-      <packagereq variant="Certified" type="optional">udica</packagereq>
+      <packagereq variant="OS" type="default">scap-security-guide</packagereq>
+      <packagereq variant="OS" type="optional">hmaccalc</packagereq>
+      <packagereq variant="OS" type="optional">tpm2-tools</packagereq>
+      <packagereq variant="OS" type="optional">tss2</packagereq>
+      <packagereq variant="OS" type="optional">aide</packagereq>
+      <packagereq variant="OS" type="optional">openscap</packagereq>
+      <packagereq variant="OS" type="optional">openscap-engine-sce</packagereq>
+      <packagereq variant="OS" type="optional">openscap-utils</packagereq>
+      <packagereq variant="OS" type="optional">scap-security-guide-doc</packagereq>
+      <packagereq variant="OS" type="optional">scap-workbench</packagereq>
+      <packagereq variant="OS" type="optional">secure-delete</packagereq>
+      <packagereq variant="OS" type="optional">udica</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>server-product</id>
     <name>Server product core</name>
     <name xml:lang="de">Server-Produktkern</name>
@@ -5062,15 +5062,15 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">sphere-release</packagereq>
-      <packagereq variant="Certified" type="mandatory">chrony</packagereq>
-      <packagereq variant="Certified" type="mandatory">polkit</packagereq>
-      <packagereq variant="Certified" type="mandatory">realmd</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-config-server</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-team</packagereq>
+      <packagereq variant="OS" type="mandatory">sphere-release</packagereq>
+      <packagereq variant="OS" type="mandatory">chrony</packagereq>
+      <packagereq variant="OS" type="mandatory">polkit</packagereq>
+      <packagereq variant="OS" type="mandatory">realmd</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-config-server</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-team</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>smart-card</id>
     <name>Smart Card Support</name>
     <name xml:lang="as">স্মাৰ্ট কাৰ্ড সমৰ্থন</name>
@@ -5132,17 +5132,17 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">pcsc-lite-ccid</packagereq>
-      <packagereq variant="Certified" type="default">esc</packagereq>
-      <packagereq variant="Certified" type="optional">opencryptoki</packagereq>
-      <packagereq variant="Certified" type="optional">opencryptoki-icsftok</packagereq>
-      <packagereq variant="Certified" type="optional">opencryptoki-swtok</packagereq>
-      <packagereq variant="Certified" type="optional">opensc</packagereq>
-      <packagereq variant="Certified" type="optional">openssl-pkcs11</packagereq>
-      <packagereq variant="Certified" type="optional">sssd-polkit-rules</packagereq>
+      <packagereq variant="OS" type="default">pcsc-lite-ccid</packagereq>
+      <packagereq variant="OS" type="default">esc</packagereq>
+      <packagereq variant="OS" type="optional">opencryptoki</packagereq>
+      <packagereq variant="OS" type="optional">opencryptoki-icsftok</packagereq>
+      <packagereq variant="OS" type="optional">opencryptoki-swtok</packagereq>
+      <packagereq variant="OS" type="optional">opensc</packagereq>
+      <packagereq variant="OS" type="optional">openssl-pkcs11</packagereq>
+      <packagereq variant="OS" type="optional">sssd-polkit-rules</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>smb-server</id>
     <name>Windows File Server</name>
     <name xml:lang="af">Windows-lêerbediener</name>
@@ -5298,12 +5298,12 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">samba-client</packagereq>
-      <packagereq variant="Certified" type="mandatory">samba</packagereq>
-      <packagereq variant="Certified" type="default">cifs-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">samba-client</packagereq>
+      <packagereq variant="OS" type="mandatory">samba</packagereq>
+      <packagereq variant="OS" type="default">cifs-utils</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>standard</id>
     <name>Standard</name>
     <name xml:lang="de">Standard</name>
@@ -5330,95 +5330,95 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">bash-completion</packagereq>
-      <packagereq variant="Certified" type="default">blktrace</packagereq>
-      <packagereq variant="Certified" type="default">bluez</packagereq>
-      <packagereq variant="Certified" type="default">bzip2</packagereq>
-      <packagereq variant="Certified" type="default">chrony</packagereq>
-      <packagereq variant="Certified" type="default">cockpit</packagereq>
-      <packagereq variant="Certified" type="default">cryptsetup</packagereq>
-      <packagereq variant="Certified" type="default">dos2unix</packagereq>
-      <packagereq variant="Certified" type="default">dosfstools</packagereq>
-      <packagereq variant="Certified" type="default">ethtool</packagereq>
-      <packagereq variant="Certified" type="default">fprintd-pam</packagereq>
-      <packagereq variant="Certified" type="default">gnupg2</packagereq>
-      <packagereq variant="Certified" type="default">gpm</packagereq>
-      <packagereq variant="Certified" type="default">iprutils</packagereq>
-      <packagereq variant="Certified" type="default">ledmon</packagereq>
-      <packagereq variant="Certified" type="default">libstoragemgmt</packagereq>
-      <packagereq variant="Certified" type="default">lvm2</packagereq>
-      <packagereq variant="Certified" type="default">mailcap</packagereq>
-      <packagereq variant="Certified" type="default">man-pages</packagereq>
-      <packagereq variant="Certified" type="default">mdadm</packagereq>
-      <packagereq variant="Certified" type="default">mlocate</packagereq>
-      <packagereq variant="Certified" type="default">mtr</packagereq>
-      <packagereq variant="Certified" type="default">nano</packagereq>
-      <packagereq variant="Certified" type="default">nmap-ncat</packagereq>
-      <packagereq variant="Certified" type="default">nvme-cli</packagereq>
-      <packagereq variant="Certified" type="default">pinfo</packagereq>
-      <packagereq variant="Certified" type="default">plymouth</packagereq>
-      <packagereq variant="Certified" type="default">realmd</packagereq>
-      <packagereq variant="Certified" type="default">rsync</packagereq>
-      <packagereq variant="Certified" type="default">setroubleshoot-server</packagereq>
-      <packagereq variant="Certified" type="default">smartmontools</packagereq>
-      <packagereq variant="Certified" type="default">sos</packagereq>
-      <packagereq variant="Certified" type="default">sssd</packagereq>
-      <packagereq variant="Certified" type="default">strace</packagereq>
-      <packagereq variant="Certified" type="default">tcpdump</packagereq>
-      <packagereq variant="Certified" type="default">teamd</packagereq>
-      <packagereq variant="Certified" type="default">time</packagereq>
-      <packagereq variant="Certified" type="default">unzip</packagereq>
-      <packagereq variant="Certified" type="default">usbutils</packagereq>
-      <packagereq variant="Certified" type="default">vim-enhanced</packagereq>
-      <packagereq variant="Certified" type="default">virt-what</packagereq>
-      <packagereq variant="Certified" type="default">wget</packagereq>
-      <packagereq variant="Certified" type="default">which</packagereq>
-      <packagereq variant="Certified" type="default">words</packagereq>
-      <packagereq variant="Certified" type="default">xfsdump</packagereq>
-      <packagereq variant="Certified" type="default">zip</packagereq>
-      <packagereq variant="Certified" type="mandatory">acl</packagereq>
-      <packagereq variant="Certified" type="mandatory">adcli</packagereq>
-      <packagereq variant="Certified" type="mandatory">at</packagereq>
-      <packagereq variant="Certified" type="mandatory">attr</packagereq>
-      <packagereq variant="Certified" type="mandatory">bc</packagereq>
-      <packagereq variant="Certified" type="mandatory">cpio</packagereq>
-      <packagereq variant="Certified" type="mandatory">crontabs</packagereq>
-      <packagereq variant="Certified" type="mandatory">cyrus-sasl-plain</packagereq>
-      <packagereq variant="Certified" type="mandatory">dbus</packagereq>
-      <packagereq variant="Certified" type="mandatory">ed</packagereq>
-      <packagereq variant="Certified" type="mandatory">file</packagereq>
-      <packagereq variant="Certified" type="mandatory">irqbalance</packagereq>
-      <packagereq variant="Certified" type="mandatory">krb5-workstation</packagereq>
-      <packagereq variant="Certified" type="mandatory">logrotate</packagereq>
-      <packagereq variant="Certified" type="mandatory">lsof</packagereq>
-      <packagereq variant="Certified" type="mandatory">mcelog</packagereq>
-      <packagereq variant="Certified" type="mandatory">microcode_ctl</packagereq>
-      <packagereq variant="Certified" type="mandatory">net-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">pciutils</packagereq>
-      <packagereq variant="Certified" type="mandatory">psacct</packagereq>
-      <packagereq variant="Certified" type="mandatory">quota</packagereq>
-      <packagereq variant="Certified" type="mandatory">rsyslog-gnutls</packagereq>
-      <packagereq variant="Certified" type="mandatory">rsyslog-gssapi</packagereq>
-      <packagereq variant="Certified" type="mandatory">rsyslog-relp</packagereq>
-      <packagereq variant="Certified" type="mandatory">sphere-release</packagereq>
-      <packagereq variant="Certified" type="mandatory">sudo</packagereq>
-      <packagereq variant="Certified" type="mandatory">symlinks</packagereq>
-      <packagereq variant="Certified" type="mandatory">systemd-udev</packagereq>
-      <packagereq variant="Certified" type="mandatory">tar</packagereq>
-      <packagereq variant="Certified" type="mandatory">tree</packagereq>
-      <packagereq variant="Certified" type="mandatory">tuned</packagereq>
-      <packagereq variant="Certified" type="mandatory">util-linux-user</packagereq>
-      <packagereq variant="Certified" type="optional">cifs-utils</packagereq>
-      <packagereq variant="Certified" type="optional">cockpit-doc</packagereq>
-      <packagereq variant="Certified" type="optional">fwupd</packagereq>
-      <packagereq variant="Certified" type="optional">ima-evm-utils</packagereq>
-      <packagereq variant="Certified" type="optional">nfs-utils</packagereq>
-      <packagereq variant="Certified" type="optional">nvmetcli</packagereq>
-      <packagereq variant="Certified" type="optional">traceroute</packagereq>
-      <packagereq variant="Certified" type="optional">zsh</packagereq>
+      <packagereq variant="OS" type="default">bash-completion</packagereq>
+      <packagereq variant="OS" type="default">blktrace</packagereq>
+      <packagereq variant="OS" type="default">bluez</packagereq>
+      <packagereq variant="OS" type="default">bzip2</packagereq>
+      <packagereq variant="OS" type="default">chrony</packagereq>
+      <packagereq variant="OS" type="default">cockpit</packagereq>
+      <packagereq variant="OS" type="default">cryptsetup</packagereq>
+      <packagereq variant="OS" type="default">dos2unix</packagereq>
+      <packagereq variant="OS" type="default">dosfstools</packagereq>
+      <packagereq variant="OS" type="default">ethtool</packagereq>
+      <packagereq variant="OS" type="default">fprintd-pam</packagereq>
+      <packagereq variant="OS" type="default">gnupg2</packagereq>
+      <packagereq variant="OS" type="default">gpm</packagereq>
+      <packagereq variant="OS" type="default">iprutils</packagereq>
+      <packagereq variant="OS" type="default">ledmon</packagereq>
+      <packagereq variant="OS" type="default">libstoragemgmt</packagereq>
+      <packagereq variant="OS" type="default">lvm2</packagereq>
+      <packagereq variant="OS" type="default">mailcap</packagereq>
+      <packagereq variant="OS" type="default">man-pages</packagereq>
+      <packagereq variant="OS" type="default">mdadm</packagereq>
+      <packagereq variant="OS" type="default">mlocate</packagereq>
+      <packagereq variant="OS" type="default">mtr</packagereq>
+      <packagereq variant="OS" type="default">nano</packagereq>
+      <packagereq variant="OS" type="default">nmap-ncat</packagereq>
+      <packagereq variant="OS" type="default">nvme-cli</packagereq>
+      <packagereq variant="OS" type="default">pinfo</packagereq>
+      <packagereq variant="OS" type="default">plymouth</packagereq>
+      <packagereq variant="OS" type="default">realmd</packagereq>
+      <packagereq variant="OS" type="default">rsync</packagereq>
+      <packagereq variant="OS" type="default">setroubleshoot-server</packagereq>
+      <packagereq variant="OS" type="default">smartmontools</packagereq>
+      <packagereq variant="OS" type="default">sos</packagereq>
+      <packagereq variant="OS" type="default">sssd</packagereq>
+      <packagereq variant="OS" type="default">strace</packagereq>
+      <packagereq variant="OS" type="default">tcpdump</packagereq>
+      <packagereq variant="OS" type="default">teamd</packagereq>
+      <packagereq variant="OS" type="default">time</packagereq>
+      <packagereq variant="OS" type="default">unzip</packagereq>
+      <packagereq variant="OS" type="default">usbutils</packagereq>
+      <packagereq variant="OS" type="default">vim-enhanced</packagereq>
+      <packagereq variant="OS" type="default">virt-what</packagereq>
+      <packagereq variant="OS" type="default">wget</packagereq>
+      <packagereq variant="OS" type="default">which</packagereq>
+      <packagereq variant="OS" type="default">words</packagereq>
+      <packagereq variant="OS" type="default">xfsdump</packagereq>
+      <packagereq variant="OS" type="default">zip</packagereq>
+      <packagereq variant="OS" type="mandatory">acl</packagereq>
+      <packagereq variant="OS" type="mandatory">adcli</packagereq>
+      <packagereq variant="OS" type="mandatory">at</packagereq>
+      <packagereq variant="OS" type="mandatory">attr</packagereq>
+      <packagereq variant="OS" type="mandatory">bc</packagereq>
+      <packagereq variant="OS" type="mandatory">cpio</packagereq>
+      <packagereq variant="OS" type="mandatory">crontabs</packagereq>
+      <packagereq variant="OS" type="mandatory">cyrus-sasl-plain</packagereq>
+      <packagereq variant="OS" type="mandatory">dbus</packagereq>
+      <packagereq variant="OS" type="mandatory">ed</packagereq>
+      <packagereq variant="OS" type="mandatory">file</packagereq>
+      <packagereq variant="OS" type="mandatory">irqbalance</packagereq>
+      <packagereq variant="OS" type="mandatory">krb5-workstation</packagereq>
+      <packagereq variant="OS" type="mandatory">logrotate</packagereq>
+      <packagereq variant="OS" type="mandatory">lsof</packagereq>
+      <packagereq variant="OS" type="mandatory">mcelog</packagereq>
+      <packagereq variant="OS" type="mandatory">microcode_ctl</packagereq>
+      <packagereq variant="OS" type="mandatory">net-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">pciutils</packagereq>
+      <packagereq variant="OS" type="mandatory">psacct</packagereq>
+      <packagereq variant="OS" type="mandatory">quota</packagereq>
+      <packagereq variant="OS" type="mandatory">rsyslog-gnutls</packagereq>
+      <packagereq variant="OS" type="mandatory">rsyslog-gssapi</packagereq>
+      <packagereq variant="OS" type="mandatory">rsyslog-relp</packagereq>
+      <packagereq variant="OS" type="mandatory">sphere-release</packagereq>
+      <packagereq variant="OS" type="mandatory">sudo</packagereq>
+      <packagereq variant="OS" type="mandatory">symlinks</packagereq>
+      <packagereq variant="OS" type="mandatory">systemd-udev</packagereq>
+      <packagereq variant="OS" type="mandatory">tar</packagereq>
+      <packagereq variant="OS" type="mandatory">tree</packagereq>
+      <packagereq variant="OS" type="mandatory">tuned</packagereq>
+      <packagereq variant="OS" type="mandatory">util-linux-user</packagereq>
+      <packagereq variant="OS" type="optional">cifs-utils</packagereq>
+      <packagereq variant="OS" type="optional">cockpit-doc</packagereq>
+      <packagereq variant="OS" type="optional">fwupd</packagereq>
+      <packagereq variant="OS" type="optional">ima-evm-utils</packagereq>
+      <packagereq variant="OS" type="optional">nfs-utils</packagereq>
+      <packagereq variant="OS" type="optional">nvmetcli</packagereq>
+      <packagereq variant="OS" type="optional">traceroute</packagereq>
+      <packagereq variant="OS" type="optional">zsh</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>system-tools</id>
     <name>System Tools</name>
     <name xml:lang="af">Rekenaarnutsgoed</name>
@@ -5575,50 +5575,50 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">chrony</packagereq>
-      <packagereq variant="Certified" type="default">cifs-utils</packagereq>
-      <packagereq variant="Certified" type="default">libreswan</packagereq>
-      <packagereq variant="Certified" type="default">NetworkManager-libreswan</packagereq>
-      <packagereq variant="Certified" type="default">nmap</packagereq>
-      <packagereq variant="Certified" type="default">openldap-clients</packagereq>
-      <packagereq variant="Certified" type="default">samba-client</packagereq>
-      <packagereq variant="Certified" type="default">setserial</packagereq>
-      <packagereq variant="Certified" type="default">tigervnc</packagereq>
-      <packagereq variant="Certified" type="default">tmux</packagereq>
-      <packagereq variant="Certified" type="default">zsh</packagereq>
-      <packagereq variant="Certified" type="optional">aide</packagereq>
-      <packagereq variant="Certified" type="optional">autofs</packagereq>
-      <packagereq variant="Certified" type="optional">bacula-client</packagereq>
-      <packagereq variant="Certified" type="optional">chrpath</packagereq>
-      <packagereq variant="Certified" type="optional">convmv</packagereq>
-      <packagereq variant="Certified" type="optional">createrepo_c</packagereq>
-      <packagereq variant="Certified" type="optional">environment-modules</packagereq>
-      <packagereq variant="Certified" type="optional">freerdp</packagereq>
-      <packagereq variant="Certified" type="optional">fuse</packagereq>
-      <packagereq variant="Certified" type="optional">gpm</packagereq>
-      <packagereq variant="Certified" type="optional">hardlink</packagereq>
-      <packagereq variant="Certified" type="optional">initscripts-service</packagereq>
-      <packagereq variant="Certified" type="optional">initscripts</packagereq>
-      <packagereq variant="Certified" type="optional">iotop</packagereq>
-      <packagereq variant="Certified" type="optional">lzop</packagereq>
-      <packagereq variant="Certified" type="optional">mc</packagereq>
-      <packagereq variant="Certified" type="optional">mrtg</packagereq>
-      <packagereq variant="Certified" type="optional">mtx</packagereq>
-      <packagereq variant="Certified" type="optional">net-snmp-utils</packagereq>
-      <packagereq variant="Certified" type="optional">netconsole-service</packagereq>
-      <packagereq variant="Certified" type="optional">oddjob-mkhomedir</packagereq>
-      <packagereq variant="Certified" type="optional">oddjob</packagereq>
-      <packagereq variant="Certified" type="optional">PackageKit-command-not-found</packagereq>
-      <packagereq variant="Certified" type="optional">pmdk-convert</packagereq>
-      <packagereq variant="Certified" type="optional">readonly-root</packagereq>
-      <packagereq variant="Certified" type="optional">rear</packagereq>
-      <packagereq variant="Certified" type="optional">speech-dispatcher-espeak-ng</packagereq>
-      <packagereq variant="Certified" type="optional">speech-dispatcher</packagereq>
-      <packagereq variant="Certified" type="optional">sysstat</packagereq>
-      <packagereq variant="Certified" type="optional">wireshark</packagereq>
+      <packagereq variant="OS" type="default">chrony</packagereq>
+      <packagereq variant="OS" type="default">cifs-utils</packagereq>
+      <packagereq variant="OS" type="default">libreswan</packagereq>
+      <packagereq variant="OS" type="default">NetworkManager-libreswan</packagereq>
+      <packagereq variant="OS" type="default">nmap</packagereq>
+      <packagereq variant="OS" type="default">openldap-clients</packagereq>
+      <packagereq variant="OS" type="default">samba-client</packagereq>
+      <packagereq variant="OS" type="default">setserial</packagereq>
+      <packagereq variant="OS" type="default">tigervnc</packagereq>
+      <packagereq variant="OS" type="default">tmux</packagereq>
+      <packagereq variant="OS" type="default">zsh</packagereq>
+      <packagereq variant="OS" type="optional">aide</packagereq>
+      <packagereq variant="OS" type="optional">autofs</packagereq>
+      <packagereq variant="OS" type="optional">bacula-client</packagereq>
+      <packagereq variant="OS" type="optional">chrpath</packagereq>
+      <packagereq variant="OS" type="optional">convmv</packagereq>
+      <packagereq variant="OS" type="optional">createrepo_c</packagereq>
+      <packagereq variant="OS" type="optional">environment-modules</packagereq>
+      <packagereq variant="OS" type="optional">freerdp</packagereq>
+      <packagereq variant="OS" type="optional">fuse</packagereq>
+      <packagereq variant="OS" type="optional">gpm</packagereq>
+      <packagereq variant="OS" type="optional">hardlink</packagereq>
+      <packagereq variant="OS" type="optional">initscripts-service</packagereq>
+      <packagereq variant="OS" type="optional">initscripts</packagereq>
+      <packagereq variant="OS" type="optional">iotop</packagereq>
+      <packagereq variant="OS" type="optional">lzop</packagereq>
+      <packagereq variant="OS" type="optional">mc</packagereq>
+      <packagereq variant="OS" type="optional">mrtg</packagereq>
+      <packagereq variant="OS" type="optional">mtx</packagereq>
+      <packagereq variant="OS" type="optional">net-snmp-utils</packagereq>
+      <packagereq variant="OS" type="optional">netconsole-service</packagereq>
+      <packagereq variant="OS" type="optional">oddjob-mkhomedir</packagereq>
+      <packagereq variant="OS" type="optional">oddjob</packagereq>
+      <packagereq variant="OS" type="optional">PackageKit-command-not-found</packagereq>
+      <packagereq variant="OS" type="optional">pmdk-convert</packagereq>
+      <packagereq variant="OS" type="optional">readonly-root</packagereq>
+      <packagereq variant="OS" type="optional">rear</packagereq>
+      <packagereq variant="OS" type="optional">speech-dispatcher-espeak-ng</packagereq>
+      <packagereq variant="OS" type="optional">speech-dispatcher</packagereq>
+      <packagereq variant="OS" type="optional">sysstat</packagereq>
+      <packagereq variant="OS" type="optional">wireshark</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>texlive</id>
     <name>TeX formatting system</name>
     <name xml:lang="de">TeX-Formatierungssystem</name>
@@ -5646,322 +5646,322 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">texlive</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-adjustbox</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ae</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-algorithms</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-amscls</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-amsfonts</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-amsmath</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-anyfontsize</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-anysize</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-appendix</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-arabxetex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-arphic</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-attachfile</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-avantgar</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-awesomebox</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-babel</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-babel-english</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-babelbib</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-base</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-beamer</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-bera</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-beton</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-bibtex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-bibtopic</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-bidi</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-bigfoot</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-bookman</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-booktabs</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-breakurl</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-breqn</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-capt-of</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-caption</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-carlisle</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-changebar</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-changepage</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-charter</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-chngcntr</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-cite</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-cjk</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-classpack</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-cm</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-cm-lgc</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-cm-super</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-cmap</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-cmextra</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-cns</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-collectbox</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-collection-basic</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-collection-fontsrecommended</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-collection-htmlxml</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-collection-latex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-collection-latexrecommended</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-collection-xetex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-colortbl</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-courier</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-crop</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-csquotes</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ctable</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ctablestack</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-currfile</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-datetime</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-dvipdfmx</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-dvipng</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-dvips</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-dvisvgm</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ec</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-eepic</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-enctex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-enumitem</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-environ</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-epsf</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-epstopdf</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-eqparbox</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-eso-pic</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-etex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-etex-pkg</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-etoolbox</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-euenc</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-euler</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-euro</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-eurosym</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-extsizes</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fancybox</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fancyhdr</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fancyref</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fancyvrb</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-filecontents</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-filehook</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-finstrut</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fix2col</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fixlatvian</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-float</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fmtcount</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fncychap</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fontawesome</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fontbook</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fonts-tlwg</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fontspec</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fontware</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fontwrap</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-footmisc</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fp</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-fpl</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-framed</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-garuda-c90</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-geometry</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-glyphlist</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-graphics</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-graphics-cfg</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-graphics-def</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-gsftopk</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-helvetic</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-hyperref</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-hyph-utf8</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-hyphen-base</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-hyphenat</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ifetex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ifluatex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ifmtarg</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ifoddpage</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-iftex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ifxetex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-import</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-index</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-jadetex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-jknapltx</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-kastrup</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-kerkis</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-knuth-lib</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-knuth-local</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-koma-script</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-kpathsea</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-l3experimental</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-l3kernel</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-l3packages</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-lastpage</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-latex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-latex-fonts</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-latex2man</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-latexconfig</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-lettrine</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-lib</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-linegoal</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-lineno</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-listings</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-lm</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-lm-math</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ltabptch</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ltxmisc</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-lua-alt-getopt</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-lualatex-math</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-lualibs</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-luaotfload</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-luatex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-luatex85</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-luatexbase</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-makecmds</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-makeindex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-manfnt-font</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-marginnote</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-marvosym</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mathpazo</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mathspec</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mathtools</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mdwtools</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-memoir</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-metafont</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-metalogo</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-metapost</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mflogo</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mflogo-font</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mfnfss</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mfware</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-microtype</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mnsymbol</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mparhack</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-mptopdf</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ms</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-multido</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-multirow</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-natbib</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ncctools</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ncntrsbk</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-needspace</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-norasi-c90</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ntgclass</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-oberdiek</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-overpic</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-palatino</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-paralist</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-parallel</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-parskip</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-passivetex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pdfpages</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pdftex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pgf</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-philokalia</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-placeins</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-polyglossia</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-powerdot</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-preprint</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-psfrag</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pslatex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-psnfss</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pspicture</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-3d</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-blur</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-coil</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-eps</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-fill</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-grad</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-math</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-node</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-plot</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-slpe</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-text</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pst-tree</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pstricks</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pstricks-add</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ptext</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-pxfonts</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-qstest</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-rcs</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-realscripts</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-rsfs</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-sansmath</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-sauerj</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-scheme-basic</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-section</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-sectsty</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-seminar</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-sepnum</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-setspace</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-showexpl</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-soul</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-stmaryrd</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-subfig</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-subfigure</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-svn-prov</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-symbol</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-t2</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tabu</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tabulary</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tetex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tex-gyre</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tex-gyre-math</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tex-ini-files</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tex4ht</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-texconfig</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-texlive-common-doc</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-texlive-docindex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-texlive-en</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-texlive-msg-translations</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-texlive-scripts</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-texlive.infra</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-textcase</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-textpos</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-threeparttable</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-thumbpdf</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-times</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tipa</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-titlesec</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-titling</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tocloft</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-trimspaces</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-txfonts</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-type1cm</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-typehtml</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ucharclasses</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ucs</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-uhc</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-ulem</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-underscore</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-unicode-data</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-unicode-math</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-unisugar</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-updmap-map</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-upquote</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-url</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-utopia</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-varwidth</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-wadalab</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-was</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-wasy</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-wasy2-ps</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-wasysym</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-wrapfig</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xcolor</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xdvi</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xecjk</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xecolor</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xecyr</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xeindex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xepersian</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xesearch</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xetex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xetex-itrans</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xetex-pstricks</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xetex-tibetan</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xetexconfig</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xetexfontinfo</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xifthen</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xkeyval</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xltxtra</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xmltex</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xmltexconfig</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xstring</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xtab</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-xunicode</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-zapfchan</packagereq>
-      <packagereq variant="Certified" type="mandatory">texlive-zapfding</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-adjustbox</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ae</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-algorithms</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-amscls</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-amsfonts</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-amsmath</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-anyfontsize</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-anysize</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-appendix</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-arabxetex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-arphic</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-attachfile</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-avantgar</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-awesomebox</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-babel</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-babel-english</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-babelbib</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-base</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-beamer</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-bera</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-beton</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-bibtex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-bibtopic</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-bidi</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-bigfoot</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-bookman</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-booktabs</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-breakurl</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-breqn</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-capt-of</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-caption</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-carlisle</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-changebar</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-changepage</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-charter</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-chngcntr</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-cite</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-cjk</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-classpack</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-cm</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-cm-lgc</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-cm-super</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-cmap</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-cmextra</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-cns</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-collectbox</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-collection-basic</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-collection-fontsrecommended</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-collection-htmlxml</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-collection-latex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-collection-latexrecommended</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-collection-xetex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-colortbl</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-courier</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-crop</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-csquotes</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ctable</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ctablestack</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-currfile</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-datetime</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-dvipdfmx</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-dvipng</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-dvips</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-dvisvgm</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ec</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-eepic</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-enctex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-enumitem</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-environ</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-epsf</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-epstopdf</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-eqparbox</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-eso-pic</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-etex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-etex-pkg</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-etoolbox</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-euenc</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-euler</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-euro</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-eurosym</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-extsizes</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fancybox</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fancyhdr</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fancyref</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fancyvrb</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-filecontents</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-filehook</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-finstrut</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fix2col</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fixlatvian</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-float</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fmtcount</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fncychap</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fontawesome</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fontbook</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fonts-tlwg</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fontspec</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fontware</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fontwrap</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-footmisc</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fp</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-fpl</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-framed</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-garuda-c90</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-geometry</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-glyphlist</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-graphics</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-graphics-cfg</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-graphics-def</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-gsftopk</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-helvetic</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-hyperref</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-hyph-utf8</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-hyphen-base</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-hyphenat</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ifetex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ifluatex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ifmtarg</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ifoddpage</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-iftex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ifxetex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-import</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-index</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-jadetex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-jknapltx</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-kastrup</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-kerkis</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-knuth-lib</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-knuth-local</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-koma-script</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-kpathsea</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-l3experimental</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-l3kernel</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-l3packages</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-lastpage</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-latex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-latex-fonts</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-latex2man</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-latexconfig</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-lettrine</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-lib</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-linegoal</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-lineno</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-listings</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-lm</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-lm-math</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ltabptch</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ltxmisc</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-lua-alt-getopt</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-lualatex-math</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-lualibs</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-luaotfload</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-luatex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-luatex85</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-luatexbase</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-makecmds</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-makeindex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-manfnt-font</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-marginnote</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-marvosym</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mathpazo</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mathspec</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mathtools</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mdwtools</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-memoir</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-metafont</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-metalogo</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-metapost</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mflogo</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mflogo-font</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mfnfss</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mfware</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-microtype</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mnsymbol</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mparhack</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-mptopdf</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ms</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-multido</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-multirow</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-natbib</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ncctools</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ncntrsbk</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-needspace</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-norasi-c90</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ntgclass</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-oberdiek</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-overpic</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-palatino</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-paralist</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-parallel</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-parskip</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-passivetex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pdfpages</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pdftex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pgf</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-philokalia</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-placeins</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-polyglossia</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-powerdot</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-preprint</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-psfrag</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pslatex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-psnfss</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pspicture</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-3d</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-blur</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-coil</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-eps</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-fill</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-grad</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-math</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-node</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-plot</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-slpe</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-text</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pst-tree</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pstricks</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pstricks-add</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ptext</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-pxfonts</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-qstest</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-rcs</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-realscripts</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-rsfs</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-sansmath</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-sauerj</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-scheme-basic</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-section</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-sectsty</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-seminar</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-sepnum</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-setspace</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-showexpl</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-soul</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-stmaryrd</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-subfig</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-subfigure</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-svn-prov</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-symbol</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-t2</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tabu</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tabulary</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tetex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tex-gyre</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tex-gyre-math</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tex-ini-files</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tex4ht</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-texconfig</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-texlive-common-doc</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-texlive-docindex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-texlive-en</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-texlive-msg-translations</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-texlive-scripts</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-texlive.infra</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-textcase</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-textpos</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-threeparttable</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-thumbpdf</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-times</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tipa</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-titlesec</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-titling</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tocloft</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-trimspaces</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-txfonts</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-type1cm</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-typehtml</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ucharclasses</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ucs</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-uhc</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-ulem</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-underscore</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-unicode-data</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-unicode-math</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-unisugar</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-updmap-map</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-upquote</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-url</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-utopia</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-varwidth</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-wadalab</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-was</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-wasy</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-wasy2-ps</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-wasysym</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-wrapfig</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xcolor</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xdvi</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xecjk</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xecolor</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xecyr</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xeindex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xepersian</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xesearch</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xetex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xetex-itrans</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xetex-pstricks</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xetex-tibetan</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xetexconfig</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xetexfontinfo</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xifthen</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xkeyval</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xltxtra</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xmltex</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xmltexconfig</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xstring</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xtab</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-xunicode</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-zapfchan</packagereq>
+      <packagereq variant="OS" type="mandatory">texlive-zapfding</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>virtualization-client</id>
     <name>Virtualization Client</name>
     <name xml:lang="as">ভাৰছুৱেলাইজেষণ ক্লাএন্ট</name>
@@ -6026,16 +6026,16 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">virt-install</packagereq>
-      <packagereq variant="Certified" type="mandatory">virt-manager</packagereq>
-      <packagereq variant="Certified" type="mandatory">virt-viewer</packagereq>
-      <packagereq variant="Certified" type="default">virt-top</packagereq>
-      <packagereq variant="Certified" type="optional">guestfs-tools</packagereq>
-      <packagereq variant="Certified" type="optional">libguestfs-inspect-icons</packagereq>
-      <packagereq variant="Certified" type="optional">virt-win-reg</packagereq>
+      <packagereq variant="OS" type="mandatory">virt-install</packagereq>
+      <packagereq variant="OS" type="mandatory">virt-manager</packagereq>
+      <packagereq variant="OS" type="mandatory">virt-viewer</packagereq>
+      <packagereq variant="OS" type="default">virt-top</packagereq>
+      <packagereq variant="OS" type="optional">guestfs-tools</packagereq>
+      <packagereq variant="OS" type="optional">libguestfs-inspect-icons</packagereq>
+      <packagereq variant="OS" type="optional">virt-win-reg</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>virtualization-hypervisor</id>
     <name>Virtualization Hypervisor</name>
     <name xml:lang="as">ভাৰছুৱেলাইজেষণ হাইপাৰভাইছৰ</name>
@@ -6094,11 +6094,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">libvirt</packagereq>
-      <packagereq variant="Certified" type="mandatory">qemu-kvm</packagereq>
+      <packagereq variant="OS" type="mandatory">libvirt</packagereq>
+      <packagereq variant="OS" type="mandatory">qemu-kvm</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>virtualization-platform</id>
     <name>Virtualization Platform</name>
     <name xml:lang="as">ভাৰছুৱেলাইজেষণ প্লেটফৰ্ম</name>
@@ -6163,14 +6163,14 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">libvirt</packagereq>
-      <packagereq variant="Certified" type="mandatory">libvirt-client</packagereq>
-      <packagereq variant="Certified" type="optional">fence-virtd-libvirt</packagereq>
-      <packagereq variant="Certified" type="optional">fence-virtd-multicast</packagereq>
-      <packagereq variant="Certified" type="optional">fence-virtd-serial</packagereq>
+      <packagereq variant="OS" type="mandatory">libvirt</packagereq>
+      <packagereq variant="OS" type="mandatory">libvirt-client</packagereq>
+      <packagereq variant="OS" type="optional">fence-virtd-libvirt</packagereq>
+      <packagereq variant="OS" type="optional">fence-virtd-multicast</packagereq>
+      <packagereq variant="OS" type="optional">fence-virtd-serial</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>virtualization-tools</id>
     <name>Virtualization Tools</name>
     <name xml:lang="as">ভাৰছুৱেলাইজেষণৰ সঁজুলিসমূহ</name>
@@ -6235,13 +6235,13 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="default">libguestfs</packagereq>
-      <packagereq variant="Certified" type="optional">guestfs-tools</packagereq>
-      <packagereq variant="Certified" type="optional">libguestfs-inspect-icons</packagereq>
-      <packagereq variant="Certified" type="optional">virt-win-reg</packagereq>
+      <packagereq variant="OS" type="default">libguestfs</packagereq>
+      <packagereq variant="OS" type="optional">guestfs-tools</packagereq>
+      <packagereq variant="OS" type="optional">libguestfs-inspect-icons</packagereq>
+      <packagereq variant="OS" type="optional">virt-win-reg</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>web-server</id>
     <name>Basic Web Server</name>
     <name xml:lang="as">মৌলিক ৱেব চাৰ্ভাৰ</name>
@@ -6347,18 +6347,18 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">httpd</packagereq>
-      <packagereq variant="Certified" type="default">httpd-manual</packagereq>
-      <packagereq variant="Certified" type="default">mod_fcgid</packagereq>
-      <packagereq variant="Certified" type="default">mod_ssl</packagereq>
-      <packagereq variant="Certified" type="optional">memcached</packagereq>
-      <packagereq variant="Certified" type="optional">mod_auth_gssapi</packagereq>
-      <packagereq variant="Certified" type="optional">mod_security</packagereq>
-      <packagereq variant="Certified" type="optional">mod_security-mlogc</packagereq>
-      <packagereq variant="Certified" type="optional">mod_security_crs</packagereq>
+      <packagereq variant="OS" type="mandatory">httpd</packagereq>
+      <packagereq variant="OS" type="default">httpd-manual</packagereq>
+      <packagereq variant="OS" type="default">mod_fcgid</packagereq>
+      <packagereq variant="OS" type="default">mod_ssl</packagereq>
+      <packagereq variant="OS" type="optional">memcached</packagereq>
+      <packagereq variant="OS" type="optional">mod_auth_gssapi</packagereq>
+      <packagereq variant="OS" type="optional">mod_security</packagereq>
+      <packagereq variant="OS" type="optional">mod_security-mlogc</packagereq>
+      <packagereq variant="OS" type="optional">mod_security_crs</packagereq>
     </packagelist>
   </group>
-  <group variant="Certified">
+  <group variant="OS">
     <id>workstation-product</id>
     <name>Workstation product core</name>
     <name xml:lang="de">Workstation-Produktkern</name>
@@ -6386,92 +6386,92 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">acl</packagereq>
-      <packagereq variant="Certified" type="mandatory">adwaita-qt5</packagereq>
-      <packagereq variant="Certified" type="mandatory">alsa-firmware</packagereq>
-      <packagereq variant="Certified" type="mandatory">alsa-sof-firmware</packagereq>
-      <packagereq variant="Certified" type="mandatory">attr</packagereq>
-      <packagereq variant="Certified" type="mandatory">bash-completion</packagereq>
-      <packagereq variant="Certified" type="mandatory">bc</packagereq>
-      <packagereq variant="Certified" type="mandatory">bind-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">bzip2</packagereq>
-      <packagereq variant="Certified" type="mandatory">chrony</packagereq>
-      <packagereq variant="Certified" type="mandatory">cifs-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">cpio</packagereq>
-      <packagereq variant="Certified" type="mandatory">crontabs</packagereq>
-      <packagereq variant="Certified" type="mandatory">cryptsetup</packagereq>
-      <packagereq variant="Certified" type="mandatory">cyrus-sasl-plain</packagereq>
-      <packagereq variant="Certified" type="mandatory">dnf-plugins-core</packagereq>
-      <packagereq variant="Certified" type="mandatory">dnf</packagereq>
-      <packagereq variant="Certified" type="mandatory">dos2unix</packagereq>
-      <packagereq variant="Certified" type="mandatory">dosfstools</packagereq>
-      <packagereq variant="Certified" type="mandatory">ethtool</packagereq>
-      <packagereq variant="Certified" type="mandatory">evolution-ews</packagereq>
-      <packagereq variant="Certified" type="mandatory">evolution-help</packagereq>
-      <packagereq variant="Certified" type="mandatory">evolution</packagereq>
-      <packagereq variant="Certified" type="mandatory">file</packagereq>
-      <packagereq variant="Certified" type="mandatory">git</packagereq>
-      <packagereq variant="Certified" type="mandatory">glibc-all-langpacks</packagereq>
-      <packagereq variant="Certified" type="mandatory">gnupg2</packagereq>
-      <packagereq variant="Certified" type="mandatory">google-noto-emoji-fonts</packagereq>
-      <packagereq variant="Certified" type="mandatory">hunspell</packagereq>
-      <packagereq variant="Certified" type="mandatory">ibus-anthy</packagereq>
-      <packagereq variant="Certified" type="mandatory">ibus-gtk2</packagereq>
-      <packagereq variant="Certified" type="mandatory">ibus-gtk3</packagereq>
-      <packagereq variant="Certified" type="mandatory">ibus-hangul</packagereq>
-      <packagereq variant="Certified" type="mandatory">ibus-libpinyin</packagereq>
-      <packagereq variant="Certified" type="mandatory">ibus-libzhuyin</packagereq>
-      <packagereq variant="Certified" type="mandatory">ibus-m17n</packagereq>
-      <packagereq variant="Certified" type="mandatory">ibus-typing-booster</packagereq>
-      <packagereq variant="Certified" type="mandatory">logrotate</packagereq>
-      <packagereq variant="Certified" type="mandatory">lrzsz</packagereq>
-      <packagereq variant="Certified" type="mandatory">lsof</packagereq>
-      <packagereq variant="Certified" type="mandatory">mailcap</packagereq>
-      <packagereq variant="Certified" type="mandatory">man-pages</packagereq>
-      <packagereq variant="Certified" type="mandatory">mcelog</packagereq>
-      <packagereq variant="Certified" type="mandatory">mdadm</packagereq>
-      <packagereq variant="Certified" type="mandatory">microcode_ctl</packagereq>
-      <packagereq variant="Certified" type="mandatory">mlocate</packagereq>
-      <packagereq variant="Certified" type="mandatory">mtr</packagereq>
-      <packagereq variant="Certified" type="mandatory">net-tools</packagereq>
-      <packagereq variant="Certified" type="mandatory">nfs-utils</packagereq>
-      <packagereq variant="Certified" type="mandatory">nmap-ncat</packagereq>
-      <packagereq variant="Certified" type="mandatory">pciutils</packagereq>
-      <packagereq variant="Certified" type="mandatory">pinentry-gnome3</packagereq>
-      <packagereq variant="Certified" type="mandatory">pinfo</packagereq>
-      <packagereq variant="Certified" type="mandatory">plymouth</packagereq>
-      <packagereq variant="Certified" type="mandatory">polkit</packagereq>
-      <packagereq variant="Certified" type="mandatory">psacct</packagereq>
-      <packagereq variant="Certified" type="mandatory">qgnomeplatform</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtbase-gui</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtbase</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtdeclarative</packagereq>
-      <packagereq variant="Certified" type="mandatory">qt5-qtxmlpatterns</packagereq>
-      <packagereq variant="Certified" type="mandatory">quota</packagereq>
-      <packagereq variant="Certified" type="mandatory">realmd</packagereq>
-      <packagereq variant="Certified" type="mandatory">rsync</packagereq>
-      <packagereq variant="Certified" type="mandatory">setroubleshoot</packagereq>
-      <packagereq variant="Certified" type="mandatory">sos</packagereq>
-      <packagereq variant="Certified" type="mandatory">sphere-release</packagereq>
-      <packagereq variant="Certified" type="mandatory">sssd</packagereq>
-      <packagereq variant="Certified" type="mandatory">sudo</packagereq>
-      <packagereq variant="Certified" type="mandatory">symlinks</packagereq>
-      <packagereq variant="Certified" type="mandatory">systemd-udev</packagereq>
-      <packagereq variant="Certified" type="mandatory">tar</packagereq>
-      <packagereq variant="Certified" type="mandatory">telnet</packagereq>
-      <packagereq variant="Certified" type="mandatory">thermald</packagereq>
-      <packagereq variant="Certified" type="mandatory">time</packagereq>
-      <packagereq variant="Certified" type="mandatory">traceroute</packagereq>
-      <packagereq variant="Certified" type="mandatory">tree</packagereq>
-      <packagereq variant="Certified" type="mandatory">unzip</packagereq>
-      <packagereq variant="Certified" type="mandatory">usbutils</packagereq>
-      <packagereq variant="Certified" type="mandatory">which</packagereq>
-      <packagereq variant="Certified" type="mandatory">words</packagereq>
-      <packagereq variant="Certified" type="mandatory">xorg-x11-drv-libinput</packagereq>
-      <packagereq variant="Certified" type="mandatory">zip</packagereq>
+      <packagereq variant="OS" type="mandatory">acl</packagereq>
+      <packagereq variant="OS" type="mandatory">adwaita-qt5</packagereq>
+      <packagereq variant="OS" type="mandatory">alsa-firmware</packagereq>
+      <packagereq variant="OS" type="mandatory">alsa-sof-firmware</packagereq>
+      <packagereq variant="OS" type="mandatory">attr</packagereq>
+      <packagereq variant="OS" type="mandatory">bash-completion</packagereq>
+      <packagereq variant="OS" type="mandatory">bc</packagereq>
+      <packagereq variant="OS" type="mandatory">bind-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">bzip2</packagereq>
+      <packagereq variant="OS" type="mandatory">chrony</packagereq>
+      <packagereq variant="OS" type="mandatory">cifs-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">cpio</packagereq>
+      <packagereq variant="OS" type="mandatory">crontabs</packagereq>
+      <packagereq variant="OS" type="mandatory">cryptsetup</packagereq>
+      <packagereq variant="OS" type="mandatory">cyrus-sasl-plain</packagereq>
+      <packagereq variant="OS" type="mandatory">dnf-plugins-core</packagereq>
+      <packagereq variant="OS" type="mandatory">dnf</packagereq>
+      <packagereq variant="OS" type="mandatory">dos2unix</packagereq>
+      <packagereq variant="OS" type="mandatory">dosfstools</packagereq>
+      <packagereq variant="OS" type="mandatory">ethtool</packagereq>
+      <packagereq variant="OS" type="mandatory">evolution-ews</packagereq>
+      <packagereq variant="OS" type="mandatory">evolution-help</packagereq>
+      <packagereq variant="OS" type="mandatory">evolution</packagereq>
+      <packagereq variant="OS" type="mandatory">file</packagereq>
+      <packagereq variant="OS" type="mandatory">git</packagereq>
+      <packagereq variant="OS" type="mandatory">glibc-all-langpacks</packagereq>
+      <packagereq variant="OS" type="mandatory">gnupg2</packagereq>
+      <packagereq variant="OS" type="mandatory">google-noto-emoji-fonts</packagereq>
+      <packagereq variant="OS" type="mandatory">hunspell</packagereq>
+      <packagereq variant="OS" type="mandatory">ibus-anthy</packagereq>
+      <packagereq variant="OS" type="mandatory">ibus-gtk2</packagereq>
+      <packagereq variant="OS" type="mandatory">ibus-gtk3</packagereq>
+      <packagereq variant="OS" type="mandatory">ibus-hangul</packagereq>
+      <packagereq variant="OS" type="mandatory">ibus-libpinyin</packagereq>
+      <packagereq variant="OS" type="mandatory">ibus-libzhuyin</packagereq>
+      <packagereq variant="OS" type="mandatory">ibus-m17n</packagereq>
+      <packagereq variant="OS" type="mandatory">ibus-typing-booster</packagereq>
+      <packagereq variant="OS" type="mandatory">logrotate</packagereq>
+      <packagereq variant="OS" type="mandatory">lrzsz</packagereq>
+      <packagereq variant="OS" type="mandatory">lsof</packagereq>
+      <packagereq variant="OS" type="mandatory">mailcap</packagereq>
+      <packagereq variant="OS" type="mandatory">man-pages</packagereq>
+      <packagereq variant="OS" type="mandatory">mcelog</packagereq>
+      <packagereq variant="OS" type="mandatory">mdadm</packagereq>
+      <packagereq variant="OS" type="mandatory">microcode_ctl</packagereq>
+      <packagereq variant="OS" type="mandatory">mlocate</packagereq>
+      <packagereq variant="OS" type="mandatory">mtr</packagereq>
+      <packagereq variant="OS" type="mandatory">net-tools</packagereq>
+      <packagereq variant="OS" type="mandatory">nfs-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">nmap-ncat</packagereq>
+      <packagereq variant="OS" type="mandatory">pciutils</packagereq>
+      <packagereq variant="OS" type="mandatory">pinentry-gnome3</packagereq>
+      <packagereq variant="OS" type="mandatory">pinfo</packagereq>
+      <packagereq variant="OS" type="mandatory">plymouth</packagereq>
+      <packagereq variant="OS" type="mandatory">polkit</packagereq>
+      <packagereq variant="OS" type="mandatory">psacct</packagereq>
+      <packagereq variant="OS" type="mandatory">qgnomeplatform</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtbase-gui</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtbase</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtdeclarative</packagereq>
+      <packagereq variant="OS" type="mandatory">qt5-qtxmlpatterns</packagereq>
+      <packagereq variant="OS" type="mandatory">quota</packagereq>
+      <packagereq variant="OS" type="mandatory">realmd</packagereq>
+      <packagereq variant="OS" type="mandatory">rsync</packagereq>
+      <packagereq variant="OS" type="mandatory">setroubleshoot</packagereq>
+      <packagereq variant="OS" type="mandatory">sos</packagereq>
+      <packagereq variant="OS" type="mandatory">sphere-release</packagereq>
+      <packagereq variant="OS" type="mandatory">sssd</packagereq>
+      <packagereq variant="OS" type="mandatory">sudo</packagereq>
+      <packagereq variant="OS" type="mandatory">symlinks</packagereq>
+      <packagereq variant="OS" type="mandatory">systemd-udev</packagereq>
+      <packagereq variant="OS" type="mandatory">tar</packagereq>
+      <packagereq variant="OS" type="mandatory">telnet</packagereq>
+      <packagereq variant="OS" type="mandatory">thermald</packagereq>
+      <packagereq variant="OS" type="mandatory">time</packagereq>
+      <packagereq variant="OS" type="mandatory">traceroute</packagereq>
+      <packagereq variant="OS" type="mandatory">tree</packagereq>
+      <packagereq variant="OS" type="mandatory">unzip</packagereq>
+      <packagereq variant="OS" type="mandatory">usbutils</packagereq>
+      <packagereq variant="OS" type="mandatory">which</packagereq>
+      <packagereq variant="OS" type="mandatory">words</packagereq>
+      <packagereq variant="OS" type="mandatory">xorg-x11-drv-libinput</packagereq>
+      <packagereq variant="OS" type="mandatory">zip</packagereq>
     </packagelist>
   </group>
-  <environment variant="Certified">
+  <environment variant="OS">
     <id>graphical-server-environment</id>
     <name>Server with GUI</name>
     <name xml:lang="as">GUI ৰ সৈতে চাৰ্ভাৰ</name>
@@ -6668,7 +6668,7 @@
       <groupid>standard</groupid>
     </optionlist>
   </environment>
-  <environment variant="Certified">
+  <environment variant="OS">
     <id>workstation-product-environment</id>
     <name>Workstation</name>
     <name xml:lang="de">Arbeitsplatz</name>
@@ -6756,7 +6756,7 @@
       <groupid>standard</groupid>
     </optionlist>
   </environment>
-  <environment variant="Certified">
+  <environment variant="OS">
     <id>virtualization-host-environment</id>
     <name>Virtualization Host</name>
     <name xml:lang="as">ভাৰছুৱেলাইজেষণ হস্ট</name>
diff --git a/msvsphere-9.conf b/msvsphere-9.conf
index ccc0c8c..97bef85 100644
--- a/msvsphere-9.conf
+++ b/msvsphere-9.conf
@@ -17,7 +17,7 @@ release_version = '9.5'
 treeinfo_version = '9'
 
 extra_isos = {
-    "Certified": [{
+    "OS": [{
         "include_variants": [],
         "filename": "{release_short}-9.5-{arch}-certified{suffix}",
         "skip_src": True,
diff --git a/msvsphere/additional_packages.conf b/msvsphere/additional_packages.conf
index 1313e64..586b759 100644
--- a/msvsphere/additional_packages.conf
+++ b/msvsphere/additional_packages.conf
@@ -1,6 +1,6 @@
 additional_packages = [
     (
-        '^Certified$', {
+        '^OS$', {
             '*': [
                 "aide",
                 "anaconda-live",
@@ -55,6 +55,14 @@ additional_packages = [
             ]
         }
     ),
+    (
+        '^Updates$', {
+            '*': [
+                "sphere-repos-certified",
+                "sphere-release-certified"
+             ]
+         }
+    )
     (
         '^Testing$', {
             '*': [
diff --git a/msvsphere/filter_packages.conf b/msvsphere/filter_packages.conf
index 9ef68bb..dbd14ec 100644
--- a/msvsphere/filter_packages.conf
+++ b/msvsphere/filter_packages.conf
@@ -1,6 +1,6 @@
 filter_packages = [
     (
-        '^Certified$', {
+        '^OS$', {
             '*': [
                 "corosync-qnetd",
                 "corosync-qdevice",
diff --git a/msvsphere/general.conf b/msvsphere/general.conf
index d7348d9..11c27bb 100644
--- a/msvsphere/general.conf
+++ b/msvsphere/general.conf
@@ -15,11 +15,11 @@ check_deps = False
 
 gather_method = {
     # Anything that is not AppStream, CRB or Buildroot should use the old depsolver
-    "^(?!(Certified|Buildroot)).*$": {
+    "^(?!(OS|Updates|Buildroot)).*$": {
         "comps": "deps",
         "json": "deps",
     },
-    "^(Certified|Testing)$": "hybrid",
+    "^(OS|Updates|Testing)$": "hybrid",
 }
 
 hashed_directories = False
@@ -56,7 +56,7 @@ create_optional_isos = False
 createiso_use_xorrisofs = True
 
 createiso_skip = [
-    ("^(Certified|Testing)$", {
+    ("^(OS|Updates|Testing)$", {
         # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
         # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
         # No binary or src ISOs for CRB
@@ -105,12 +105,13 @@ lorax_options = [
 ]
 
 buildinstall_skip = [
-    ("^(Testing)$", {
+    ("^(Updates|Testing)$", {
         '*': True
     })
 ]
 
 # LOOKASIDE
 variant_as_lookaside = [
-    ("Testing", "Certified")
+    ("Testing", "OS"),
+    ("Updates", "OS"),
 ]
diff --git a/prepopulate.json b/prepopulate.json
index 9b22f5c..79fc1ea 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -1,5 +1,5 @@
 {
-  "Certified": {
+  "OS": {
     "x86_64": {
       "chromium": [
         "chromium-headless.x86_64",
diff --git a/variants.xml b/variants.xml
index 5e6f189..1048bd3 100644
--- a/variants.xml
+++ b/variants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE variants PUBLIC "-//MSVSphere//DTD Variants info//EN" "variants2012.dtd">
 <variants>
-  <variant id="Certified" name="Certified" type="variant" has_optional="false">
+  <variant id="OS" name="OS" type="variant" has_optional="false">
     <arches>
       <arch>x86_64</arch>
     </arches>