diff --git a/s390x/variants.xml b/s390x/variants.xml
index 10b0771..a62c5f5 100644
--- a/s390x/variants.xml
+++ b/s390x/variants.xml
@@ -16,6 +16,7 @@
       <group default="false">file-server</group>
       <group default="false">fonts</group>
       <group default="false">gnome-desktop</group>
+      <group default="false">graphical-admin-tools</group>
       <group default="false">hardware-monitoring</group>
       <group default="false">hardware-support</group>
       <group default="false">headless-management</group>
@@ -28,12 +29,12 @@
       <group default="false">network-tools</group>
       <group default="false">networkmanager-submodules</group>
       <group default="false">performance</group>
-      <group default="false">platform-devel</group>
       <group default="false">python-web</group>
       <group default="false">remote-system-management</group>
       <group default="false">scientific</group>
       <group default="false">security-tools</group>
       <group default="false">server-product</group>
+      <group default="false">smart-card</group>
       <group default="false">smb-server</group>
       <group default="false">standard</group>
       <group default="false">system-tools</group>
@@ -56,26 +57,30 @@
       <group default="false">base</group>
       <group default="false">base-x</group>
       <group default="false">conflicts-appstream</group>
+      <group default="false">console-internet</group>
       <group default="false">container-management</group>
       <group default="false">core</group>
       <group default="false">debugging</group>
       <group default="false">desktop-debugging</group>
       <group default="false">development</group>
       <group default="false">dns-server</group>
-      <group default="false">dotnet-core</group>
+      <group default="false">dotnet</group>
+      <group default="false">emacs</group>
       <group default="false">file-server</group>
       <group default="false">fonts</group>
       <group default="false">ftp-server</group>
       <group default="false">gnome-desktop</group>
+      <group default="false">graphical-admin-tools</group>
       <group default="false">guest-desktop-agents</group>
+      <group default="false">hardware-monitoring</group>
       <group default="false">headless-management</group>
       <group default="false">input-methods</group>
       <group default="false">internet-applications</group>
       <group default="false">internet-browser</group>
+      <group default="false">java-development</group>
       <group default="false">java-platform</group>
       <group default="false">legacy-x</group>
       <group default="false">mail-server</group>
-      <group default="false">mainframe-access</group>
       <group default="false">network-file-system-client</group>
       <group default="false">network-server</group>
       <group default="false">network-tools</group>
@@ -83,12 +88,15 @@
       <group default="false">ostree-support</group>
       <group default="false">performance</group>
       <group default="false">platform-devel</group>
+      <group default="false">platform-kvm</group>
       <group default="false">print-client</group>
       <group default="false">remote-desktop-clients</group>
       <group default="false">remote-system-management</group>
       <group default="false">rpm-development-tools</group>
       <group default="false">scientific</group>
       <group default="false">security-tools</group>
+      <group default="false">smart-card</group>
+      <group default="false">smb-server</group>
       <group default="false">standard</group>
       <group default="false">system-tools</group>
       <group default="false">texlive</group>
@@ -104,114 +112,34 @@
       <environment display_order="1">graphical-server-environment</environment>
       <environment display_order="3">minimal-environment</environment>
       <environment display_order="2">server-product-environment</environment>
+      <environment display_order="99">virtualization-host-environment</environment>
+      <environment display_order="4">workstation-product-environment</environment>
     </environments>
     <modules>
-      <module>389-ds:1.4</module>
-      <module>ant:1.10</module>
-      <module>container-tools:1.0</module>
-      <module>container-tools:2.0</module>
-      <module>container-tools:3.0</module>
-      <module>container-tools:4.0</module>
-      <module>container-tools:rhel8</module>
-      <module>freeradius:3.0</module>
-      <module>gimp:2.8</module>
-      <module>go-toolset:rhel8</module>
-      <module>httpd:2.4</module>
-      <module>idm:DL1</module>
-      <module>idm:client</module>
-      <module>inkscape:0.92.3</module>
-      <module>javapackages-runtime:201801</module>
-      <module>jaxb:4</module>
-      <module>jmc:rhel8</module>
-      <module>libselinux-python:2.8</module>
-      <module>llvm-toolset:rhel8</module>
-      <module>log4j:2</module>
-      <module>mailman:2.1</module>
-      <module>mariadb:10.3</module>
-      <module>mariadb:10.5</module>
-      <module>maven:3.5</module>
-      <module>maven:3.6</module>
+      <module>mariadb:10.11</module>
       <module>maven:3.8</module>
-      <module>mercurial:4.8</module>
-      <module>mercurial:6.2</module>
-      <module>mod_auth_openidc:2.3</module>
-      <module>mysql:8.0</module>
-      <module>nginx:1.14</module>
-      <module>nginx:1.16</module>
-      <module>nginx:1.18</module>
-      <module>nginx:1.20</module>
       <module>nginx:1.22</module>
-      <module>nodejs:10</module>
-      <module>nodejs:12</module>
-      <module>nodejs:14</module>
-      <module>nodejs:16</module>
+      <module>nginx:1.24</module>
       <module>nodejs:18</module>
       <module>nodejs:20</module>
-      <module>parfait:0.5</module>
-      <module>perl-App-cpanminus:1.7044</module>
-      <module>perl-DBD-MySQL:4.046</module>
-      <module>perl-DBD-Pg:3.7</module>
-      <module>perl-DBD-SQLite:1.58</module>
-      <module>perl-DBI:1.641</module>
-      <module>perl-FCGI:0.78</module>
-      <module>perl-IO-Socket-SSL:2.066</module>
-      <module>perl-YAML:1.24</module>
-      <module>perl-libwww-perl:6.34</module>
-      <module>perl:5.24</module>
-      <module>perl:5.26</module>
-      <module>perl:5.30</module>
-      <module>perl:5.32</module>
-      <module>php:7.2</module>
-      <module>php:7.3</module>
-      <module>php:7.4</module>
-      <module>php:8.0</module>
-      <module>pki-core:10.6</module>
-      <module>pki-deps:10.6</module>
-      <module>pmdk:1_fileformat_v6</module>
-      <module>postgresql:10</module>
-      <module>postgresql:12</module>
-      <module>postgresql:13</module>
+      <module>php:8.1</module>
+      <module>php:8.2</module>
       <module>postgresql:15</module>
-      <module>postgresql:9.6</module>
-      <module>python27:2.7</module>
-      <module>python36:3.6</module>
-      <module>python38:3.8</module>
-      <module>python39:3.9</module>
-      <module>redis:5</module>
-      <module>redis:6</module>
-      <module>rhn-tools:1.0</module>
-      <module>ruby:2.5</module>
-      <module>ruby:2.6</module>
-      <module>ruby:2.7</module>
-      <module>ruby:3.0</module>
+      <module>postgresql:16</module>
+      <module>redis:7</module>
       <module>ruby:3.1</module>
-      <module>rust-toolset:rhel8</module>
-      <module>satellite-5-client:1.0</module>
-      <module>scala:2.10</module>
-      <module>squid:4</module>
-      <module>subversion:1.10</module>
-      <module>subversion:1.14</module>
-      <module>swig:3.0</module>
-      <module>swig:4.0</module>
-      <module>swig:4.1</module>
-      <module>varnish:6</module>
-      <module>virt:rhel</module>
+      <module>ruby:3.3</module>
     </modules>
   </variant>
-  <variant id="PowerTools" name="PowerTools" type="variant">
+  <variant id="CRB" name="CRB" type="variant">
     <arches>
       <arch>s390x</arch>
     </arches>
     <groups>
-      <group default="false">powertools</group>
+      <group default="false">crb</group>
     </groups>
     <modules>
-      <module>javapackages-tools:201801</module>
-      <module>mariadb-devel:10.3</module>
-      <module>python38-devel:3.8</module>
-      <module>python39-devel:3.9</module>
-      <module>subversion-devel:1.10</module>
-      <module>virt-devel:rhel</module>
+      <module>swig:4.1</module>
     </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
@@ -281,12 +209,12 @@
       <group default="false">network-tools</group>
       <group default="false">networkmanager-submodules</group>
       <group default="false">performance</group>
-      <group default="false">platform-devel</group>
       <group default="false">python-web</group>
       <group default="false">remote-system-management</group>
       <group default="false">scientific</group>
       <group default="false">security-tools</group>
       <group default="false">server-product</group>
+      <group default="false">smart-card</group>
       <group default="false">smb-server</group>
       <group default="false">standard</group>
       <group default="false">system-tools</group>
@@ -301,72 +229,36 @@
       <arch>s390x</arch>
     </arches>
     <groups>
-      <group default="false">powertools</group>
+      <group default="false">gnome-apps</group>
+      <group default="false">graphics</group>
+      <group default="false">guest-agents</group>
+      <group default="false">infiniband</group>
+      <group default="false">multimedia</group>
+      <group default="false">office-suite</group>
+      <group default="false">platform-microsoft</group>
+      <group default="false">platform-vmware</group>
     </groups>
+    <environments>
+      <environment display_order="99">virtualization-host-environment</environment>
+      <environment display_order="4">workstation-product-environment</environment>
+    </environments>
     <modules>
-      <module>389-ds-devel:1.4</module>
-      <module>ant-devel:1.10</module>
-      <module>container-tools-devel:3.0</module>
-      <module>container-tools-devel:4.0</module>
-      <module>container-tools-devel:rhel8</module>
-      <module>freeradius-devel:3.0</module>
-      <module>gimp-devel:2.8</module>
-      <module>go-toolset-devel:rhel8</module>
-      <module>golang-ecosystem:1.0</module>
-      <module>httpd-devel:2.4</module>
-      <module>idm-devel:DL1</module>
-      <module>idm-devel:client</module>
-      <module>javapackages-tools-devel:201902</module>
       <module>javapackages-tools-devel:202201</module>
-      <module>javapackages-tools:201902</module>
       <module>javapackages-tools:202201</module>
-      <module>jaxb-devel:4</module>
-      <module>llvm-toolset-devel:rhel8</module>
-      <module>log4j-devel:2</module>
-      <module>mailman-devel:2.1</module>
       <module>mariadb-devel:10.11</module>
-      <module>mariadb-devel:10.5</module>
-      <module>mariadb:10.11</module>
-      <module>maven-devel:3.6</module>
       <module>maven-devel:3.8</module>
-      <module>mercurial-devel:6.2</module>
-      <module>mod_auth_openidc-devel:2.3</module>
-      <module>mysql-devel:8.0</module>
-      <module>nginx-devel:1.20</module>
       <module>nginx-devel:1.22</module>
       <module>nginx-devel:1.24</module>
-      <module>nginx:1.24</module>
-      <module>nodejs-devel:14</module>
-      <module>nodejs-devel:16</module>
       <module>nodejs-devel:18</module>
       <module>nodejs-devel:20</module>
-      <module>perl-devel:5.32</module>
-      <module>php-devel:7.4</module>
-      <module>php-devel:8.0</module>
+      <module>php-devel:8.1</module>
       <module>php-devel:8.2</module>
-      <module>php:8.2</module>
-      <module>pki-core-devel:10.6</module>
-      <module>pki-deps-devel:10.6</module>
-      <module>postgresql-devel:10</module>
-      <module>postgresql-devel:12</module>
-      <module>postgresql-devel:13</module>
       <module>postgresql-devel:15</module>
       <module>postgresql-devel:16</module>
-      <module>postgresql:16</module>
-      <module>python27-devel:2.7</module>
-      <module>python36-devel:3.6</module>
-      <module>redis-devel:6</module>
-      <module>ruby-devel:2.5</module>
-      <module>ruby-devel:2.7</module>
+      <module>redis-devel:7</module>
       <module>ruby-devel:3.1</module>
       <module>ruby-devel:3.3</module>
-      <module>ruby:3.3</module>
-      <module>rust-toolset-devel:rhel8</module>
-      <module>squid-devel:4</module>
-      <module>subversion-devel:1.14</module>
       <module>swig-devel:4.1</module>
-      <module>tycho:rhel8</module>
-      <module>varnish-devel:6</module>
     </modules>
   </variant>
 </variants>