80 files changed, 409 insertions, 78 deletions

diff --git a/el8a.tpl b/el8a.tpl
index cd7b6d8..de0b30b 100644
--- a/el8a.tpl
+++ b/el8a.tpl
@@ -25,11 +25,12 @@ config_opts['macros']['%dist']=".el8.remi"
 config_opts['macros']['%rhel']="8"
 config_opts['macros']['%_with_ibase']="1"
 config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%_without_zts']="1"
 config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
 
-config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.0', 'redis:remi-7.0']
+config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.0', 'redis:remi-7.2']
 
 config_opts['yum.conf'] = """
 [main]
@@ -61,8 +62,9 @@ enabled=1
 
 [epel]
 name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=aarch64
-;baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/aarch64/
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=aarch64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=aarch64
+#baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/aarch64/
 exclude=epel-rpm-macros
 enabled=1
 
@@ -90,6 +92,7 @@ name=remi private
 baseurl=file:/home/remi/priv/el8.aarch64/
 enabled=1
 metadata_expire=30
+module_hotfixes=1
 
 [remi-debuginfo]
 name=remi-debuginfo
diff --git a/el8a72.cfg b/el8a72.cfg
index eb0d5fd..8389f72 100644
--- a/el8a72.cfg
+++ b/el8a72.cfg
@@ -5,7 +5,7 @@ include('el8a.tpl')
 config_opts['root'] = 'el8a72'
 config_opts['resultdir'] = "/var/lib/mock/el8a72"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-7.2/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8a73.cfg b/el8a73.cfg
index cbc39ab..ff62bba 100644
--- a/el8a73.cfg
+++ b/el8a73.cfg
@@ -5,7 +5,7 @@ include('el8a.tpl')
 config_opts['root'] = 'el8a73'
 config_opts['resultdir'] = "/var/lib/mock/el8a73"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-7.3/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8a74.cfg b/el8a74.cfg
index 5fbe23b..28bdc9d 100644
--- a/el8a74.cfg
+++ b/el8a74.cfg
@@ -5,7 +5,7 @@ include('el8a.tpl')
 config_opts['root'] = 'el8a74'
 config_opts['resultdir'] = "/var/lib/mock/el8a74"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.4', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.4', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-7.4/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8a80.cfg b/el8a80.cfg
index 8e52b3b..623a7af 100644
--- a/el8a80.cfg
+++ b/el8a80.cfg
@@ -5,7 +5,7 @@ include('el8a.tpl')
 config_opts['root'] = 'el8a80'
 config_opts['resultdir'] = "/var/lib/mock/el8a80"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.0', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.0', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.0/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8a81.cfg b/el8a81.cfg
index db99075..9f4ab3b 100644
--- a/el8a81.cfg
+++ b/el8a81.cfg
@@ -5,7 +5,7 @@ include('el8a.tpl')
 config_opts['root'] = 'el8a81'
 config_opts['resultdir'] = "/var/lib/mock/el8a81"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.1/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8a82.cfg b/el8a82.cfg
index 5822d74..e5d9987 100644
--- a/el8a82.cfg
+++ b/el8a82.cfg
@@ -5,7 +5,7 @@ include('el8a.tpl')
 config_opts['root'] = 'el8a82'
 config_opts['resultdir'] = "/var/lib/mock/el8a82"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.2', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.2', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8a83.cfg b/el8a83.cfg
index 2ad23e2..6a9090e 100644
--- a/el8a83.cfg
+++ b/el8a83.cfg
@@ -5,7 +5,7 @@ include('el8a.tpl')
 config_opts['root'] = 'el8a83'
 config_opts['resultdir'] = "/var/lib/mock/el8a83"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.3', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.3', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.3/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8a84.cfg b/el8a84.cfg
new file mode 100644
index 0000000..e71a4ba
--- /dev/null
+++ b/el8a84.cfg
@@ -0,0 +1,27 @@
+import datetime;
+
+include('el8a.tpl')
+
+config_opts['root'] = 'el8a84'
+config_opts['resultdir'] = "/var/lib/mock/el8a84"
+
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.4', 'redis:remi-7.2']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="81000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el8a84]
+name=result-el8a84
+baseurl=file:/var/lib/mock/el8a84/
+metadata_expire=15
+enabled=1
+module_hotfixes=1
+skip_if_unavailable=True
+"""
diff --git a/el8ascl72.cfg b/el8ascl72.cfg
index 9c4f72a..bbf96f0 100644
--- a/el8ascl72.cfg
+++ b/el8ascl72.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl72el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl72el8a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build php72-php-devel php72-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8ascl73.cfg b/el8ascl73.cfg
index 9b48432..5834a79 100644
--- a/el8ascl73.cfg
+++ b/el8ascl73.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl73el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl73el8a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php73-build php73-php-devel php73-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8ascl74.cfg b/el8ascl74.cfg
index a16788c..e101c80 100644
--- a/el8ascl74.cfg
+++ b/el8ascl74.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl74el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl74el8a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php74-build php74-php-devel php74-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8ascl80.cfg b/el8ascl80.cfg
index 60ecd6f..ec500a3 100644
--- a/el8ascl80.cfg
+++ b/el8ascl80.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl80el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl80el8a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php80-build php80-php-devel php80-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8ascl81.cfg b/el8ascl81.cfg
index d39c364..27f514e 100644
--- a/el8ascl81.cfg
+++ b/el8ascl81.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl81el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl81el8a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php81-build php81-php-devel php81-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8ascl82.cfg b/el8ascl82.cfg
index 79a0879..a8d185b 100644
--- a/el8ascl82.cfg
+++ b/el8ascl82.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl82el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl82el8a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php82-build php82-php-devel php82-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8ascl83.cfg b/el8ascl83.cfg
index 19c8e57..c3f300b 100644
--- a/el8ascl83.cfg
+++ b/el8ascl83.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl83el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl83el8a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php83-build php83-php-devel php83-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8ascl84.cfg b/el8ascl84.cfg
index 81746d4..2498025 100644
--- a/el8ascl84.cfg
+++ b/el8ascl84.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl84el8a'
 config_opts['resultdir'] = "/var/lib/mock/scl84el8a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php84-build php84-php-devel php84-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8n81.cfg b/el8n81.cfg
index 0b1e05c..f4646bd 100644
--- a/el8n81.cfg
+++ b/el8n81.cfg
@@ -5,5 +5,5 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x81'
 config_opts['resultdir'] = "/var/lib/mock/el8x"
 
-config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-5.0']
+config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.2']
 
diff --git a/el8n82.cfg b/el8n82.cfg
index 3297697..be8cc4d 100644
--- a/el8n82.cfg
+++ b/el8n82.cfg
@@ -5,5 +5,5 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x82'
 config_opts['resultdir'] = "/var/lib/mock/el8x"
 
-config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.2', 'redis:remi-5.0']
+config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.2', 'redis:remi-7.2']
 
diff --git a/el8x.tpl b/el8x.tpl
index 121be76..d2fbae0 100644
--- a/el8x.tpl
+++ b/el8x.tpl
@@ -29,7 +29,7 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
 
-config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.0', 'redis:remi-7.0']
+config_opts['module_enable'] = ['swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.0', 'redis:remi-7.2']
 
 config_opts['yum.conf'] = """
 [main]
@@ -61,8 +61,9 @@ enabled=1
 
 [epel]
 name=epel
-;mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
-baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=x86_64
+#baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/
 exclude=epel-rpm-macros
 enabled=1
 
@@ -96,6 +97,7 @@ name=remi prive el8
 baseurl=file:/home/rpmbuild/site/rpms/priv/el8.x86_64/
 enabled=1
 metadata_expire=30
+module_hotfixes=1
 
 [remi-debuginfo]
 name=remi-debuginfo
diff --git a/el8x72.cfg b/el8x72.cfg
index 5089842..81500c2 100644
--- a/el8x72.cfg
+++ b/el8x72.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x72'
 config_opts['resultdir'] = "/var/lib/mock/el8x72"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-7.2']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
diff --git a/el8x73.cfg b/el8x73.cfg
index db37199..d16f11d 100644
--- a/el8x73.cfg
+++ b/el8x73.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x73'
 config_opts['resultdir'] = "/var/lib/mock/el8x73"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-7.2']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
diff --git a/el8x74.cfg b/el8x74.cfg
index f49dbee..eb5829d 100644
--- a/el8x74.cfg
+++ b/el8x74.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x74'
 config_opts['resultdir'] = "/var/lib/mock/el8x74"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.4', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.4', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-7.4/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8x80.cfg b/el8x80.cfg
index 1226e91..317cafc 100644
--- a/el8x80.cfg
+++ b/el8x80.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x80'
 config_opts['resultdir'] = "/var/lib/mock/el8x80"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.0', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.0', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.0/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8x81.cfg b/el8x81.cfg
index cc6a177..580e12d 100644
--- a/el8x81.cfg
+++ b/el8x81.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x81'
 config_opts['resultdir'] = "/var/lib/mock/el8x81"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.1/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8x82.cfg b/el8x82.cfg
index 7af9fa5..35f4ce0 100644
--- a/el8x82.cfg
+++ b/el8x82.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x82'
 config_opts['resultdir'] = "/var/lib/mock/el8x82"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.2', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.2', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8x83.cfg b/el8x83.cfg
index 8f68742..06f09df 100644
--- a/el8x83.cfg
+++ b/el8x83.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x83'
 config_opts['resultdir'] = "/var/lib/mock/el8x83"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.3', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.3', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.3/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el8x84.cfg b/el8x84.cfg
new file mode 100644
index 0000000..fe7de72
--- /dev/null
+++ b/el8x84.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el8x.tpl')
+
+config_opts['root'] = 'el8x84'
+config_opts['resultdir'] = "/var/lib/mock/el8x84"
+
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.4', 'redis:remi-7.2']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="81000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el8x84]
+name=result-el8x
+baseurl=file:/var/lib/mock/el8x84/
+metadata_expire=15
+enabled=1
+module_hotfixes=1
+skip_if_unavailable=True
+
+"""
diff --git a/el8xm.cfg b/el8xm.cfg
index fe3878b..6d690b8 100644
--- a/el8xm.cfg
+++ b/el8xm.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x'
 config_opts['resultdir'] = "/var/lib/mock/el8x"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.2']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
diff --git a/el8xr60.cfg b/el8xr60.cfg
index f443bf3..28a1474 100644
--- a/el8xr60.cfg
+++ b/el8xr60.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x'
 config_opts['resultdir'] = "/var/lib/mock/el8x"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-6.0']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
diff --git a/el8xr62.cfg b/el8xr62.cfg
index e378cfa..f38d726 100644
--- a/el8xr62.cfg
+++ b/el8xr62.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x'
 config_opts['resultdir'] = "/var/lib/mock/el8x"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-6.2']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
diff --git a/el8xr72.cfg b/el8xr72.cfg
index 05a560f..bd1862a 100644
--- a/el8xr72.cfg
+++ b/el8xr72.cfg
@@ -5,7 +5,7 @@ include('el8x.tpl')
 config_opts['root'] = 'el8x'
 config_opts['resultdir'] = "/var/lib/mock/el8x"
 
-config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.0']
+config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.2']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
 config_opts['macros']['%_module_build']="1"
diff --git a/el8xscl56.cfg b/el8xscl56.cfg
index e82f52f..5c52b86 100644
--- a/el8xscl56.cfg
+++ b/el8xscl56.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl56el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl56el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php56-build'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl70.cfg b/el8xscl70.cfg
index 8e928a2..03e2bb9 100644
--- a/el8xscl70.cfg
+++ b/el8xscl70.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl70el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl70el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php70-build'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl71.cfg b/el8xscl71.cfg
index 6c8c972..8fd0ac5 100644
--- a/el8xscl71.cfg
+++ b/el8xscl71.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl71el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl71el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php71-build'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl72.cfg b/el8xscl72.cfg
index cb1e2f0..31caf9b 100644
--- a/el8xscl72.cfg
+++ b/el8xscl72.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl72el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl72el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build php72-php-devel php72-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl73.cfg b/el8xscl73.cfg
index eafc94c..d61e5e0 100644
--- a/el8xscl73.cfg
+++ b/el8xscl73.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl73el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl73el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php73-build php73-php-devel php73-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl74.cfg b/el8xscl74.cfg
index fee5b14..67d8ac8 100644
--- a/el8xscl74.cfg
+++ b/el8xscl74.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl74el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl74el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php74-build php74-php-devel php74-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl80.cfg b/el8xscl80.cfg
index 4a2ae50..1d071ae 100644
--- a/el8xscl80.cfg
+++ b/el8xscl80.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl80el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl80el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php80-build php80-php-devel php80-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl81.cfg b/el8xscl81.cfg
index 4d69b71..aa5cedc 100644
--- a/el8xscl81.cfg
+++ b/el8xscl81.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl81el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl81el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php81-build php81-php-devel php81-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl82.cfg b/el8xscl82.cfg
index c1e6ffb..f131d19 100644
--- a/el8xscl82.cfg
+++ b/el8xscl82.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl82el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl82el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php82-build php82-php-devel php82-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl83.cfg b/el8xscl83.cfg
index f41d89d..db9acb4 100644
--- a/el8xscl83.cfg
+++ b/el8xscl83.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl83el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl83el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php83-build php83-php-devel php83-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el8xscl84.cfg b/el8xscl84.cfg
index dcada1c..8cb8934 100644
--- a/el8xscl84.cfg
+++ b/el8xscl84.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl84el8x'
 config_opts['resultdir'] = "/var/lib/mock/scl84el8x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php84-build php84-php-devel php84-php-pear'
 
-config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.0']
+config_opts['module_enable'] = ['subversion:1.10', 'php:7.2', 'varnish:6', 'swig', 'javapackages-runtime', 'mariadb:10.3', 'nodejs:10', 'postgresql:10',  'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9a.tpl b/el9a.tpl
index cf78d81..a740024 100644
--- a/el9a.tpl
+++ b/el9a.tpl
@@ -25,11 +25,12 @@ config_opts['macros']['%dist']=".el9.remi"
 config_opts['macros']['%rhel']="9"
 config_opts['macros']['%_with_ibase']="1"
 config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%_without_zts']="1"
 config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
 
-config_opts['module_enable'] = ['php:remi-8.0', 'redis:remi-7.0']
+config_opts['module_enable'] = ['php:remi-8.0', 'redis:remi-7.2']
 
 config_opts['yum.conf'] = """
 [main]
@@ -58,12 +59,13 @@ enabled=1
 name=rhel-9-appstream
 baseurl=file:/mnt/rhel-9-aarch64/AppStream/
 enabled=1
-excludepkgs=php*
+## excludepkgs=php*
 
 [epel]
 name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-9&arch=aarch64
-;baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/aarch64/
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-9&arch=aarch64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=aarch64
+#baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/aarch64/
 exclude=epel-rpm-macros
 enabled=1
 
diff --git a/el9a74.cfg b/el9a74.cfg
index cbce376..336129c 100644
--- a/el9a74.cfg
+++ b/el9a74.cfg
@@ -5,7 +5,7 @@ include('el9a.tpl')
 config_opts['root'] = 'el9a74'
 config_opts['resultdir'] = "/var/lib/mock/el9a74"
 
-config_opts['module_enable']  = ['php:remi-7.4', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-7.4', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-7.4/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9a80.cfg b/el9a80.cfg
index 0e0d163..182ccfe 100644
--- a/el9a80.cfg
+++ b/el9a80.cfg
@@ -5,7 +5,7 @@ include('el9a.tpl')
 config_opts['root'] = 'el9a80'
 config_opts['resultdir'] = "/var/lib/mock/el9a80"
 
-config_opts['module_enable']  = ['php:remi-8.0', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-8.0', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.0/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9a81.cfg b/el9a81.cfg
index ba6da96..0e90ddd 100644
--- a/el9a81.cfg
+++ b/el9a81.cfg
@@ -5,7 +5,7 @@ include('el9a.tpl')
 config_opts['root'] = 'el9a81'
 config_opts['resultdir'] = "/var/lib/mock/el9a81"
 
-config_opts['module_enable']  = ['php:remi-8.1', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-8.1', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.1/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9a82.cfg b/el9a82.cfg
index 841c29e..4120b05 100644
--- a/el9a82.cfg
+++ b/el9a82.cfg
@@ -5,7 +5,7 @@ include('el9a.tpl')
 config_opts['root'] = 'el9a82'
 config_opts['resultdir'] = "/var/lib/mock/el9a82"
 
-config_opts['module_enable']  = ['php:remi-8.2', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-8.2', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9a83.cfg b/el9a83.cfg
index 39ebe9a..46102c8 100644
--- a/el9a83.cfg
+++ b/el9a83.cfg
@@ -5,7 +5,7 @@ include('el9a.tpl')
 config_opts['root'] = 'el9a83'
 config_opts['resultdir'] = "/var/lib/mock/el9a83"
 
-config_opts['module_enable']  = ['php:remi-8.3', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-8.3', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.3/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9a84.cfg b/el9a84.cfg
new file mode 100644
index 0000000..a093eb4
--- /dev/null
+++ b/el9a84.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('el9a.tpl')
+
+config_opts['root'] = 'el9a84'
+config_opts['resultdir'] = "/var/lib/mock/el9a84"
+
+config_opts['module_enable']  = ['php:remi-8.4', 'redis:remi-7.2']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-el9a84]
+name=result-el9a84
+baseurl=file:/var/lib/mock/el9a84/
+metadata_expire=15
+skip_if_unavailable=True
+enabled=1
+module_hotfixes=1
+
+"""
diff --git a/el9ascl74.cfg b/el9ascl74.cfg
index 16795d7..e78a342 100644
--- a/el9ascl74.cfg
+++ b/el9ascl74.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl74el9a'
 config_opts['resultdir'] = "/var/lib/mock/scl74el9a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php74-build php74-php-devel php74-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9ascl80.cfg b/el9ascl80.cfg
index 90d6aec..d089c1d 100644
--- a/el9ascl80.cfg
+++ b/el9ascl80.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl80el9a'
 config_opts['resultdir'] = "/var/lib/mock/scl80el9a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php80-build php80-php-devel php80-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9ascl81.cfg b/el9ascl81.cfg
index 1915656..2a68024 100644
--- a/el9ascl81.cfg
+++ b/el9ascl81.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl81el9a'
 config_opts['resultdir'] = "/var/lib/mock/scl81el9a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php81-build php81-php-devel php81-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9ascl82.cfg b/el9ascl82.cfg
index 4625341..818d7d8 100644
--- a/el9ascl82.cfg
+++ b/el9ascl82.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl82el9a'
 config_opts['resultdir'] = "/var/lib/mock/scl82el9a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php82-build php82-php-devel php82-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9ascl83.cfg b/el9ascl83.cfg
index 0341ed7..368968e 100644
--- a/el9ascl83.cfg
+++ b/el9ascl83.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl83el9a'
 config_opts['resultdir'] = "/var/lib/mock/scl83el9a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php83-build php83-php-devel php83-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9ascl84.cfg b/el9ascl84.cfg
index 7fa6e6f..036eb25 100644
--- a/el9ascl84.cfg
+++ b/el9ascl84.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl84el9a'
 config_opts['resultdir'] = "/var/lib/mock/scl84el9a"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php84-build php84-php-devel php84-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9x.tpl b/el9x.tpl
index ab76d7e..fffa3b6 100644
--- a/el9x.tpl
+++ b/el9x.tpl
@@ -29,7 +29,7 @@ config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
 
-config_opts['module_enable'] = ['php:remi-8.0', 'redis:remi-7.0']
+config_opts['module_enable'] = ['php:remi-8.0', 'redis:remi-7.2']
 
 config_opts['yum.conf'] = """
 [main]
@@ -61,8 +61,9 @@ enabled=1
 
 [epel]
 name=epel
-;mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-9&arch=x86_64
-baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-9&arch=x86_64
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=x86_64
+#baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/
 exclude=epel-rpm-macros
 enabled=1
 
diff --git a/el9x74.cfg b/el9x74.cfg
index 7d3f2be..ca8f64b 100644
--- a/el9x74.cfg
+++ b/el9x74.cfg
@@ -5,7 +5,7 @@ include('el9x.tpl')
 config_opts['root'] = 'el9x74'
 config_opts['resultdir'] = "/var/lib/mock/el9x74"
 
-config_opts['module_enable']  = ['php:remi-7.4', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-7.4', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-7.4/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9x80.cfg b/el9x80.cfg
index bddfe5a..f0014e5 100644
--- a/el9x80.cfg
+++ b/el9x80.cfg
@@ -5,7 +5,7 @@ include('el9x.tpl')
 config_opts['root'] = 'el9x80'
 config_opts['resultdir'] = "/var/lib/mock/el9x80"
 
-config_opts['module_enable']  = ['php:remi-8.0', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-8.0', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.0/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9x81.cfg b/el9x81.cfg
index 8b411ca..49ad9ea 100644
--- a/el9x81.cfg
+++ b/el9x81.cfg
@@ -5,7 +5,7 @@ include('el9x.tpl')
 config_opts['root'] = 'el9x81'
 config_opts['resultdir'] = "/var/lib/mock/el9x81"
 
-config_opts['module_enable']  = ['php:remi-8.1', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-8.1', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.1/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9x82.cfg b/el9x82.cfg
index 489ee27..38deab8 100644
--- a/el9x82.cfg
+++ b/el9x82.cfg
@@ -5,7 +5,7 @@ include('el9x.tpl')
 config_opts['root'] = 'el9x82'
 config_opts['resultdir'] = "/var/lib/mock/el9x82"
 
-config_opts['module_enable']  = ['php:remi-8.2', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-8.2', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.2/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9x83.cfg b/el9x83.cfg
index df76c0b..0bce530 100644
--- a/el9x83.cfg
+++ b/el9x83.cfg
@@ -5,7 +5,7 @@ include('el9x.tpl')
 config_opts['root'] = 'el9x83'
 config_opts['resultdir'] = "/var/lib/mock/el9x83"
 
-config_opts['module_enable']  = ['php:remi-8.3', 'redis:remi-7.0']
+config_opts['module_enable']  = ['php:remi-8.3', 'redis:remi-7.2']
 config_opts['module_install'] = ['php:remi-8.3/devel']
 
 nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
diff --git a/el9x84.cfg b/el9x84.cfg
new file mode 100644
index 0000000..1e53824
--- /dev/null
+++ b/el9x84.cfg
@@ -0,0 +1,34 @@
+import datetime;
+
+include('el9x.tpl')
+
+config_opts['root'] = 'el9x84'
+config_opts['resultdir'] = "/var/lib/mock/el9x84"
+
+config_opts['module_enable']  = ['php:remi-8.4', 'redis:remi-7.2']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="90400" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[remi-php84]
+name=remi php84
+baseurl=file:/home/rpmbuild/site/rpms/enterprise/9/php84/x86_64/
+enabled=0
+metadata_expire=15
+
+[result-el9x84]
+name=result-el9x
+baseurl=file:/var/lib/mock/el9x84/
+metadata_expire=15
+enabled=1
+module_hotfixes=1
+skip_if_unavailable=True
+
+"""
diff --git a/el9xscl74.cfg b/el9xscl74.cfg
index 9cee609..d6b98df 100644
--- a/el9xscl74.cfg
+++ b/el9xscl74.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl74el9x'
 config_opts['resultdir'] = "/var/lib/mock/scl74el9x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php74-build php74-php-devel php74-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9xscl80.cfg b/el9xscl80.cfg
index c02cc05..111d871 100644
--- a/el9xscl80.cfg
+++ b/el9xscl80.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl80el9x'
 config_opts['resultdir'] = "/var/lib/mock/scl80el9x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php80-build php80-php-devel php80-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9xscl81.cfg b/el9xscl81.cfg
index 478094c..58cb88a 100644
--- a/el9xscl81.cfg
+++ b/el9xscl81.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl81el9x'
 config_opts['resultdir'] = "/var/lib/mock/scl81el9x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php81-build php81-php-devel php81-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9xscl82.cfg b/el9xscl82.cfg
index 54494c4..aac086c 100644
--- a/el9xscl82.cfg
+++ b/el9xscl82.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl82el9x'
 config_opts['resultdir'] = "/var/lib/mock/scl82el9x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php82-build php82-php-devel php82-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9xscl83.cfg b/el9xscl83.cfg
index 178d19b..64d6b9c 100644
--- a/el9xscl83.cfg
+++ b/el9xscl83.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl83el9x'
 config_opts['resultdir'] = "/var/lib/mock/scl83el9x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php83-build php83-php-devel php83-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/el9xscl84.cfg b/el9xscl84.cfg
index aa946f2..7f00616 100644
--- a/el9xscl84.cfg
+++ b/el9xscl84.cfg
@@ -4,7 +4,7 @@ config_opts['root'] = 'scl84el9x'
 config_opts['resultdir'] = "/var/lib/mock/scl84el9x"
 config_opts['chroot_setup_cmd'] = 'install bash bzip2  coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss remi-crypto-legacy php84-build php84-php-devel php84-php-pear'
 
-config_opts['module_enable'] = ['redis:remi-7.0']
+config_opts['module_enable'] = ['redis:remi-7.2']
 
 config_opts['macros']['%scl_vendor']="remi"
 config_opts['macros']['%_scl_prefix']="/opt/remi"
diff --git a/fc39a.tpl b/fc39a.tpl
index ffd9edb..9e9cf75 100644
--- a/fc39a.tpl
+++ b/fc39a.tpl
@@ -26,6 +26,7 @@ config_opts['macros']['%dist']=".fc39.remi"
 config_opts['macros']['%fedora']="39"
 config_opts['macros']['%_with_ibase']="1"
 config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%_without_zts']="1"
 config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
diff --git a/fc39a84.cfg b/fc39a84.cfg
new file mode 100644
index 0000000..69d1ceb
--- /dev/null
+++ b/fc39a84.cfg
@@ -0,0 +1,32 @@
+import datetime;
+
+include('fc39a.tpl')
+
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+config_opts['root'] = 'fc39a84'
+config_opts['resultdir'] = "/var/lib/mock/fc39a84"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39a84/"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="39" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-fc39a84]
+name=result-fc39a84
+baseurl=file:/var/lib/mock/fc39a84/
+enabled=1
+metadata_expire=1
+module_hotfixes=1
+priority=1
+skip_if_unavailable=True
+
+"""
+
diff --git a/fc39x.tpl b/fc39x.tpl
index 05fcf6b..45c2e45 100644
--- a/fc39x.tpl
+++ b/fc39x.tpl
@@ -48,21 +48,21 @@ max_parallel_downloads=6
 
 [fedora]
 name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 metadata_expire=80000
 ##mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-39&arch=x86_64
 #baseurl=http://fr2.rpmfind.net/linux/fedora/releases/39/Everything/x86_64/os/
 #	http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/releases/39/Everything/x86_64/os/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/39/Everything/x86_64/os/
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/39/Everything/x86_64/os/
 
 [updates]
 name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f39&arch=x86_64
 #baseurl=http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/updates/1/x86_64/
 #	http://mirrors.ircam.fr/pub/fedora/linux/updates/39/x86_64/
 #	http://fr2.rpmfind.net/linux/fedora/updates/39/x86_64/
-#baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/
+baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/39/Everything/x86_64/
 enabled=1
 	
 [updates-testing]
diff --git a/fc39x84.cfg b/fc39x84.cfg
new file mode 100644
index 0000000..e67e190
--- /dev/null
+++ b/fc39x84.cfg
@@ -0,0 +1,32 @@
+import datetime;
+
+include('fc39x.tpl')
+
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache'
+config_opts['root'] = 'fc39x84'
+config_opts['resultdir'] = "/var/lib/mock/fc39x84"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc39x84/"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="39" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-fc39x84]
+name=result-fc39x84
+baseurl=file:/var/lib/mock/fc39x84/
+enabled=1
+metadata_expire=1
+module_hotfixes=1
+priority=1
+skip_if_unavailable=True
+
+"""
+
diff --git a/fc40a.tpl b/fc40a.tpl
index 81fed92..10168e8 100644
--- a/fc40a.tpl
+++ b/fc40a.tpl
@@ -26,6 +26,7 @@ config_opts['macros']['%dist']=".fc40.remi"
 config_opts['macros']['%fedora']="40"
 config_opts['macros']['%_with_ibase']="1"
 config_opts['macros']['%_with_oci8']="1"
+config_opts['macros']['%_without_zts']="1"
 config_opts['macros']['%runselftest']="1"
 
 config_opts['environment']['ACCEPT_EULA'] = 'Y'
diff --git a/fc40a84.cfg b/fc40a84.cfg
new file mode 100644
index 0000000..ea906cb
--- /dev/null
+++ b/fc40a84.cfg
@@ -0,0 +1,31 @@
+import datetime;
+
+include('fc40a.tpl')
+
+config_opts['root'] = 'fc40a84'
+config_opts['resultdir'] = "/var/lib/mock/fc40a84"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a84/"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="40" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-fc40a84]
+name=result-fc40a84
+baseurl=file:/var/lib/mock/fc40a84/
+enabled=1
+metadata_expire=1
+module_hotfixes=1
+priority=1
+skip_if_unavailable=True
+
+"""
+
diff --git a/fc40x84.cfg b/fc40x84.cfg
new file mode 100644
index 0000000..227a017
--- /dev/null
+++ b/fc40x84.cfg
@@ -0,0 +1,31 @@
+import datetime;
+
+include('fc40x.tpl')
+
+config_opts['root'] = 'fc40x84'
+config_opts['resultdir'] = "/var/lib/mock/fc40x84"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x84/"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="40" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-fc40x84]
+name=result-fc40x84
+baseurl=file:/var/lib/mock/fc40x84/
+enabled=1
+metadata_expire=1
+module_hotfixes=1
+priority=1
+skip_if_unavailable=True
+
+"""
+
diff --git a/fc41a84.cfg b/fc41a84.cfg
new file mode 100644
index 0000000..cf2d519
--- /dev/null
+++ b/fc41a84.cfg
@@ -0,0 +1,31 @@
+import datetime;
+
+include('fc41a.tpl')
+
+config_opts['root'] = 'fc41a84'
+config_opts['resultdir'] = "/var/lib/mock/fc41a84"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41a84/"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="41" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-fc41a84]
+name=result-fc41a84
+baseurl=file:/var/lib/mock/fc41a84/
+enabled=1
+metadata_expire=1
+module_hotfixes=1
+priority=1
+skip_if_unavailable=True
+
+"""
+
diff --git a/fc41x.tpl b/fc41x.tpl
index 6b73ce7..60bbbbb 100644
--- a/fc41x.tpl
+++ b/fc41x.tpl
@@ -109,6 +109,7 @@ enabled=1
 name=result-fc41x
 baseurl=file:/var/lib/mock/fc41x/
 metadata_expire=10
+priority=10
 enabled=1
 skip_if_unavailable=True
 
diff --git a/fc41x84.cfg b/fc41x84.cfg
new file mode 100644
index 0000000..a49cb22
--- /dev/null
+++ b/fc41x84.cfg
@@ -0,0 +1,31 @@
+import datetime;
+
+include('fc41x.tpl')
+
+config_opts['root'] = 'fc41x84'
+config_opts['resultdir'] = "/var/lib/mock/fc41x84"
+config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc41x84/"
+
+config_opts['module_enable']  = ['php:remi-8.4']
+config_opts['module_install'] = ['php:remi-8.4/devel']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-8.4"
+config_opts['macros']['%_module_version']="41" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+[result-fc41x84]
+name=result-fc41x84
+baseurl=file:/var/lib/mock/fc41x84/
+enabled=1
+metadata_expire=1
+module_hotfixes=1
+priority=1
+skip_if_unavailable=True
+
+"""
+
diff --git a/rocky+epel+remi-9.cfg b/rocky+epel+remi-9.cfg
new file mode 100644
index 0000000..20eceec
--- /dev/null
+++ b/rocky+epel+remi-9.cfg
@@ -0,0 +1,15 @@
+include('rocky-9-x86_64.cfg')
+include('templates/epel-9.tpl')
+
+config_opts['root'] = "rocky+epel-9-{{ target_arch }}"
+config_opts['description'] = 'Rocky Linux 9 + EPEL + Remi'
+
+config_opts['yum.conf'] += """
+[remi]
+name=remi EL-9 x86_64
+baseurl=https://rpms.remirepo.net/enterprise/9/remi/x86_64/
+enabled=1
+metadata_expire=10
+skip_if_unavailable=True
+"""
+