diff --git a/mock-riscv64-rawhide.patch b/mock-riscv64-rawhide.patch
index f394030..50c539f 100644
--- a/mock-riscv64-rawhide.patch
+++ b/mock-riscv64-rawhide.patch
@@ -1,93 +1,20 @@
-diff --git a/etc/mock/fedora-rawhide-riscv64.cfg b/etc/mock/fedora-rawhide-riscv64.cfg
+diff --git a/etc/mock/fedora-33-riscv64.cfg b/etc/mock/fedora-33-riscv64.cfg
 new file mode 100644
-index 0000000..ac84de9
+index 0000000..65beeab
 --- /dev/null
-+++ b/etc/mock/fedora-rawhide-riscv64.cfg
-@@ -0,0 +1,87 @@
-+config_opts['root'] = 'fedora-rawhide-riscv64'
++++ b/etc/mock/fedora-33-riscv64.cfg
+@@ -0,0 +1,4 @@
 +config_opts['target_arch'] = 'riscv64'
 +config_opts['legal_host_arches'] = ('riscv64',)
-+# config_opts['module_enable'] = ['list', 'of', 'modules']
-+# config_opts['module_install'] = ['module1/profile', 'module2/profile']
-+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-+config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
-+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-+config_opts['releasever'] = '31'
 +
-+config_opts['package_manager'] = 'dnf'
++include('templates/fedora-rawhide.tpl')
+diff --git a/etc/mock/fedora-rawhide-riscv64.cfg b/etc/mock/fedora-rawhide-riscv64.cfg
+new file mode 100644
+index 0000000..65beeab
+--- /dev/null
++++ b/etc/mock/fedora-rawhide-riscv64.cfg
+@@ -0,0 +1,4 @@
++config_opts['target_arch'] = 'riscv64'
++config_opts['legal_host_arches'] = ('riscv64',)
 +
-+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=
-+install_weak_deps=0
-+metadata_expire=0
-+best=1
-+module_platform_id=platform:f31
-+
-+# repos
-+
-+[fedora]
-+name=fedora
-+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
-+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary
-+gpgcheck=1
-+skip_if_unavailable=False
-+
-+[local]
-+name=local
-+baseurl=https://kojipkgs.fedoraproject.org/repos/rawhide/latest/riscv64/
-+cost=2000
-+enabled=0
-+skip_if_unavailable=False
-+
-+[fedora-debuginfo]
-+name=Fedora Rawhide - riscv64 - Debug
-+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
-+enabled=0
-+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary
-+gpgcheck=1
-+skip_if_unavailable=False
-+
-+[fedora-source]
-+name=fedora-source
-+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
-+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary
-+gpgcheck=1
-+enabled=0
-+skip_if_unavailable=False
-+
-+# modular
-+
-+[rawhide-modular]
-+name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
-+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
-+enabled=0
-+gpgcheck=1
-+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary 
-+skip_if_unavailable=False
-+
-+[rawhide-modular-debuginfo]
-+name=Fedora - Modular Rawhide - Debug
-+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
-+enabled=0
-+gpgcheck=1
-+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary
-+skip_if_unavailable=False
-+
-+[rawhide-modular-source]
-+name=Fedora - Modular Rawhide - Source
-+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
-+enabled=0
-+gpgcheck=1
-+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary
-+skip_if_unavailable=False
-+"""
++include('templates/fedora-rawhide.tpl')