diff --git a/mock-core-configs.spec b/mock-core-configs.spec
index 4537bc3..3901227 100644
--- a/mock-core-configs.spec
+++ b/mock-core-configs.spec
@@ -1,5 +1,5 @@
 Name:       mock-core-configs
-Version:    36.3
+Version:    36.4
 Release:    1%{?dist}
 Summary:    Mock core config files basic chroots
 
@@ -18,7 +18,7 @@ BuildArch:  noarch
 Provides: mock-configs
 
 # distribution-gpg-keys contains GPG keys used by mock configs
-Requires:   distribution-gpg-keys >= 1.59
+Requires:   distribution-gpg-keys >= 1.60
 # specify minimal compatible version of mock
 Requires:   mock >= 2.5
 Requires:   mock-filesystem
@@ -89,7 +89,10 @@ cp -a etc/mock/eol/templates/*.tpl %{buildroot}%{_sysconfdir}/mock/eol/templates
 # generate files section with config - there is many of them
 echo "%defattr(0644, root, mock)" > %{name}.cfgs
 find %{buildroot}%{_sysconfdir}/mock -name "*.cfg" -o -name '*.tpl' \
+    | grep -v chroot-aliases \
     | sed -e "s|^%{buildroot}|%%config(noreplace) |" >> %{name}.cfgs
+echo "%%config %{_sysconfdir}/mock/chroot-aliases.cfg" >> %{name}.cfgs
+
 # just for %%ghosting purposes
 ln -s fedora-rawhide-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/default.cfg
 # bash-completion
@@ -149,6 +152,30 @@ fi
 %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg
 
 %changelog
+* Thu Dec 16 2021 Pavel Raiskup <praiskup@redhat.com> 36.4-1
+- add CentOS Stream 9 + EPEL Next 9 (ngompa13@gmail.com)
+- add compatibility symlinks for EPEL 7 to centos+epel-7-* (ngompa13@gmail.com)
+- EPEL 7 for AArch64 and PPC64 are EOL (ngompa13@gmail.com)
+- resolve the multiple "local" repo collision (from multiple templates)
+- configure the alternative help for missing 'epel-8-*' configs
+- Fedora 33 is EOL
+- rhelepel moved to rhel+epel
+- EOL the EPEL Playground configs (ngompa13@gmail.com)
+- Add rocky+epel confs + Disable devel-debug (tucklesepk@gmail.com)
+- Rename epel to centos+epel (ngompa13@gmail.com)
+- fix the root name and remove Next from the EPEL 9 configs (ngompa13@gmail.com)
+- rename 'epel-next' to 'centos-stream+epel-next' (ngompa13@gmail.com)
+- add epel9 repos to epel9 template (carl@george.computer)
+- rhbz#2026571 - expand dnf_vars (msuchy@redhat.com)
+- oraclelinux+epel configs (carl@george.computer)
+- Add AlmaLinux+EPEL configs (ngompa13@gmail.com)
+- add navy-8-x86_64 (adil@linux.com)
+- use quay.io Almalinux image (gotmax@e.email)
+- use fully qualified bootstrap_image name (gotmax@e.email)
+- update almalinux-8.tpl bootstrap_image (gotmax@e.email)
+- add Koji local repos to CentOS Stream configs (ngompa13@gmail.com)
+- reduce packages installed in epel chroots (carl@george.computer)
+
 * Fri Oct 29 2021 Pavel Raiskup <praiskup@redhat.com> 36.3-1
 - add EuroLinux 8 aarch64 (alex@euro-linux.com)
 - add HA and RS configs to EuroLinux configs (alex@euro-linux.com)
diff --git a/sources b/sources
index 1d5bd4c..16c809f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mock-core-configs-36.3.tar.gz) = 6d8215cdbe498683a930ec66b6b30085e8ee446ce0f9c5bec28fe856505d6c4e11ec2c680dcb5a71814693b00f45f7d286e4fc8bac12c0fe70fb3b70b2235502
+SHA512 (mock-core-configs-36.4.tar.gz) = 32c60b81cfa2b9a17633d936bfb7aa86d82d99d1c69709cce1be437010a62567d402a71e6e36b5593d3741516f3ef4adfc10b26c53fa546fc9b50ec843712dd9