diff --git a/s390x/variants.xml b/s390x/variants.xml
index 4d33205..6f881a5 100644
--- a/s390x/variants.xml
+++ b/s390x/variants.xml
@@ -121,6 +121,7 @@
       <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>
@@ -139,6 +140,7 @@
       <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>
@@ -164,11 +166,11 @@
       <module>php:8.0</module>
       <module>pki-core:10.6</module>
       <module>pki-deps:10.6</module>
-      <module>pmdk:1-fileformat-v6</module>
       <module>pmdk:1_fileformat_v6</module>
       <module>postgresql:10</module>
       <module>postgresql:12</module>
       <module>postgresql:13</module>
+      <module>postgresql:15</module>
       <module>postgresql:9.6</module>
       <module>python27:2.7</module>
       <module>python36:3.6</module>
@@ -190,6 +192,7 @@
       <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>
     </modules>
@@ -198,9 +201,6 @@
     <arches>
       <arch>s390x</arch>
     </arches>
-    <groups>
-      <group default="false">powertools</group>
-    </groups>
     <modules>
       <module>javapackages-tools:201801</module>
       <module>mariadb-devel:10.3</module>
@@ -219,21 +219,37 @@
       <group default="true">ha-devel</group>
     </groups>
   </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>s390x</arch>
-    </arches>
-  </variant>
   <variant id="ResilientStorage" name="ResilientStorage" type="variant">
     <arches>
       <arch>s390x</arch>
     </arches>
     <groups>
-      <group default="true">ha</group>
-      <group default="true">ha-devel</group>
-      <group default="true">resilient-storage</group>
+      <group default="false">ha</group>
+      <group default="false">ha-devel</group>
+      <group default="false">resilient-storage</group>
     </groups>
   </variant>
+  <variant id="SAP" name="SAP" type="variant">
+    <arches>
+      <arch>s390x</arch>
+    </arches>
+    <groups>
+      <group default="false">sap</group>
+    </groups>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>s390x</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="extras" name="extras" type="variant">
+    <arches>
+      <arch>s390x</arch>
+    </arches>
+  </variant>
   <variant id="Minimal" name="Minimal" type="variant">
     <arches>
       <arch>s390x</arch>
@@ -276,20 +292,43 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </variant>
-  <variant id="SAP" name="SAP" type="variant">
+  <variant id="devel" name="devel" type="variant">
     <arches>
       <arch>s390x</arch>
     </arches>
     <groups>
-      <group default="false">sap</group>
-    </groups>
-  </variant>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>s390x</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
+      <group default="false">powertools</group>
     </groups>
+    <modules>
+      <module>389-ds-devel:1.4</module>
+      <module>container-tools-devel:3.0</module>
+      <module>container-tools-devel:4.0</module>
+      <module>container-tools-devel:rhel8</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-bootstrap-devel:202201</module>
+      <module>javapackages-bootstrap:202201</module>
+      <module>javapackages-tools-devel:201902</module>
+      <module>javapackages-tools:201902</module>
+      <module>llvm-toolset-devel:rhel8</module>
+      <module>maven-devel:3.8</module>
+      <module>mercurial-devel:6.2</module>
+      <module>mod_auth_openidc-devel:2.3</module>
+      <module>nodejs-devel:14</module>
+      <module>nodejs-devel:18</module>
+      <module>php-devel:7.4</module>
+      <module>php-devel:8.0</module>
+      <module>pki-core-devel:10.6</module>
+      <module>pki-deps-devel:10.6</module>
+      <module>python27-devel:2.7</module>
+      <module>redis-devel:6</module>
+      <module>ruby-devel:3.1</module>
+      <module>rust-toolset-devel:rhel8</module>
+      <module>subversion-devel:1.14</module>
+      <module>tycho:rhel8</module>
+    </modules>
   </variant>
 </variants>