diff --git a/.etckeeper b/.etckeeper
index f33444a..07d769a 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -275,14 +275,10 @@ maybe chmod 0644 'clamd.conf.rpmnew'
 maybe chown 'amavis' 'clamd.conf.rpmsave'
 maybe chgrp 'amavis' 'clamd.conf.rpmsave'
 maybe chmod 0644 'clamd.conf.rpmsave'
-maybe chown 'amavis' 'clamd.d'
-maybe chgrp 'amavis' 'clamd.d'
 maybe chmod 0755 'clamd.d'
 maybe chown 'amavis' 'clamd.d/amavisd.conf'
 maybe chgrp 'amavis' 'clamd.d/amavisd.conf'
 maybe chmod 0644 'clamd.d/amavisd.conf'
-maybe chown 'amavis' 'clamd.d/scan.conf'
-maybe chgrp 'amavis' 'clamd.d/scan.conf'
 maybe chmod 0644 'clamd.d/scan.conf'
 maybe chown 'amavis' 'clamd.d/scan.conf.rpmnew'
 maybe chgrp 'amavis' 'clamd.d/scan.conf.rpmnew'
@@ -3044,6 +3040,14 @@ maybe chgrp 'mock' 'mock/amazonlinux-2-aarch64.cfg'
 maybe chmod 0644 'mock/amazonlinux-2-aarch64.cfg'
 maybe chgrp 'mock' 'mock/amazonlinux-2-x86_64.cfg'
 maybe chmod 0644 'mock/amazonlinux-2-x86_64.cfg'
+maybe chgrp 'mock' 'mock/anolis-7-aarch64.cfg'
+maybe chmod 0644 'mock/anolis-7-aarch64.cfg'
+maybe chgrp 'mock' 'mock/anolis-7-x86_64.cfg'
+maybe chmod 0644 'mock/anolis-7-x86_64.cfg'
+maybe chgrp 'mock' 'mock/anolis-8-aarch64.cfg'
+maybe chmod 0644 'mock/anolis-8-aarch64.cfg'
+maybe chgrp 'mock' 'mock/anolis-8-x86_64.cfg'
+maybe chmod 0644 'mock/anolis-8-x86_64.cfg'
 maybe chgrp 'mock' 'mock/centos+epel-7-ppc64le.cfg'
 maybe chmod 0644 'mock/centos+epel-7-ppc64le.cfg'
 maybe chgrp 'mock' 'mock/centos+epel-7-x86_64.cfg'
@@ -3100,6 +3104,18 @@ maybe chgrp 'mock' 'mock/centos-stream-9-x86_64.cfg'
 maybe chmod 0644 'mock/centos-stream-9-x86_64.cfg'
 maybe chgrp 'mock' 'mock/chroot-aliases.cfg'
 maybe chmod 0644 'mock/chroot-aliases.cfg'
+maybe chgrp 'mock' 'mock/circlelinux+epel-8-aarch64.cfg'
+maybe chmod 0644 'mock/circlelinux+epel-8-aarch64.cfg'
+maybe chgrp 'mock' 'mock/circlelinux+epel-8-ppc64le.cfg'
+maybe chmod 0644 'mock/circlelinux+epel-8-ppc64le.cfg'
+maybe chgrp 'mock' 'mock/circlelinux+epel-8-x86_64.cfg'
+maybe chmod 0644 'mock/circlelinux+epel-8-x86_64.cfg'
+maybe chgrp 'mock' 'mock/circlelinux-8-aarch64.cfg'
+maybe chmod 0644 'mock/circlelinux-8-aarch64.cfg'
+maybe chgrp 'mock' 'mock/circlelinux-8-ppc64le.cfg'
+maybe chmod 0644 'mock/circlelinux-8-ppc64le.cfg'
+maybe chgrp 'mock' 'mock/circlelinux-8-x86_64.cfg'
+maybe chmod 0644 'mock/circlelinux-8-x86_64.cfg'
 maybe chgrp 'mock' 'mock/custom-1-aarch64.cfg'
 maybe chmod 0644 'mock/custom-1-aarch64.cfg'
 maybe chgrp 'mock' 'mock/custom-1-armhfp.cfg'
@@ -3267,6 +3283,18 @@ maybe chgrp 'mock' 'mock/eol/fedora-33-s390x.cfg'
 maybe chmod 0644 'mock/eol/fedora-33-s390x.cfg'
 maybe chgrp 'mock' 'mock/eol/fedora-33-x86_64.cfg'
 maybe chmod 0644 'mock/eol/fedora-33-x86_64.cfg'
+maybe chgrp 'mock' 'mock/eol/fedora-34-aarch64.cfg'
+maybe chmod 0644 'mock/eol/fedora-34-aarch64.cfg'
+maybe chgrp 'mock' 'mock/eol/fedora-34-armhfp.cfg'
+maybe chmod 0644 'mock/eol/fedora-34-armhfp.cfg'
+maybe chgrp 'mock' 'mock/eol/fedora-34-i386.cfg'
+maybe chmod 0644 'mock/eol/fedora-34-i386.cfg'
+maybe chgrp 'mock' 'mock/eol/fedora-34-ppc64le.cfg'
+maybe chmod 0644 'mock/eol/fedora-34-ppc64le.cfg'
+maybe chgrp 'mock' 'mock/eol/fedora-34-s390x.cfg'
+maybe chmod 0644 'mock/eol/fedora-34-s390x.cfg'
+maybe chgrp 'mock' 'mock/eol/fedora-34-x86_64.cfg'
+maybe chmod 0644 'mock/eol/fedora-34-x86_64.cfg'
 maybe chgrp 'mock' 'mock/eol/mageia-6-armv5tl.cfg'
 maybe chmod 0644 'mock/eol/mageia-6-armv5tl.cfg'
 maybe chgrp 'mock' 'mock/eol/mageia-6-armv7hl.cfg'
@@ -3291,6 +3319,10 @@ maybe chgrp 'mock' 'mock/eol/opensuse-leap-15.1-aarch64.cfg'
 maybe chmod 0644 'mock/eol/opensuse-leap-15.1-aarch64.cfg'
 maybe chgrp 'mock' 'mock/eol/opensuse-leap-15.1-x86_64.cfg'
 maybe chmod 0644 'mock/eol/opensuse-leap-15.1-x86_64.cfg'
+maybe chgrp 'mock' 'mock/eol/opensuse-leap-15.2-aarch64.cfg'
+maybe chmod 0644 'mock/eol/opensuse-leap-15.2-aarch64.cfg'
+maybe chgrp 'mock' 'mock/eol/opensuse-leap-15.2-x86_64.cfg'
+maybe chmod 0644 'mock/eol/opensuse-leap-15.2-x86_64.cfg'
 maybe chgrp 'mock' 'mock/eol/rhel-6-x86_64.cfg'
 maybe chmod 0644 'mock/eol/rhel-6-x86_64.cfg'
 maybe chmod 0755 'mock/eol/templates'
@@ -3318,18 +3350,12 @@ maybe chgrp 'mock' 'mock/eurolinux-8-i686.cfg'
 maybe chmod 0644 'mock/eurolinux-8-i686.cfg'
 maybe chgrp 'mock' 'mock/eurolinux-8-x86_64.cfg'
 maybe chmod 0644 'mock/eurolinux-8-x86_64.cfg'
-maybe chgrp 'mock' 'mock/fedora-34-aarch64.cfg'
-maybe chmod 0644 'mock/fedora-34-aarch64.cfg'
-maybe chgrp 'mock' 'mock/fedora-34-armhfp.cfg'
-maybe chmod 0644 'mock/fedora-34-armhfp.cfg'
-maybe chgrp 'mock' 'mock/fedora-34-i386.cfg'
-maybe chmod 0644 'mock/fedora-34-i386.cfg'
-maybe chgrp 'mock' 'mock/fedora-34-ppc64le.cfg'
-maybe chmod 0644 'mock/fedora-34-ppc64le.cfg'
-maybe chgrp 'mock' 'mock/fedora-34-s390x.cfg'
-maybe chmod 0644 'mock/fedora-34-s390x.cfg'
-maybe chgrp 'mock' 'mock/fedora-34-x86_64.cfg'
-maybe chmod 0644 'mock/fedora-34-x86_64.cfg'
+maybe chgrp 'mock' 'mock/eurolinux-9-aarch64.cfg'
+maybe chmod 0644 'mock/eurolinux-9-aarch64.cfg'
+maybe chgrp 'mock' 'mock/eurolinux-9-i686.cfg'
+maybe chmod 0644 'mock/eurolinux-9-i686.cfg'
+maybe chgrp 'mock' 'mock/eurolinux-9-x86_64.cfg'
+maybe chmod 0644 'mock/eurolinux-9-x86_64.cfg'
 maybe chgrp 'mock' 'mock/fedora-35-aarch64.cfg'
 maybe chmod 0644 'mock/fedora-35-aarch64.cfg'
 maybe chgrp 'mock' 'mock/fedora-35-armhfp.cfg'
@@ -3354,6 +3380,16 @@ maybe chgrp 'mock' 'mock/fedora-36-s390x.cfg'
 maybe chmod 0644 'mock/fedora-36-s390x.cfg'
 maybe chgrp 'mock' 'mock/fedora-36-x86_64.cfg'
 maybe chmod 0644 'mock/fedora-36-x86_64.cfg'
+maybe chgrp 'mock' 'mock/fedora-37-aarch64.cfg'
+maybe chmod 0644 'mock/fedora-37-aarch64.cfg'
+maybe chgrp 'mock' 'mock/fedora-37-i386.cfg'
+maybe chmod 0644 'mock/fedora-37-i386.cfg'
+maybe chgrp 'mock' 'mock/fedora-37-ppc64le.cfg'
+maybe chmod 0644 'mock/fedora-37-ppc64le.cfg'
+maybe chgrp 'mock' 'mock/fedora-37-s390x.cfg'
+maybe chmod 0644 'mock/fedora-37-s390x.cfg'
+maybe chgrp 'mock' 'mock/fedora-37-x86_64.cfg'
+maybe chmod 0644 'mock/fedora-37-x86_64.cfg'
 maybe chgrp 'mock' 'mock/fedora-eln-aarch64.cfg'
 maybe chmod 0644 'mock/fedora-eln-aarch64.cfg'
 maybe chgrp 'mock' 'mock/fedora-eln-i386.cfg'
@@ -3425,10 +3461,6 @@ maybe chgrp 'mock' 'mock/openmandriva-rolling-i686.cfg'
 maybe chmod 0644 'mock/openmandriva-rolling-i686.cfg'
 maybe chgrp 'mock' 'mock/openmandriva-rolling-x86_64.cfg'
 maybe chmod 0644 'mock/openmandriva-rolling-x86_64.cfg'
-maybe chgrp 'mock' 'mock/opensuse-leap-15.2-aarch64.cfg'
-maybe chmod 0644 'mock/opensuse-leap-15.2-aarch64.cfg'
-maybe chgrp 'mock' 'mock/opensuse-leap-15.2-x86_64.cfg'
-maybe chmod 0644 'mock/opensuse-leap-15.2-x86_64.cfg'
 maybe chgrp 'mock' 'mock/opensuse-leap-15.3-aarch64.cfg'
 maybe chmod 0644 'mock/opensuse-leap-15.3-aarch64.cfg'
 maybe chgrp 'mock' 'mock/opensuse-leap-15.3-ppc64le.cfg'
@@ -3437,6 +3469,14 @@ maybe chgrp 'mock' 'mock/opensuse-leap-15.3-s390x.cfg'
 maybe chmod 0644 'mock/opensuse-leap-15.3-s390x.cfg'
 maybe chgrp 'mock' 'mock/opensuse-leap-15.3-x86_64.cfg'
 maybe chmod 0644 'mock/opensuse-leap-15.3-x86_64.cfg'
+maybe chgrp 'mock' 'mock/opensuse-leap-15.4-aarch64.cfg'
+maybe chmod 0644 'mock/opensuse-leap-15.4-aarch64.cfg'
+maybe chgrp 'mock' 'mock/opensuse-leap-15.4-ppc64le.cfg'
+maybe chmod 0644 'mock/opensuse-leap-15.4-ppc64le.cfg'
+maybe chgrp 'mock' 'mock/opensuse-leap-15.4-s390x.cfg'
+maybe chmod 0644 'mock/opensuse-leap-15.4-s390x.cfg'
+maybe chgrp 'mock' 'mock/opensuse-leap-15.4-x86_64.cfg'
+maybe chmod 0644 'mock/opensuse-leap-15.4-x86_64.cfg'
 maybe chgrp 'mock' 'mock/opensuse-tumbleweed-aarch64.cfg'
 maybe chmod 0644 'mock/opensuse-tumbleweed-aarch64.cfg'
 maybe chgrp 'mock' 'mock/opensuse-tumbleweed-i586.cfg'
@@ -3511,10 +3551,26 @@ maybe chgrp 'mock' 'mock/rocky+epel-8-aarch64.cfg'
 maybe chmod 0644 'mock/rocky+epel-8-aarch64.cfg'
 maybe chgrp 'mock' 'mock/rocky+epel-8-x86_64.cfg'
 maybe chmod 0644 'mock/rocky+epel-8-x86_64.cfg'
+maybe chgrp 'mock' 'mock/rocky+epel-9-aarch64.cfg'
+maybe chmod 0644 'mock/rocky+epel-9-aarch64.cfg'
+maybe chgrp 'mock' 'mock/rocky+epel-9-ppc64le.cfg'
+maybe chmod 0644 'mock/rocky+epel-9-ppc64le.cfg'
+maybe chgrp 'mock' 'mock/rocky+epel-9-s390x.cfg'
+maybe chmod 0644 'mock/rocky+epel-9-s390x.cfg'
+maybe chgrp 'mock' 'mock/rocky+epel-9-x86_64.cfg'
+maybe chmod 0644 'mock/rocky+epel-9-x86_64.cfg'
 maybe chgrp 'mock' 'mock/rocky-8-aarch64.cfg'
 maybe chmod 0644 'mock/rocky-8-aarch64.cfg'
 maybe chgrp 'mock' 'mock/rocky-8-x86_64.cfg'
 maybe chmod 0644 'mock/rocky-8-x86_64.cfg'
+maybe chgrp 'mock' 'mock/rocky-9-aarch64.cfg'
+maybe chmod 0644 'mock/rocky-9-aarch64.cfg'
+maybe chgrp 'mock' 'mock/rocky-9-ppc64le.cfg'
+maybe chmod 0644 'mock/rocky-9-ppc64le.cfg'
+maybe chgrp 'mock' 'mock/rocky-9-s390x.cfg'
+maybe chmod 0644 'mock/rocky-9-s390x.cfg'
+maybe chgrp 'mock' 'mock/rocky-9-x86_64.cfg'
+maybe chmod 0644 'mock/rocky-9-x86_64.cfg'
 maybe chgrp 'mock' 'mock/site-defaults.cfg'
 maybe chmod 0644 'mock/site-defaults.cfg'
 maybe chmod 0755 'mock/templates'
@@ -3524,12 +3580,18 @@ maybe chgrp 'mock' 'mock/templates/almalinux-9.tpl'
 maybe chmod 0644 'mock/templates/almalinux-9.tpl'
 maybe chgrp 'mock' 'mock/templates/amazonlinux-2.tpl'
 maybe chmod 0644 'mock/templates/amazonlinux-2.tpl'
+maybe chgrp 'mock' 'mock/templates/anolis-7.tpl'
+maybe chmod 0644 'mock/templates/anolis-7.tpl'
+maybe chgrp 'mock' 'mock/templates/anolis-8.tpl'
+maybe chmod 0644 'mock/templates/anolis-8.tpl'
 maybe chgrp 'mock' 'mock/templates/centos-7.tpl'
 maybe chmod 0644 'mock/templates/centos-7.tpl'
 maybe chgrp 'mock' 'mock/templates/centos-stream-8.tpl'
 maybe chmod 0644 'mock/templates/centos-stream-8.tpl'
 maybe chgrp 'mock' 'mock/templates/centos-stream-9.tpl'
 maybe chmod 0644 'mock/templates/centos-stream-9.tpl'
+maybe chgrp 'mock' 'mock/templates/circlelinux-8.tpl'
+maybe chmod 0644 'mock/templates/circlelinux-8.tpl'
 maybe chgrp 'mock' 'mock/templates/custom-1.tpl'
 maybe chmod 0644 'mock/templates/custom-1.tpl'
 maybe chgrp 'mock' 'mock/templates/epel-7.tpl'
@@ -3544,6 +3606,8 @@ maybe chgrp 'mock' 'mock/templates/epel-next-9.tpl'
 maybe chmod 0644 'mock/templates/epel-next-9.tpl'
 maybe chgrp 'mock' 'mock/templates/eurolinux-8.tpl'
 maybe chmod 0644 'mock/templates/eurolinux-8.tpl'
+maybe chgrp 'mock' 'mock/templates/eurolinux-9.tpl'
+maybe chmod 0644 'mock/templates/eurolinux-9.tpl'
 maybe chgrp 'mock' 'mock/templates/fedora-branched.tpl'
 maybe chmod 0644 'mock/templates/fedora-branched.tpl'
 maybe chgrp 'mock' 'mock/templates/fedora-eln.tpl'
@@ -3566,6 +3630,8 @@ maybe chgrp 'mock' 'mock/templates/openmandriva-rolling.tpl'
 maybe chmod 0644 'mock/templates/openmandriva-rolling.tpl'
 maybe chgrp 'mock' 'mock/templates/opensuse-leap-15.3.tpl'
 maybe chmod 0644 'mock/templates/opensuse-leap-15.3.tpl'
+maybe chgrp 'mock' 'mock/templates/opensuse-leap-15.4.tpl'
+maybe chmod 0644 'mock/templates/opensuse-leap-15.4.tpl'
 maybe chgrp 'mock' 'mock/templates/opensuse-tumbleweed.tpl'
 maybe chmod 0644 'mock/templates/opensuse-tumbleweed.tpl'
 maybe chgrp 'mock' 'mock/templates/oraclelinux-7.tpl'
@@ -3584,6 +3650,8 @@ maybe chgrp 'mock' 'mock/templates/rhel-9.tpl'
 maybe chmod 0644 'mock/templates/rhel-9.tpl'
 maybe chgrp 'mock' 'mock/templates/rocky-8.tpl'
 maybe chmod 0644 'mock/templates/rocky-8.tpl'
+maybe chgrp 'mock' 'mock/templates/rocky-9.tpl'
+maybe chmod 0644 'mock/templates/rocky-9.tpl'
 maybe chmod 0755 'modprobe.d'
 maybe chmod 0644 'modprobe.d/blacklist-firewire.conf'
 maybe chmod 0640 'modprobe.d/cramfs.conf'
diff --git a/mock/anolis-7-aarch64.cfg b/mock/anolis-7-aarch64.cfg
new file mode 100644
index 0000000..03e79e3
--- /dev/null
+++ b/mock/anolis-7-aarch64.cfg
@@ -0,0 +1,5 @@
+include('templates/anolis-7.tpl')
+
+config_opts['root'] = 'anolis-7-aarch64'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
diff --git a/mock/anolis-7-x86_64.cfg b/mock/anolis-7-x86_64.cfg
new file mode 100644
index 0000000..4a272d6
--- /dev/null
+++ b/mock/anolis-7-x86_64.cfg
@@ -0,0 +1,5 @@
+include('templates/anolis-7.tpl')
+
+config_opts['root'] = 'anolis-7-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
diff --git a/mock/anolis-8-aarch64.cfg b/mock/anolis-8-aarch64.cfg
new file mode 100644
index 0000000..3413718
--- /dev/null
+++ b/mock/anolis-8-aarch64.cfg
@@ -0,0 +1,5 @@
+include('templates/anolis-8.tpl')
+
+config_opts['root'] = 'anolis-8-aarch64'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
diff --git a/mock/anolis-8-x86_64.cfg b/mock/anolis-8-x86_64.cfg
new file mode 100644
index 0000000..ef96a64
--- /dev/null
+++ b/mock/anolis-8-x86_64.cfg
@@ -0,0 +1,5 @@
+include('templates/anolis-8.tpl')
+
+config_opts['root'] = 'anolis-8-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
diff --git a/mock/chroot-aliases.cfg b/mock/chroot-aliases.cfg
index 1c0f785..2db8256 100644
--- a/mock/chroot-aliases.cfg
+++ b/mock/chroot-aliases.cfg
@@ -19,6 +19,13 @@ config_opts["no-config"]["epel-8"]["alternatives"] = {
             "Project page: https://www.centos.org/centos-stream/"
         ],
     },
+    "circlelinux+epel-8": {
+        "description": [
+            "Builds against Circle Linux 8 repositories, "
+            "together with the official EPEL repositories.",
+            "Project page: https://cclinux.org/"
+        ],
+    },
     "rhel+epel-8": {
         "description": [
             "Builds against Red Hat Enterprise Linux 8 repositories, "
@@ -63,4 +70,11 @@ config_opts["no-config"]["epel-9"]["alternatives"] = {
             "https://rpm-software-management.github.io/mock/Feature-rhelchroots"
         ],
     },
+    "rocky+epel-9": {
+        "description": [
+            "Builds against Rocky Linux 9 repositories, "
+            "together with the official EPEL repositories.",
+            "Project page: https://rockylinux.org/"
+        ],
+    },
 }
diff --git a/mock/circlelinux+epel-8-aarch64.cfg b/mock/circlelinux+epel-8-aarch64.cfg
new file mode 100644
index 0000000..82bea46
--- /dev/null
+++ b/mock/circlelinux+epel-8-aarch64.cfg
@@ -0,0 +1,7 @@
+include('templates/circlelinux-8.tpl')
+include('templates/epel-8.tpl')
+
+config_opts['root'] = 'circlelinux+epel-8-aarch64'
+config_opts['description'] = 'CircleLinux 8 + EPEL'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
diff --git a/mock/circlelinux+epel-8-ppc64le.cfg b/mock/circlelinux+epel-8-ppc64le.cfg
new file mode 100644
index 0000000..f3c730f
--- /dev/null
+++ b/mock/circlelinux+epel-8-ppc64le.cfg
@@ -0,0 +1,7 @@
+include('templates/circlelinux-8.tpl')
+include('templates/epel-8.tpl')
+
+config_opts['root'] = 'circlelinux+epel-8-ppc64le'
+config_opts['description'] = 'CircleLinux 8 + EPEL'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
diff --git a/mock/circlelinux+epel-8-x86_64.cfg b/mock/circlelinux+epel-8-x86_64.cfg
new file mode 100644
index 0000000..9bfe876
--- /dev/null
+++ b/mock/circlelinux+epel-8-x86_64.cfg
@@ -0,0 +1,7 @@
+include('templates/circlelinux-8.tpl')
+include('templates/epel-8.tpl')
+
+config_opts['root'] = 'circlelinux+epel-8-x86_64'
+config_opts['description'] = 'CircleLinux 8 + EPEL'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
diff --git a/mock/circlelinux-8-aarch64.cfg b/mock/circlelinux-8-aarch64.cfg
new file mode 100644
index 0000000..62f5317
--- /dev/null
+++ b/mock/circlelinux-8-aarch64.cfg
@@ -0,0 +1,6 @@
+include('templates/circlelinux-8.tpl')
+
+config_opts['root'] = 'circlelinux-8-aarch64'
+config_opts['description'] = 'CircleLinux 8'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
diff --git a/mock/circlelinux-8-ppc64le.cfg b/mock/circlelinux-8-ppc64le.cfg
new file mode 100644
index 0000000..9f07f5e
--- /dev/null
+++ b/mock/circlelinux-8-ppc64le.cfg
@@ -0,0 +1,6 @@
+include('templates/circlelinux-8.tpl')
+
+config_opts['root'] = 'circlelinux-8-ppc64le'
+config_opts['description'] = 'CircleLinux 8'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
diff --git a/mock/circlelinux-8-x86_64.cfg b/mock/circlelinux-8-x86_64.cfg
new file mode 100644
index 0000000..e8ca17e
--- /dev/null
+++ b/mock/circlelinux-8-x86_64.cfg
@@ -0,0 +1,6 @@
+include('templates/circlelinux-8.tpl')
+
+config_opts['root'] = 'circlelinux-8-x86_64'
+config_opts['description'] = 'CircleLinux 8'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
diff --git a/mock/default.cfg.rpmnew b/mock/default.cfg.rpmnew
index a1af32d..7fc73bc 120000
--- a/mock/default.cfg.rpmnew
+++ b/mock/default.cfg.rpmnew
@@ -1 +1 @@
-centos-stream+epel-8-x86_64.cfg
\ No newline at end of file
+alma+epel-8-x86_64.cfg
\ No newline at end of file
diff --git a/mock/fedora-34-aarch64.cfg b/mock/eol/fedora-34-aarch64.cfg
similarity index 100%
rename from mock/fedora-34-aarch64.cfg
rename to mock/eol/fedora-34-aarch64.cfg
diff --git a/mock/fedora-34-armhfp.cfg b/mock/eol/fedora-34-armhfp.cfg
similarity index 100%
rename from mock/fedora-34-armhfp.cfg
rename to mock/eol/fedora-34-armhfp.cfg
diff --git a/mock/fedora-34-i386.cfg b/mock/eol/fedora-34-i386.cfg
similarity index 100%
rename from mock/fedora-34-i386.cfg
rename to mock/eol/fedora-34-i386.cfg
diff --git a/mock/fedora-34-ppc64le.cfg b/mock/eol/fedora-34-ppc64le.cfg
similarity index 100%
rename from mock/fedora-34-ppc64le.cfg
rename to mock/eol/fedora-34-ppc64le.cfg
diff --git a/mock/fedora-34-s390x.cfg b/mock/eol/fedora-34-s390x.cfg
similarity index 100%
rename from mock/fedora-34-s390x.cfg
rename to mock/eol/fedora-34-s390x.cfg
diff --git a/mock/fedora-34-x86_64.cfg b/mock/eol/fedora-34-x86_64.cfg
similarity index 100%
rename from mock/fedora-34-x86_64.cfg
rename to mock/eol/fedora-34-x86_64.cfg
diff --git a/mock/opensuse-leap-15.2-aarch64.cfg b/mock/eol/opensuse-leap-15.2-aarch64.cfg
similarity index 100%
rename from mock/opensuse-leap-15.2-aarch64.cfg
rename to mock/eol/opensuse-leap-15.2-aarch64.cfg
diff --git a/mock/opensuse-leap-15.2-x86_64.cfg b/mock/eol/opensuse-leap-15.2-x86_64.cfg
similarity index 100%
rename from mock/opensuse-leap-15.2-x86_64.cfg
rename to mock/eol/opensuse-leap-15.2-x86_64.cfg
diff --git a/mock/eurolinux-9-aarch64.cfg b/mock/eurolinux-9-aarch64.cfg
new file mode 100644
index 0000000..6fa34fe
--- /dev/null
+++ b/mock/eurolinux-9-aarch64.cfg
@@ -0,0 +1,7 @@
+include('templates/eurolinux-9.tpl')
+
+# To enable modules use:
+#config_opts['module_enable'] = ['swig', 'httpd', 'ruby']
+config_opts['root'] = 'eurolinux-9-aarch64'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
diff --git a/mock/eurolinux-9-i686.cfg b/mock/eurolinux-9-i686.cfg
new file mode 100644
index 0000000..90d2f55
--- /dev/null
+++ b/mock/eurolinux-9-i686.cfg
@@ -0,0 +1,5 @@
+include('templates/eurolinux-9.tpl')
+
+config_opts['root'] = 'eurolinux-9-i686'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
diff --git a/mock/eurolinux-9-x86_64.cfg b/mock/eurolinux-9-x86_64.cfg
new file mode 100644
index 0000000..d0c9d53
--- /dev/null
+++ b/mock/eurolinux-9-x86_64.cfg
@@ -0,0 +1,7 @@
+include('templates/eurolinux-9.tpl')
+
+# To enable modules use:
+#config_opts['module_enable'] = ['swig', 'httpd', 'ruby']
+config_opts['root'] = 'eurolinux-9-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
diff --git a/mock/fedora-37-aarch64.cfg b/mock/fedora-37-aarch64.cfg
deleted file mode 120000
index e435ce1..0000000
--- a/mock/fedora-37-aarch64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-aarch64.cfg
\ No newline at end of file
diff --git a/mock/fedora-37-aarch64.cfg b/mock/fedora-37-aarch64.cfg
new file mode 100644
index 0000000..aa5dd2e
--- /dev/null
+++ b/mock/fedora-37-aarch64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '37'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-37-i386.cfg b/mock/fedora-37-i386.cfg
deleted file mode 120000
index 1f22dd2..0000000
--- a/mock/fedora-37-i386.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-i386.cfg
\ No newline at end of file
diff --git a/mock/fedora-37-i386.cfg b/mock/fedora-37-i386.cfg
new file mode 100644
index 0000000..cddd91a
--- /dev/null
+++ b/mock/fedora-37-i386.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '37'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-37-ppc64le.cfg b/mock/fedora-37-ppc64le.cfg
deleted file mode 120000
index 9767495..0000000
--- a/mock/fedora-37-ppc64le.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-ppc64le.cfg
\ No newline at end of file
diff --git a/mock/fedora-37-ppc64le.cfg b/mock/fedora-37-ppc64le.cfg
new file mode 100644
index 0000000..b1b3b65
--- /dev/null
+++ b/mock/fedora-37-ppc64le.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '37'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-37-s390x.cfg b/mock/fedora-37-s390x.cfg
deleted file mode 120000
index 3722078..0000000
--- a/mock/fedora-37-s390x.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-s390x.cfg
\ No newline at end of file
diff --git a/mock/fedora-37-s390x.cfg b/mock/fedora-37-s390x.cfg
new file mode 100644
index 0000000..1775544
--- /dev/null
+++ b/mock/fedora-37-s390x.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '37'
+config_opts['target_arch'] = 's390x'
+config_opts['legal_host_arches'] = ('s390x',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-37-x86_64.cfg b/mock/fedora-37-x86_64.cfg
deleted file mode 120000
index cddd6e1..0000000
--- a/mock/fedora-37-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-x86_64.cfg
\ No newline at end of file
diff --git a/mock/fedora-37-x86_64.cfg b/mock/fedora-37-x86_64.cfg
new file mode 100644
index 0000000..d801dcb
--- /dev/null
+++ b/mock/fedora-37-x86_64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '37'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock/fedora-38-aarch64.cfg b/mock/fedora-38-aarch64.cfg
new file mode 120000
index 0000000..e435ce1
--- /dev/null
+++ b/mock/fedora-38-aarch64.cfg
@@ -0,0 +1 @@
+fedora-rawhide-aarch64.cfg
\ No newline at end of file
diff --git a/mock/fedora-38-i386.cfg b/mock/fedora-38-i386.cfg
new file mode 120000
index 0000000..1f22dd2
--- /dev/null
+++ b/mock/fedora-38-i386.cfg
@@ -0,0 +1 @@
+fedora-rawhide-i386.cfg
\ No newline at end of file
diff --git a/mock/fedora-38-ppc64le.cfg b/mock/fedora-38-ppc64le.cfg
new file mode 120000
index 0000000..9767495
--- /dev/null
+++ b/mock/fedora-38-ppc64le.cfg
@@ -0,0 +1 @@
+fedora-rawhide-ppc64le.cfg
\ No newline at end of file
diff --git a/mock/fedora-38-s390x.cfg b/mock/fedora-38-s390x.cfg
new file mode 120000
index 0000000..3722078
--- /dev/null
+++ b/mock/fedora-38-s390x.cfg
@@ -0,0 +1 @@
+fedora-rawhide-s390x.cfg
\ No newline at end of file
diff --git a/mock/fedora-38-x86_64.cfg b/mock/fedora-38-x86_64.cfg
new file mode 120000
index 0000000..cddd6e1
--- /dev/null
+++ b/mock/fedora-38-x86_64.cfg
@@ -0,0 +1 @@
+fedora-rawhide-x86_64.cfg
\ No newline at end of file
diff --git a/mock/opensuse-leap-15.4-aarch64.cfg b/mock/opensuse-leap-15.4-aarch64.cfg
new file mode 100644
index 0000000..447ce8e
--- /dev/null
+++ b/mock/opensuse-leap-15.4-aarch64.cfg
@@ -0,0 +1,5 @@
+include('templates/opensuse-leap-15.4.tpl')
+
+config_opts['root'] = 'opensuse-leap-15.4-aarch64'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
diff --git a/mock/opensuse-leap-15.4-ppc64le.cfg b/mock/opensuse-leap-15.4-ppc64le.cfg
new file mode 100644
index 0000000..41f7f0c
--- /dev/null
+++ b/mock/opensuse-leap-15.4-ppc64le.cfg
@@ -0,0 +1,5 @@
+include('templates/opensuse-leap-15.4.tpl')
+
+config_opts['root'] = 'opensuse-leap-15.4-ppc64le'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
diff --git a/mock/opensuse-leap-15.4-s390x.cfg b/mock/opensuse-leap-15.4-s390x.cfg
new file mode 100644
index 0000000..b8bc3e7
--- /dev/null
+++ b/mock/opensuse-leap-15.4-s390x.cfg
@@ -0,0 +1,5 @@
+include('templates/opensuse-leap-15.4.tpl')
+
+config_opts['root'] = 'opensuse-leap-15.4-s390x'
+config_opts['target_arch'] = 's390x'
+config_opts['legal_host_arches'] = ('s390x',)
diff --git a/mock/opensuse-leap-15.4-x86_64.cfg b/mock/opensuse-leap-15.4-x86_64.cfg
new file mode 100644
index 0000000..2655077
--- /dev/null
+++ b/mock/opensuse-leap-15.4-x86_64.cfg
@@ -0,0 +1,5 @@
+include('templates/opensuse-leap-15.4.tpl')
+
+config_opts['root'] = 'opensuse-leap-15.4-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
diff --git a/mock/rocky+epel-9-aarch64.cfg b/mock/rocky+epel-9-aarch64.cfg
new file mode 100644
index 0000000..c5230a2
--- /dev/null
+++ b/mock/rocky+epel-9-aarch64.cfg
@@ -0,0 +1,5 @@
+include('rocky-9-aarch64.cfg')
+include('templates/epel-9.tpl')
+
+config_opts['root'] = "rocky+epel-9-{{ target_arch }}"
+config_opts['description'] = 'Rocky Linux 9 + EPEL'
diff --git a/mock/rocky+epel-9-ppc64le.cfg b/mock/rocky+epel-9-ppc64le.cfg
new file mode 100644
index 0000000..18311ea
--- /dev/null
+++ b/mock/rocky+epel-9-ppc64le.cfg
@@ -0,0 +1,5 @@
+include('rocky-9-ppc64le.cfg')
+include('templates/epel-9.tpl')
+
+config_opts['root'] = "rocky+epel-9-{{ target_arch }}"
+config_opts['description'] = 'Rocky Linux 9 + EPEL'
diff --git a/mock/rocky+epel-9-s390x.cfg b/mock/rocky+epel-9-s390x.cfg
new file mode 100644
index 0000000..2735f8a
--- /dev/null
+++ b/mock/rocky+epel-9-s390x.cfg
@@ -0,0 +1,5 @@
+include('rocky-9-s390x.cfg')
+include('templates/epel-9.tpl')
+
+config_opts['root'] = "rocky+epel-9-{{ target_arch }}"
+config_opts['description'] = 'Rocky Linux 9 + EPEL'
diff --git a/mock/rocky+epel-9-x86_64.cfg b/mock/rocky+epel-9-x86_64.cfg
new file mode 100644
index 0000000..38e4c31
--- /dev/null
+++ b/mock/rocky+epel-9-x86_64.cfg
@@ -0,0 +1,5 @@
+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'
diff --git a/mock/rocky-9-aarch64.cfg b/mock/rocky-9-aarch64.cfg
new file mode 100644
index 0000000..6e83c8f
--- /dev/null
+++ b/mock/rocky-9-aarch64.cfg
@@ -0,0 +1,6 @@
+include('templates/rocky-9.tpl')
+
+config_opts['root'] = 'rocky-9-aarch64'
+config_opts['description'] = 'Rocky Linux 9'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
diff --git a/mock/rocky-9-ppc64le.cfg b/mock/rocky-9-ppc64le.cfg
new file mode 100644
index 0000000..85da56b
--- /dev/null
+++ b/mock/rocky-9-ppc64le.cfg
@@ -0,0 +1,6 @@
+include('templates/rocky-9.tpl')
+
+config_opts['root'] = 'rocky-9-ppc64le'
+config_opts['description'] = 'Rocky Linux 9'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
diff --git a/mock/rocky-9-s390x.cfg b/mock/rocky-9-s390x.cfg
new file mode 100644
index 0000000..1f048cf
--- /dev/null
+++ b/mock/rocky-9-s390x.cfg
@@ -0,0 +1,6 @@
+include('templates/rocky-9.tpl')
+
+config_opts['root'] = 'rocky-9-s390x'
+config_opts['description'] = 'Rocky Linux 9'
+config_opts['target_arch'] = 's390x'
+config_opts['legal_host_arches'] = ('s390x',)
diff --git a/mock/rocky-9-x86_64.cfg b/mock/rocky-9-x86_64.cfg
new file mode 100644
index 0000000..cd76e78
--- /dev/null
+++ b/mock/rocky-9-x86_64.cfg
@@ -0,0 +1,6 @@
+include('templates/rocky-9.tpl')
+
+config_opts['root'] = 'rocky-9-x86_64'
+config_opts['description'] = 'Rocky Linux 9'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
diff --git a/mock/templates/anolis-7.tpl b/mock/templates/anolis-7.tpl
new file mode 100644
index 0000000..1b9e7e6
--- /dev/null
+++ b/mock/templates/anolis-7.tpl
@@ -0,0 +1,48 @@
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config anolis-release rpm-build sed shadow-utils tar unzip util-linux which xz'
+
+config_opts['dist'] = 'an7'  # only useful for --resultdir variable subst
+config_opts['releasever'] = '7'
+config_opts['package_manager'] = 'yum'
+config_opts['description'] = 'Anolis 7'
+
+config_opts['yum.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+metadata_expire=0
+mdpolicy=group:primary
+best=1
+protected_packages=
+user_agent={{ user_agent }}
+
+# repos
+
+[os]
+name=AnolisOS-7 - os
+baseurl=http://mirrors.openanolis.cn/anolis/7/os/$basearch/os
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/anolis/RPM-GPG-KEY-ANOLIS
+gpgcheck=1
+
+[updates]
+name=AnolisOS-7 - updates
+baseurl=http://mirrors.openanolis.cn/anolis/7/updates/$basearch/os
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/anolis/RPM-GPG-KEY-ANOLIS
+gpgcheck=1
+
+[extras]
+name=AnolisOS-7 - extras
+baseurl=http://mirrors.openanolis.cn/anolis/7/extras/$basearch/os
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/anolis/RPM-GPG-KEY-ANOLIS
+gpgcheck=1
+"""
diff --git a/mock/templates/anolis-8.tpl b/mock/templates/anolis-8.tpl
new file mode 100644
index 0000000..f1a6e04
--- /dev/null
+++ b/mock/templates/anolis-8.tpl
@@ -0,0 +1,47 @@
+config_opts['chroot_setup_cmd'] = 'install tar gcc-c++ redhat-rpm-config anolis-release which xz sed make bzip2 gzip gcc coreutils unzip shadow-utils diffutils cpio bash gawk rpm-build info patch util-linux findutils grep'
+config_opts['dist'] = 'an8'  # only useful for --resultdir variable subst
+config_opts['releasever'] = '8'
+config_opts['package_manager'] = 'dnf'
+config_opts['description'] = 'Anolis 8'
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+
+config_opts['dnf.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+mdpolicy=group:primary
+best=1
+install_weak_deps=0
+protected_packages=
+module_platform_id=platform:an8
+user_agent={{ user_agent }}
+
+[BaseOS]
+name=AnolisOS-$releasever - BaseOS
+baseurl=http://mirrors.openanolis.cn/anolis/$releasever/BaseOS/$basearch/os
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/anolis/RPM-GPG-KEY-ANOLIS
+gpgcheck=1
+
+[AppStream]
+name=AnolisOS-$releasever - AppStream
+baseurl=http://mirrors.openanolis.cn/anolis/$releasever/AppStream/$basearch/os
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/anolis/RPM-GPG-KEY-ANOLIS
+gpgcheck=1
+
+[PowerTools]
+name=AnolisOS-$releasever - PowerTools
+baseurl=http://mirrors.openanolis.cn/anolis/$releasever/PowerTools/$basearch/os
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/anolis/RPM-GPG-KEY-ANOLIS
+gpgcheck=1
+"""
diff --git a/mock/templates/circlelinux-8.tpl b/mock/templates/circlelinux-8.tpl
new file mode 100644
index 0000000..a375b82
--- /dev/null
+++ b/mock/templates/circlelinux-8.tpl
@@ -0,0 +1,150 @@
+config_opts['chroot_setup_cmd'] = 'install tar gcc-c++ redhat-rpm-config redhat-release which xz sed make bzip2 gzip gcc coreutils unzip shadow-utils diffutils cpio bash gawk rpm-build info patch util-linux findutils grep'
+config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
+config_opts['releasever'] = '8'
+config_opts['package_manager'] = 'dnf'
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['bootstrap_image'] = 'docker.io/circlelinuxos/circlelinux:8'
+
+
+config_opts['dnf.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+metadata_expire=0
+mdpolicy=group:primary
+best=1
+install_weak_deps=0
+protected_packages=
+module_platform_id=platform:el8
+user_agent={{ user_agent }}
+
+
+[baseos]
+name=Circle Linux $releasever - BaseOS
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=BaseOS
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[appstream]
+name=Circle Linux $releasever - AppStream
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=AppStream
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/AppStream/$basearch/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[powertools]
+name=Circle Linux $releasever - PowerTools
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=PowerTools
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[extras]
+name=Circle Linux $releasever - Extras
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=extras
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/extras/$basearch/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[devel]
+name=Circle Linux $releasever - Devel WARNING! FOR BUILDROOT USE ONLY!
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=Devel-$releasever
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/Devel/$basearch/os/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[baseos-debug]
+name=Circle Linux $releasever - BaseOS  Debug
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=BaseOS-debug
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[appstream-debug]
+name=Circle Linux $releasever - AppStream  Debug
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=AppStream-debug
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[powertools-debug]
+name=Circle Linux $releasever - PowerTools  Debug
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=PowerTools-debug
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/PowerTools/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[extras-debug]
+name=Circle Linux $releasever - Extras  Debug
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=extras-debug
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/extras/$basearch/debug/tree
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[devel-debug]
+name=Circle Linux $releasever - Devel  Debug
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=$basearch&repo=Devel-$releasever
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/Devel/$basearch/debug/tree
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[baseos-source]
+name=Circle Linux $releasever - BaseOS  Source
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=source&repo=BaseOS
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/BaseOS/source/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[appstream-source]
+name=Circle Linux $releasever - AppStream  Source
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=source&repo=AppStream
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/AppStream/source/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[extras-source]
+name=Circle Linux $releasever - Extras  Source
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=source&repo=extras
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/extras/source/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[powertools-source]
+name=Circle Linux $releasever - PowerTools  Source
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=source&repo=PowerTools
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/PowerTools/source/tree/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+[devel-source]
+name=Circle Linux $releasever - Devel  Source
+mirrorlist=https://mirrorlist.cclinux.org/mirrorlist?arch=source&repo=Devel-$releasever
+#baseurl=https://mirror.cclinux.org/$contentdir/$releasever/Devel/source/os/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/circle/RPM-GPG-KEY-circleofficial
+
+"""
diff --git a/mock/templates/epel-8.tpl b/mock/templates/epel-8.tpl
index 210ee48..a312de3 100644
--- a/mock/templates/epel-8.tpl
+++ b/mock/templates/epel-8.tpl
@@ -4,45 +4,73 @@ config_opts['dnf.conf'] += """
 
 [epel]
 name=Extra Packages for Enterprise Linux $releasever - $basearch
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-8
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
 gpgcheck=1
-skip_if_unavailable=False
-
-[epel-testing]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch
-enabled=0
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel8&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
 skip_if_unavailable=False
 
 [epel-debuginfo]
 name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-8&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch
 enabled=0
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
 skip_if_unavailable=False
 
 [epel-source]
 name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-8&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch
 enabled=0
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
+skip_if_unavailable=False
+
+[epel-testing]
+name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
+skip_if_unavailable=False
+
+[epel-testing-debuginfo]
+name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
+skip_if_unavailable=False
+
+[epel-testing-source]
+name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
 skip_if_unavailable=False
 
 [epel-modular]
 name=Extra Packages for Enterprise Linux Modular $releasever - $basearch
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-modular-8&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch
 enabled=0
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
 skip_if_unavailable=False
 
 [epel-modular-debuginfo]
 name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-modular-debug-8&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch
 enabled=0
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
 skip_if_unavailable=False
 
 [epel-modular-source]
 name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-modular-source-8&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch
 enabled=0
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
 skip_if_unavailable=False
 
 {% if koji_primary_repo != None and koji_primary_repo != "epel" %}
diff --git a/mock/templates/epel-9.tpl b/mock/templates/epel-9.tpl
index 3cfcc1f..f595f4f 100644
--- a/mock/templates/epel-9.tpl
+++ b/mock/templates/epel-9.tpl
@@ -5,7 +5,6 @@ config_opts['dnf.conf'] += """
 [epel]
 name=Extra Packages for Enterprise Linux $releasever - $basearch
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
-enabled=1
 gpgcheck=1
 gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
 skip_if_unavailable=False
diff --git a/mock/templates/eurolinux-9.tpl b/mock/templates/eurolinux-9.tpl
new file mode 100644
index 0000000..23791fd
--- /dev/null
+++ b/mock/templates/eurolinux-9.tpl
@@ -0,0 +1,66 @@
+# EuroLinux open buildroots
+
+config_opts['chroot_setup_cmd'] = 'install tar gcc-c++ redhat-rpm-config redhat-release which xz sed make bzip2 gzip gcc coreutils unzip shadow-utils diffutils cpio bash gawk rpm-build info patch util-linux findutils grep'
+config_opts['dist'] = 'el9'  # only useful for --resultdir variable subst
+config_opts['releasever'] = '9'
+config_opts['package_manager'] = 'dnf'
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['description'] = 'EuroLinux 9'
+
+config_opts['dnf.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+metadata_expire=0
+mdpolicy=group:primary
+best=0
+protected_packages=
+module_platform_id=platform:el9
+
+
+[baseos-all]
+name=EuroLinux 9 BaseOS All
+baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/9/$basearch/BaseOS/all/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux9
+
+[appstream-all]
+name=EuroLinux 9 AppStream All
+baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/9/$basearch/AppStream/all/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux9
+
+[crb-all]
+name=EuroLinux 9 CodeReady Linux Builder All
+baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/9/$basearch/CRB/all/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux9
+
+# There is no HA and RS for i686 or aarch64
+{% if target_arch == 'x86_64' %}
+[ha-all]
+name=EuroLinux 9 HighAvailability All
+baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/9/$basearch/HighAvailability/all/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux9
+
+[rs-all]
+name=EuroLinux 9 PowerTools All
+baseurl=https://fbi.cdn.euro-linux.com/dist/eurolinux/server/9/$basearch/ResilientStorage/all/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/eurolinux/RPM-GPG-KEY-eurolinux9
+{% endif %}
+"""
diff --git a/mock/templates/fedora-eln.tpl b/mock/templates/fedora-eln.tpl
index 480a191..54e00fc 100644
--- a/mock/templates/fedora-eln.tpl
+++ b/mock/templates/fedora-eln.tpl
@@ -1,8 +1,13 @@
 config_opts['releasever'] = 'eln'
-config_opts['eln_rawhide_releasever'] = '37'
+config_opts['eln_rawhide_releasever'] = '38'
 
 config_opts['root'] = 'fedora-eln-{{ target_arch }}'
 
+# Fedora ELN i386 doesn't get composes (isn't mirrored on
+# odcs.fedoraproject.org), we need to build using the Koji buildroot.
+# Note that similar idiom used in fedora-branched.tpl and fedora-rawhide.tpl.
+config_opts['mirrored'] = config_opts['target_arch'] != 'i686'
+
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils fedora-release-eln findutils gawk glibc-minimal-langpack grep gzip info patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
 
 config_opts['dist'] = 'eln'  # only useful for --resultdir variable subst
@@ -38,56 +43,12 @@ file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-rawhide-primar
 {%- endfor %}
 {%- endmacro %}
 
-# repos
-# The Everything repository have to be enabled to get all of the packages because
-# some of them are not present anywhere else. Also the AppStream repository
-# have to be enabled because it contain modules. Everything else is not required.
-[local]
-name=local
-baseurl=https://kojipkgs.fedoraproject.org/repos/eln-build/latest/$basearch/
-cost=2000
-enabled=0
-skip_if_unavailable=False
-
-[eln]
-name=Fedora - ELN - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey={{ rawhide_gpg_keys() }}
-skip_if_unavailable=False
-
-[eln-debuginfo]
-name=Fedora - ELN - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey={{ rawhide_gpg_keys() }}
-skip_if_unavailable=False
-
-[eln-source]
-name=Fedora - ELN - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey={{ rawhide_gpg_keys() }}
-skip_if_unavailable=False
-
-
+{% if mirrored %}
 [eln-baseos]
 name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=0
+enabled=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -155,7 +116,7 @@ skip_if_unavailable=False
 name=Fedora - ELN CodeReady Linux Builders - Build packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=0
+enabled=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -183,4 +144,285 @@ type=rpm
 gpgcheck=1
 gpgkey={{ rawhide_gpg_keys() }}
 skip_if_unavailable=False
+
+
+
+[eln-extras]
+name=Fedora - ELN Extras - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=1
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-extras-debuginfo]
+name=Fedora - ELN Extras - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-extras-source]
+name=Fedora - ELN Extras - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-ha]
+name=Fedora - ELN HighAvailability - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=0
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-ha-debuginfo]
+name=Fedora - ELN HighAvailability - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-ha-source]
+name=Fedora - ELN HighAvailability - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-rs]
+name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=0
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-rs-debuginfo]
+name=Fedora - ELN ResilientStorage - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-rs-source]
+name=Fedora - ELN ResilientStorage - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-rt]
+name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=0
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-rt-debuginfo]
+name=Fedora - ELN RT - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-rt-source]
+name=Fedora - ELN RT - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-nfv]
+name=Fedora - ELN NFV - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=0
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-nfv-debuginfo]
+name=Fedora - ELN NFV - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-nfv-source]
+name=Fedora - ELN NFV - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-sap]
+name=Fedora - ELN SAP - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=0
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-sap-debuginfo]
+name=Fedora - ELN SAP - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-sap-source]
+name=Fedora - ELN SAP - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-saphana]
+name=Fedora - ELN SAPHANA - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=0
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-saphana-debuginfo]
+name=Fedora - ELN SAPHANA - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-saphana-source]
+name=Fedora - ELN SAPHANA - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+{% endif %}
+
+[local]
+name=local
+baseurl=https://kojipkgs.fedoraproject.org/repos/eln-build/latest/$basearch/
+cost=2000
+enabled={{ not mirrored }}
+skip_if_unavailable=False
 """
diff --git a/mock/templates/fedora-rawhide.tpl b/mock/templates/fedora-rawhide.tpl
index 64233ae..6ee09f7 100644
--- a/mock/templates/fedora-rawhide.tpl
+++ b/mock/templates/fedora-rawhide.tpl
@@ -9,7 +9,7 @@ config_opts['chroot_setup_cmd'] = 'install @{% if mirrored %}buildsys-{% endif %
 
 config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '37'
+config_opts['releasever'] = '38'
 config_opts['package_manager'] = 'dnf'
 config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:rawhide'
 config_opts['description'] = 'Fedora Rawhide'
diff --git a/mock/templates/opensuse-leap-15.3.tpl b/mock/templates/opensuse-leap-15.3.tpl
index 090c727..a775a71 100644
--- a/mock/templates/opensuse-leap-15.3.tpl
+++ b/mock/templates/opensuse-leap-15.3.tpl
@@ -50,8 +50,8 @@ user_agent={{ user_agent }}
 
 [opensuse-leap-oss]
 name=openSUSE Leap $releasever - {{ target_arch }} - OSS
-baseurl=http://download.opensuse.org/distribution/leap/$releasever/repo/oss/
-#metalink=http://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink
+baseurl=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/
+#metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
         file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports
@@ -60,24 +60,24 @@ gpgcheck=1
 
 [opensuse-leap-oss-update]
 name=openSUSE Leap $releasever - {{ target_arch }} - OSS - Updates
-baseurl=http://download.opensuse.org/update/leap/$releasever/oss/
-#metalink=http://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
+baseurl=https://download.opensuse.org/update/leap/$releasever/oss/
+#metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
 gpgcheck=1
 
 [opensuse-leap-sle-update]
 name=openSUSE Leap $releasever - {{ target_arch }} - Updates from SUSE Linux Enterprise
-baseurl=http://download.opensuse.org/update/leap/$releasever/sle/
-#metalink=http://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink
+baseurl=https://download.opensuse.org/update/leap/$releasever/sle/
+#metalink=https://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-15
 gpgcheck=1
 
 [opensuse-leap-sle-backports-update]
 name=openSUSE Leap $releasever - {{ target_arch }} - Updates from Backports for SUSE Linux Enterprise
-baseurl=http://download.opensuse.org/update/leap/$releasever/backports/
-#metalink=http://download.opensuse.org/update/leap/$releasever/backports/repodata/repomd.xml.metalink
+baseurl=https://download.opensuse.org/update/leap/$releasever/backports/
+#metalink=https://download.opensuse.org/update/leap/$releasever/backports/repodata/repomd.xml.metalink
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports
 gpgcheck=1
diff --git a/mock/templates/opensuse-leap-15.4.tpl b/mock/templates/opensuse-leap-15.4.tpl
new file mode 100644
index 0000000..39d9a07
--- /dev/null
+++ b/mock/templates/opensuse-leap-15.4.tpl
@@ -0,0 +1,85 @@
+config_opts['chroot_setup_cmd'] = 'install patterns-devel-base-devel_rpm_build'
+config_opts['dist'] = 'suse.lp154'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}'
+config_opts['releasever'] = '15.4'
+config_opts['macros']['%dist'] = '.suse.lp154'
+config_opts['package_manager'] = 'dnf'
+config_opts['bootstrap_image'] = 'registry.opensuse.org/opensuse/leap-dnf:15.4'
+config_opts['ssl_ca_bundle_path'] = '/var/lib/ca-certificates/ca-bundle.pem'
+config_opts['description'] = 'openSUSE Leap {{ releasever }}'
+
+# Due to the nature of the OpenSUSE mirroring system, we can not use
+# metalinks easily and also we can not rely on the fact that baseurl's
+# always work (issue #553) -- by design we need to expect a one minute
+# repository problems (configured four attempts means 3 periods of 20s).
+config_opts['package_manager_max_attempts'] = 4
+config_opts['package_manager_attempt_delay'] = 20
+
+config_opts['dnf.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+install_weak_deps=0
+metadata_expire=0
+best=1
+{% if target_arch == 'x86_64' %}
+excludepkgs=*.i586,*.i686,*.ppc,*.ppc64,*.ppc64le,*.s390x
+{% elif target_arch == 'i586' %}
+excludepkgs=*.x86_64,*.ppc,*.ppc64,*.ppc64le,*.s390x
+{% elif target_arch == 'ppc64le' %}
+excludepkgs=*.ppc,*.ppc64,*.x86_64,*.i586,*.i686,*.s390x
+{% elif target_arch == 'ppc64' %}
+excludepkgs=*.ppc,*.ppc64le,*.x86_64,*.i586,*.i686,*.s390x
+{% elif target_arch == 's390x' %}
+excludepkgs=*.ppc,*.ppc64,*.ppc64le,*.x86_64,*.i586,*.i686
+{% endif %}
+
+protected_packages=
+user_agent={{ user_agent }}
+
+# repos
+
+[opensuse-leap-oss]
+name=openSUSE Leap $releasever - {{ target_arch }} - OSS
+baseurl=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/
+#metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+        file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports
+        file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-15
+gpgcheck=1
+
+[opensuse-leap-oss-update]
+name=openSUSE Leap $releasever - {{ target_arch }} - OSS - Updates
+baseurl=https://download.opensuse.org/update/leap/$releasever/oss/
+#metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+gpgcheck=1
+
+[opensuse-leap-sle-update]
+name=openSUSE Leap $releasever - {{ target_arch }} - Updates from SUSE Linux Enterprise
+baseurl=https://download.opensuse.org/update/leap/$releasever/sle/
+#metalink=https://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-15
+gpgcheck=1
+
+[opensuse-leap-sle-backports-update]
+name=openSUSE Leap $releasever - {{ target_arch }} - Updates from Backports for SUSE Linux Enterprise
+baseurl=https://download.opensuse.org/update/leap/$releasever/backports/
+#metalink=https://download.opensuse.org/update/leap/$releasever/backports/repodata/repomd.xml.metalink
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports
+gpgcheck=1
+
+"""
diff --git a/mock/templates/opensuse-tumbleweed.tpl b/mock/templates/opensuse-tumbleweed.tpl
index 78f5411..a2b8113 100644
--- a/mock/templates/opensuse-tumbleweed.tpl
+++ b/mock/templates/opensuse-tumbleweed.tpl
@@ -49,17 +49,17 @@ user_agent={{ user_agent }}
 [opensuse-tumbleweed-oss]
 name=openSUSE Tumbleweed - {{ target_arch }} - OSS
 {% if target_arch in ['x86_64', 'i586'] %}
-baseurl=http://download.opensuse.org/tumbleweed/repo/oss/
-#metalink=http://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.metalink
+baseurl=https://download.opensuse.org/tumbleweed/repo/oss/
+#metalink=https://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.metalink
 {% elif target_arch in ['ppc64le', 'ppc64'] %}
-baseurl=http://download.opensuse.org/ports/ppc/tumbleweed/repo/oss/
-#metalink=http://download.opensuse.org/ports/ppc/tumbleweed/repo/oss/repodata/repomd.xml.metalink
+baseurl=https://download.opensuse.org/ports/ppc/tumbleweed/repo/oss/
+#metalink=https://download.opensuse.org/ports/ppc/tumbleweed/repo/oss/repodata/repomd.xml.metalink
 {% elif target_arch in ['aarch64'] %}
-baseurl=http://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/
-#metalink=http://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml.metalink
+baseurl=https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/
+#metalink=https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml.metalink
 {% elif target_arch in ['s390x'] %}
-baseurl=http://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/
-#metalink=http://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/repodata/repomd.xml.metalink
+baseurl=https://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/
+#metalink=https://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/repodata/repomd.xml.metalink
 {% endif %}
 gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
 gpgcheck=1
diff --git a/mock/templates/rocky-8.tpl b/mock/templates/rocky-8.tpl
index 25e5dc2..bc75f5f 100644
--- a/mock/templates/rocky-8.tpl
+++ b/mock/templates/rocky-8.tpl
@@ -33,7 +33,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [appstream]
 name=Rocky Linux $releasever - AppStream
@@ -41,7 +41,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStre
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [powertools]
 name=Rocky Linux $releasever - PowerTools
@@ -49,7 +49,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTo
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=1
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [extras]
 name=Rocky Linux $releasever - Extras
@@ -57,7 +57,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [ha]
 name=Rocky Linux $releasever - HighAvailability
@@ -65,7 +65,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAva
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [resilient-storage]
 name=Rocky Linux $releasever - ResilientStorage
@@ -73,7 +73,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Resilie
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [plus]
 name=Rocky Linux $releasever - Plus
@@ -81,7 +81,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockypl
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/plus/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [devel]
 name=Rocky Linux $releasever - Devel (WARNING: UNSUPPORTED - FOR BUILDROOT USE ONLY!)
@@ -89,7 +89,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/Devel/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 # Debuginfo
 [baseos-debug]
@@ -98,7 +98,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [appstream-debug]
 name=Rocky Linux $releasever - AppStream - Debuginfo
@@ -106,7 +106,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStre
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [ha-debug]
 name=Rocky Linux $releasever - High Availability - Debuginfo
@@ -114,7 +114,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAva
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/HighAvailability/$basearch/debug/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [powertools-debug]
 name=Rocky Linux $releasever - PowerTools - Debuginfo
@@ -122,7 +122,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTo
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/PowerTools/$basearch/debug/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [resilient-storage-debug]
 name=Rocky Linux $releasever - Resilient Storage - Debuginfo
@@ -130,7 +130,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Resilie
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/ResilientStorage/$basearch/debug/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [devel-debug]
 name=Rocky Linux $releasever - Devel - Debuginfo
@@ -138,7 +138,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/Devel/$basearch/debug/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 # Source Repos
 [baseos-source]
@@ -147,7 +147,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$re
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/BaseOS/source/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
@@ -155,7 +155,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/AppStream/source/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [ha-source]
 name=Rocky Linux $releasever - High Availability - Source
@@ -163,7 +163,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvaila
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/HighAvailability/source/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [powertools-source]
 name=Rocky Linux $releasever - PowerTools - Source
@@ -171,7 +171,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=PowerTools
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/PowerTools/source/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [resilient-storage-source]
 name=Rocky Linux $releasever - Resilient Storage - Source
@@ -179,7 +179,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientS
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/ResilientStorage/source/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 [devel-source]
 name=Rocky Linux $releasever - Devel - Source
@@ -187,7 +187,7 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=Devel-$rel
 #baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/Devel/source/tree
 gpgcheck=1
 enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-rockyofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8
 
 
 """
diff --git a/mock/templates/rocky-9.tpl b/mock/templates/rocky-9.tpl
new file mode 100644
index 0000000..c3f6735
--- /dev/null
+++ b/mock/templates/rocky-9.tpl
@@ -0,0 +1,255 @@
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk glibc-minimal-langpack grep gzip info patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
+config_opts['dist'] = 'el9'  # only useful for --resultdir variable subst
+config_opts['releasever'] = '9'
+config_opts['package_manager'] = 'dnf'
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['bootstrap_image'] = 'quay.io/rockylinux/rockylinux:9'
+
+
+config_opts['dnf.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+metadata_expire=0
+mdpolicy=group:primary
+best=1
+install_weak_deps=0
+protected_packages=
+module_platform_id=platform:el9
+user_agent={{ user_agent }}
+
+
+[baseos]
+name=Rocky Linux $releasever - BaseOS
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/BaseOS/$basearch/os/
+gpgcheck=1
+enabled=1
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[appstream]
+name=Rocky Linux $releasever - AppStream
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/AppStream/$basearch/os/
+gpgcheck=1
+enabled=1
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[crb]
+name=Rocky Linux $releasever - CRB
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/CRB/$basearch/os/
+gpgcheck=1
+enabled=1
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[extras]
+name=Rocky Linux $releasever - Extras
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/extras/$basearch/os/
+gpgcheck=1
+enabled=1
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[devel]
+name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT ONLY DO NOT LEAVE ENABLED
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=devel-$releasever
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/devel/$basearch/os/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[highavailability]
+name=Rocky Linux $releasever - High Availability
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[resilientstorage]
+name=Rocky Linux $releasever - Resilient Storage
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[nfv]
+name=Rocky Linux $releasever - NFV
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$releasever
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/os/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[rt]
+name=Rocky Linux $releasever - Realtime
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[baseos-debug]
+name=Rocky Linux $releasever - BaseOS - Debug
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-debug
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/BaseOS/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[baseos-source]
+name=Rocky Linux $releasever - BaseOS - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$releasever-source
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/BaseOS/source/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[appstream-debug]
+name=Rocky Linux $releasever - AppStream - Debug
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-debug
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/AppStream/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[appstream-source]
+name=Rocky Linux $releasever - AppStream - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-$releasever-source
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/AppStream/source/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[crb-debug]
+name=Rocky Linux $releasever - CRB - Debug
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever-debug
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/CRB/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[crb-source]
+name=Rocky Linux $releasever - CRB - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=CRB-$releasever-source
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/CRB/source/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[extras-debug]
+name=Rocky Linux $releasever - Extras Debug
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-debug
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/extras/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[extras-source]
+name=Rocky Linux $releasever - Extras Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-source
+#baseurl=http://dl.rockylinux.org/pub/rocky/$releasever/extras/source/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[highavailability-debug]
+name=Rocky Linux $releasever - High Availability - Debug
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-debug$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[highavailability-source]
+name=Rocky Linux $releasever - High Availability - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvailability-$releasever-source$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[resilientstorage-debug]
+name=Rocky Linux $releasever - Resilient Storage - Debug
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-debug$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[resilientstorage-source]
+name=Rocky Linux $releasever - Resilient Storage - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientStorage-$releasever-source$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[nfv-debug]
+name=Rocky Linux $releasever - NFV Debug
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[nfv-source]
+name=Rocky Linux $releasever - NFV Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/source/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[rt-debug]
+name=Rocky Linux $releasever - Realtime Debug
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/debug/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+[rt-source]
+name=Rocky Linux $releasever - Realtime Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source$rltype
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/source/tree/
+gpgcheck=1
+enabled=0
+metadata_expire=6h
+gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
+
+
+"""
diff --git a/nagios/nrpe.cfg.rpmnew b/nagios/nrpe.cfg.rpmnew
index 9cd0c10..0e4345c 100644
--- a/nagios/nrpe.cfg.rpmnew
+++ b/nagios/nrpe.cfg.rpmnew
@@ -268,7 +268,7 @@ connection_timeout=300
 # This option allows you to override the list of characters that cannot
 # be passed to the NRPE daemon.
 
-# nasty_metachars="|`&><'\\[]{};\r\n"
+# nasty_metachars=|`&><'\\[]{};\r\n
 
 # This option allows you to enable or disable logging error messages to the syslog facilities.
 # If this option is not set, the error messages will be logged.
diff --git a/selinux/targeted/contexts/files/file_contexts b/selinux/targeted/contexts/files/file_contexts
index cbcff4b..6581893 100644
--- a/selinux/targeted/contexts/files/file_contexts
+++ b/selinux/targeted/contexts/files/file_contexts
@@ -5276,6 +5276,7 @@
 /usr/libexec/news/inndf	--	system_u:object_r:innd_exec_t:s0
 /usr/libexec/news/nnrpd	--	system_u:object_r:innd_exec_t:s0
 /usr/libexec/news/rnews	--	system_u:object_r:innd_exec_t:s0
+/usr/libexec/vdsm/vdsmd	--	system_u:object_r:virtd_exec_t:s0
 /usr/sbin/audisp-remote	--	system_u:object_r:audisp_remote_exec_t:s0
 /usr/sbin/avahi-autoipd	--	system_u:object_r:avahi_exec_t:s0
 /usr/sbin/clamav-milter	--	system_u:object_r:antivirus_exec_t:s0
@@ -5542,6 +5543,7 @@
 /usr/libexec/rtkit-daemon	--	system_u:object_r:rtkit_daemon_exec_t:s0
 /usr/libexec/tangd-keygen	--	system_u:object_r:tangd_exec_t:s0
 /usr/libexec/tangd-update	--	system_u:object_r:tangd_exec_t:s0
+/usr/libexec/vdsm/respawn	--	system_u:object_r:virtd_exec_t:s0
 /usr/sbin/dnssec-triggerd	--	system_u:object_r:dnssec_trigger_exec_t:s0
 /usr/sbin/init_repository	--	system_u:object_r:pegasus_exec_t:s0
 /usr/sbin/ipvsadm-restore	--	system_u:object_r:iptables_exec_t:s0
@@ -5833,6 +5835,7 @@
 /usr/libexec/telepathy-rakia	--	system_u:object_r:telepathy_sofiasip_exec_t:s0
 /usr/libexec/telepathy-salut	--	system_u:object_r:telepathy_salut_exec_t:s0
 /usr/libexec/udisks2/udisksd	--	system_u:object_r:devicekit_disk_exec_t:s0
+/usr/libexec/vdsm/supervdsmd	--	system_u:object_r:virtd_exec_t:s0
 /usr/sbin/audispd-zos-remote	--	system_u:object_r:zos_remote_exec_t:s0
 /usr/sbin/console-kit-daemon	--	system_u:object_r:consolekit_exec_t:s0
 /usr/sbin/nm-system-settings	--	system_u:object_r:NetworkManager_exec_t:s0
@@ -6025,6 +6028,7 @@
 /usr/libexec/sssd/selinux_child	--	system_u:object_r:sssd_selinux_manager_exec_t:s0
 /usr/libexec/telepathy-sofiasip	--	system_u:object_r:telepathy_sofiasip_exec_t:s0
 /usr/libexec/telepathy-sunshine	--	system_u:object_r:telepathy_sunshine_exec_t:s0
+/usr/libexec/vdsm/daemonAdapter	--	system_u:object_r:virtd_exec_t:s0
 /usr/sbin/insmod_ksymoops_clean	--	system_u:object_r:bin_t:s0
 /usr/sbin/zabbix_server_sqlite3	--	system_u:object_r:zabbix_exec_t:s0
 /usr/share/ajaxterm/ajaxterm\.py	--	system_u:object_r:ajaxterm_exec_t:s0
diff --git a/selinux/targeted/contexts/files/file_contexts.bin b/selinux/targeted/contexts/files/file_contexts.bin
index d54fd3c..bc72310 100644
Binary files a/selinux/targeted/contexts/files/file_contexts.bin and b/selinux/targeted/contexts/files/file_contexts.bin differ
diff --git a/sysconfig/garb b/sysconfig/garb
index 5af56b0..95c9f01 100644
--- a/sysconfig/garb
+++ b/sysconfig/garb
@@ -8,9 +8,11 @@
 # GALERA_GROUP=""
 
 # Optional Galera internal options string (e.g. SSL settings)
-# see http://galeracluster.com/documentation-webpages/galeraparameters.html
+# see https://galeracluster.com/library/documentation/galera-parameters.html
 # GALERA_OPTIONS=""
 
 # Log file for garbd. Optional, by default logs to syslog
 # LOG_FILE=""
 
+# Where to persist necessary data
+# WORK_DIR=""