diff --git a/variants-i686.xml b/variants-i686.xml
index eb7127f..e5bdff0 100644
--- a/variants-i686.xml
+++ b/variants-i686.xml
@@ -124,99 +124,99 @@
virtualization-host-environment
workstation-product-environment
-
-
-
+
+ 389-ds:1.4
+ ant:1.10
-
-
+ container-tools:4.0
+ container-tools:rhel8
-
-
-
-
-
-
+ freeradius:3.0
+ gimp:2.8
+ go-toolset:rhel8
+ httpd:2.4
+ idm:DL1
+ idm:client
-
-
+ javapackages-runtime:201801
+ jaxb:4
-
-
+ libselinux-python:2.8
+ llvm-toolset:rhel8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ mailman:2.1
+ mariadb:10.3
+ mariadb:10.5
+ maven:3.5
+ maven:3.6
+ maven:3.8
+ mercurial:4.8
+ mercurial:6.2
+ mod_auth_openidc:2.3
+ mysql:8.0
+ nginx:1.14
+ nginx:1.16
+ nginx:1.18
+ nginx:1.20
+ nginx:1.22
+ nodejs:10
+ nodejs:12
+ nodejs:14
+ nodejs:16
+ nodejs:18
+ nodejs:20
+ parfait:0.5
+ perl-App-cpanminus:1.7044
+ perl-DBD-MySQL:4.046
+ perl-DBD-Pg:3.7
+ perl-DBD-SQLite:1.58
+ perl-DBI:1.641
+ perl-FCGI:0.78
+ perl-IO-Socket-SSL:2.066
+ perl-YAML:0.24
+ perl-libwww-perl:6.34
+ perl:5.24
+ perl:5.26
+ perl:5.30
+ perl:5.32
+ php:7.2
+ php:7.3
+ php:7.4
+ php:8.0
+ pki-core:10.6
+ pki-deps:10.6
+ pmdk:1_fileformat_v6
+ postgresql:10
+ postgresql:12
+ postgresql:13
+ postgresql:15
+ postgresql:9.6
+ python27:2.7
+ python36:3.6
-
-
+ redis:5
+ redis:6
-
-
-
-
-
-
+ ruby:2.5
+ ruby:2.6
+ ruby:2.7
+ ruby:3.0
+ ruby:3.1
+ rust-toolset:rhel8
-
-
-
-
-
-
-
-
+ scala:2.10
+ squid:4
+ subversion:1.10
+ subversion:1.14
+ swig:3.0
+ swig:4.0
+ swig:4.1
+ varnish:6
-
+
@@ -225,14 +225,14 @@
powertools
-
-
-
+
+ javapackages-tools:201801
+ mariadb-devel:10.3
-
+ subversion-devel:1.10
-
+
@@ -411,39 +411,39 @@
powertools
-
-
+
+ 389-ds-devel:1.4
-
+ httpd-devel:2.4
-
-
+ javapackages-tools:201902
+ jaxb-devel:4
-
-
+ mariadb-devel:10.5
+ maven-devel:3.6
-
+ mysql-devel:8.0
-
+ perl-devel:5.32
-
+ pki-deps-devel:10.6
@@ -456,10 +456,10 @@
-
+ subversion-devel:1.14
-
+
diff --git a/variants.xml b/variants.xml
index e6e252e..f57a9c4 100644
--- a/variants.xml
+++ b/variants.xml
@@ -124,99 +124,99 @@
virtualization-host-environment
workstation-product-environment
-
-
-
+
+ 389-ds:1.4
+ ant:1.10
-
-
+ container-tools:4.0
+ container-tools:rhel8
-
-
-
-
-
-
+ freeradius:3.0
+ gimp:2.8
+ go-toolset:rhel8
+ httpd:2.4
+ idm:DL1
+ idm:client
-
-
+ javapackages-runtime:201801
+ jaxb:4
-
-
+ libselinux-python:2.8
+ llvm-toolset:rhel8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ mailman:2.1
+ mariadb:10.3
+ mariadb:10.5
+ maven:3.5
+ maven:3.6
+ maven:3.8
+ mercurial:4.8
+ mercurial:6.2
+ mod_auth_openidc:2.3
+ mysql:8.0
+ nginx:1.14
+ nginx:1.16
+ nginx:1.18
+ nginx:1.20
+ nginx:1.22
+ nodejs:10
+ nodejs:12
+ nodejs:14
+ nodejs:16
+ nodejs:18
+ nodejs:20
+ parfait:0.5
+ perl-App-cpanminus:1.7044
+ perl-DBD-MySQL:4.046
+ perl-DBD-Pg:3.7
+ perl-DBD-SQLite:1.58
+ perl-DBI:1.641
+ perl-FCGI:0.78
+ perl-IO-Socket-SSL:2.066
+ perl-YAML:1.24
+ perl-libwww-perl:6.34
+ perl:5.24
+ perl:5.26
+ perl:5.30
+ perl:5.32
+ php:7.2
+ php:7.3
+ php:7.4
+ php:8.0
+ pki-core:10.6
+ pki-deps:10.6
+ pmdk:1_fileformat_v6
+ postgresql:10
+ postgresql:12
+ postgresql:13
+ postgresql:15
+ postgresql:9.6
+ python27:2.7
+ python36:3.6
-
-
+ redis:5
+ redis:6
-
-
-
-
-
-
+ ruby:2.5
+ ruby:2.6
+ ruby:2.7
+ ruby:3.0
+ ruby:3.1
+ rust-toolset:rhel8
-
-
-
-
-
-
-
-
+ scala:2.10
+ squid:4
+ subversion:1.10
+ subversion:1.14
+ swig:3.0
+ swig:4.0
+ swig:4.1
+ varnish:6
-
+
@@ -225,14 +225,14 @@
powertools
-
-
-
+
+ javapackages-tools:201801
+ mariadb-devel:10.3
-
+ subversion-devel:1.10
-
+
@@ -411,8 +411,8 @@
powertools
-
-
+
+ 389-ds-devel:1.4
@@ -426,28 +426,28 @@
-
+ jaxb-devel:4
-
-
-
+ mariadb-devel:10.5
+ maven-devel:3.6
+ maven-devel:3.8
-
+ mysql-devel:8.0
-
+ perl-devel:5.32
-
+ pki-deps-devel:10.6
@@ -461,10 +461,10 @@
-
+ subversion-devel:1.14
-
+