diff --git a/comps.xml b/comps.xml
index 0aff797..ee22119 100644
--- a/comps.xml
+++ b/comps.xml
@@ -1412,9 +1412,6 @@
       <packagereq variant="Certified" type="default">lynx</packagereq>
       <packagereq variant="Certified" type="default">mariadb-connector-c-doc</packagereq>
       <packagereq variant="Certified" type="default">mariadb-connector-c-test</packagereq>
-      <packagereq variant="Certified" type="default">mariadb-devel</packagereq>
-      <packagereq variant="Certified" type="default">mariadb-embedded-devel</packagereq>
-      <packagereq variant="Certified" type="default">mariadb-test</packagereq>
       <packagereq variant="Certified" type="default">marshalparser</packagereq>
       <packagereq variant="Certified" type="default">maven-archiver</packagereq>
       <packagereq variant="Certified" type="default">maven-artifact-transfer</packagereq>
@@ -1514,8 +1511,6 @@
       <packagereq variant="Certified" type="default">munge-devel</packagereq>
       <packagereq variant="Certified" type="default">mutter-devel</packagereq>
       <packagereq variant="Certified" type="default">mvapich2-psm2-devel</packagereq>
-      <packagereq variant="Certified" type="default">mysql-devel</packagereq>
-      <packagereq variant="Certified" type="default">mysql-test</packagereq>
       <packagereq variant="Certified" type="default">mythes-devel</packagereq>
       <packagereq variant="Certified" type="default">nasm</packagereq>
       <packagereq variant="Certified" type="default">nautilus-devel</packagereq>
diff --git a/variants-i686.xml b/variants-i686.xml
index b050eaf..8f557f9 100644
--- a/variants-i686.xml
+++ b/variants-i686.xml
@@ -99,7 +99,6 @@
       <environment display_order="99">virtualization-host-environment</environment>
     </environments>
     <modules>
-      <module>mariadb:10.11</module>
       <module>maven:3.8</module>
       <module>nginx:1.22</module>
       <module>nginx:1.24</module>
@@ -107,9 +106,6 @@
       <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>
       <module>swig:4.1</module>
@@ -124,16 +120,12 @@
     </groups>
     <modules>
       <module>javapackages-tools-devel:202201</module>
-      <module>mariadb-devel:10.11</module>
       <module>nginx-devel:1.22</module>
       <module>nginx-devel: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>postgresql-devel:15</module>
-      <module>postgresql-devel:16</module>
-      <module>redis-devel:7</module>
       <module>ruby-devel:3.1</module>
       <module>ruby-devel:3.3</module>
       <module>swig-devel:4.1</module>
diff --git a/variants.xml b/variants.xml
index 4e1fc6f..422948c 100644
--- a/variants.xml
+++ b/variants.xml
@@ -99,7 +99,6 @@
       <environment display_order="99">virtualization-host-environment</environment>
     </environments>
     <modules>
-      <module>mariadb:10.11</module>
       <module>maven:3.8</module>
       <module>nginx:1.22</module>
       <module>nginx:1.24</module>
@@ -107,9 +106,6 @@
       <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>
       <module>swig:4.1</module>
@@ -125,7 +121,6 @@
     <modules>
       <module>javapackages-tools-devel:202201</module>
       <module>javapackages-tools:202201</module>
-      <module>mariadb-devel:10.11</module>
       <module>maven-devel:3.8</module>
       <module>nginx-devel:1.22</module>
       <module>nginx-devel:1.24</module>
@@ -133,9 +128,6 @@
       <module>nodejs-devel:20</module>
       <module>php-devel:8.1</module>
       <module>php-devel:8.2</module>
-      <module>postgresql-devel:15</module>
-      <module>postgresql-devel:16</module>
-      <module>redis-devel:7</module>
       <module>ruby-devel:3.1</module>
       <module>ruby-devel:3.3</module>
       <module>swig-devel:4.1</module>