diff --git a/s390x/variants.xml b/s390x/variants.xml
index a62c5f5..33faaf6 100644
--- a/s390x/variants.xml
+++ b/s390x/variants.xml
@@ -116,19 +116,14 @@
       <environment display_order="4">workstation-product-environment</environment>
     </environments>
     <modules>
-      <module>mariadb:10.11</module>
       <module>maven:3.8</module>
       <module>nginx:1.22</module>
-      <module>nginx:1.24</module>
       <module>nodejs:18</module>
       <module>nodejs:20</module>
       <module>php:8.1</module>
-      <module>php:8.2</module>
       <module>postgresql:15</module>
-      <module>postgresql:16</module>
       <module>redis:7</module>
       <module>ruby:3.1</module>
-      <module>ruby:3.3</module>
     </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
@@ -246,18 +241,23 @@
       <module>javapackages-tools-devel:202201</module>
       <module>javapackages-tools:202201</module>
       <module>mariadb-devel:10.11</module>
+      <module>mariadb:10.11</module>
       <module>maven-devel:3.8</module>
       <module>nginx-devel:1.22</module>
       <module>nginx-devel:1.24</module>
+      <module>nginx:1.24</module>
       <module>nodejs-devel:18</module>
       <module>nodejs-devel:20</module>
       <module>php-devel:8.1</module>
       <module>php-devel:8.2</module>
+      <module>php:8.2</module>
       <module>postgresql-devel:15</module>
       <module>postgresql-devel:16</module>
+      <module>postgresql:16</module>
       <module>redis-devel:7</module>
       <module>ruby-devel:3.1</module>
       <module>ruby-devel:3.3</module>
+      <module>ruby:3.3</module>
       <module>swig-devel:4.1</module>
     </modules>
   </variant>