diff --git a/mock/c7-exp-pi4.armhfp.cfg b/mock/c7-exp-pi4.armhfp.cfg
deleted file mode 100644
index 9f67349..0000000
--- a/mock/c7-exp-pi4.armhfp.cfg
+++ /dev/null
@@ -1,142 +0,0 @@
-config_opts['root'] = 'TARGETNAME' 
-config_opts['target_arch'] = 'armv7hl'
-config_opts['legal_host_arches'] = ('armv7l')
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['macros']['%dist'] = ".el7"
-config_opts['%centos_ver'] = "7"
-config_opts['macros']['%centos_ver'] = "7"
-config_opts['macros']['%rhel'] = "7"
-config_opts['macros']['%el7'] = "1"
-config_opts['macros']['%redhat'] = "7"
-config_opts['macros']['%vendor'] = "CentOS"
-config_opts['macros']['%packager'] = "CentOS BuildSystem <http://bugs.centos.org>"
-config_opts['macros']['%_vendor'] = "redhat"
-config_opts['macros']['%_vendor_host'] = "redhat"
-config_opts['macros']['%_host'] = "armv7hl-redhat-linux-gnu"
-#config_opts['macros']['%global _binaries_in_noarch_packages_terminate_build'] = "0"
-
-# no ccache in base repo
-config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-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=
-
-# repos
-
-[c7.1511.00.armhfp]
-name=c7.1511.00.armhfp
-baseurl=http://repohost/repo/c7.1511.00.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1511.u.armhfp]
-name=c7.1511.u.armhfp
-baseurl=http://repohost/repo/c7.1511.u.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1611.00.armhfp]
-name=c7.1611.00.armhfp
-baseurl=http://repohost/repo/c7.1611.00.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1611.u.armhfp]
-name=c7.1611.u.armhfp
-baseurl=http://repohost/repo/c7.1611.u.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1708.00.armhfp]
-name=c7.1708.00.armhfp
-baseurl=http://repohost/repo/c7.1708.00.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1708.u.armhfp]
-name=c7.1708.u.armhfp
-baseurl=http://repohost/repo/c7.1708.u.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1804.00.armhfp]
-name=c7.1804.00.armhfp
-baseurl=http://repohost/repo/c7.1804.00.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1804.u.armhfp]
-name=c7.1804.u.armhfp
-baseurl=http://repohost/repo/c7.1804.u.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7-kernels.armhfp]
-name=c7-kernels.armhfp
-baseurl=http://repohost/repo/c7-kernels.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7-exp.armhfp]
-name=c7-exp.armhfp
-baseurl=http://repohost/repo/c7-exp.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7-exp-pi4.armhfp]
-name=c7-exp-pi4.armhfp
-baseurl=http://repohost/repo/c7-exp-pi4.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1810.00.armhfp]
-name=c7.1810.00.armhfp
-baseurl=http://repohost/repo/c7.1810.00.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1810.u.armhfp]
-name=c7.1810.u.armhfp
-baseurl=http://repohost/repo/c7.1810.u.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1908.00.armhfp]
-name=c7.1908.00.armhfp
-baseurl=http://repohost/repo/c7.1908.00.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7.1908.u.armhfp]
-name=c7.1908.u.armhfp
-baseurl=http://repohost/repo/c7.1908.u.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7-llvm-toolset-7.0.armhfp]
-name=c7-llvm-toolset-7.0.armhfp
-baseurl=http://repohost/repo/c7-llvm-toolset-7.0.armhfp/
-enabled=1
-gpgcheck=0
-
-[c7-devtoolset-8.armhfp]
-name=c7-devtoolset-8.armhfp
-baseurl=http://repohost/repo/c7-devtoolset-8.armhfp/
-enabled=1
-gpgcheck=0
-"""
-
diff --git a/mock/c7-exp-rpi.aarch64.cfg b/mock/c7-exp-rpi.aarch64.cfg
new file mode 100644
index 0000000..70ac184
--- /dev/null
+++ b/mock/c7-exp-rpi.aarch64.cfg
@@ -0,0 +1,87 @@
+config_opts['root'] = 'TARGETNAME'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils centos-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build'
+config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
+
+config_opts['%centos_ver'] = "7"
+config_opts['macros']['%centos_ver'] = "7"
+config_opts['macros']['%rhel'] = "7"
+config_opts['macros']['%centos'] = "7"
+config_opts['macros']['%el7'] = "1"
+config_opts['macros']['%redhat'] = "7"
+config_opts['macros']['%vendor'] = "CentOS"
+config_opts['macros']['%packager'] = "CentOS BuildSystem <http://bugs.centos.org>"
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+config_opts['macros']['%_host'] = "aarch64-redhat-linux-gnu"
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+
+# repos
+[c7-exp-rpi.aarch64]
+name=c7-exp-rpi.aarch64
+baseurl=http://repohost/repo/c7-exp-rpi.aarch64/
+gpgcheck=0
+
+[c7.1708.u.aarch64]
+name=c7.1708.u.aarch64
+baseurl=http://repohost/repo/c7.1708.u.aarch64/
+gpgcheck=0
+
+[c7.1708.00.aarch64]
+name=c7.1708.00.aarch64
+baseurl=http://repohost/repo/c7.1708.00.aarch64/
+gpgcheck=0
+
+[c7.1804.u.aarch64]
+name=c7.1804.u.aarch64
+baseurl=http://repohost/repo/c7.1804.u.aarch64/
+gpgcheck=0
+
+[c7.1804.00.aarch64]
+name=c7.1804.00.aarch64
+baseurl=http://repohost/repo/c7.1804.00.aarch64/
+gpgcheck=0
+
+[c7.1810.u.aarch64]
+name=c7.1810.u.aarch64
+baseurl=http://repohost/repo/c7.1810.u.aarch64/
+gpgcheck=0
+
+[c7.1810.00.aarch64]
+name=c7.1810.00.aarch64
+baseurl=http://repohost/repo/c7.1810.00.aarch64/
+gpgcheck=0
+
+[c7.1908.u.aarch64]
+name=c7.1908.u.aarch64
+baseurl=http://repohost/repo/c7.1908.u.aarch64/
+gpgcheck=0
+
+[c7.1908.00.aarch64]
+name=c7.1908.00.aarch64
+baseurl=http://repohost/repo/c7.1908.00.aarch64/
+gpgcheck=0
+
+[c7-llvm-toolset-7.0.aarch64]
+name=c7-llvm-toolset-7.0.aarch64
+baseurl=http://repohost/repo/c7-llvm-toolset-7.0.aarch64/
+gpgcheck=0
+
+[c7-devtoolset-8.aarch64]
+name=c7-devtoolset-8.aarch64
+baseurl=http://repohost/repo/c7-devtoolset-8.aarch64/
+gpgcheck=0
+"""
diff --git a/mock/c7-exp-rpi.armhfp.cfg b/mock/c7-exp-rpi.armhfp.cfg
new file mode 100644
index 0000000..2a97fec
--- /dev/null
+++ b/mock/c7-exp-rpi.armhfp.cfg
@@ -0,0 +1,130 @@
+config_opts['root'] = 'TARGETNAME' 
+config_opts['target_arch'] = 'armv7hl'
+config_opts['legal_host_arches'] = ('armv7l')
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build'
+config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['macros']['%dist'] = ".el7"
+config_opts['%centos_ver'] = "7"
+config_opts['macros']['%centos_ver'] = "7"
+config_opts['macros']['%rhel'] = "7"
+config_opts['macros']['%el7'] = "1"
+config_opts['macros']['%redhat'] = "7"
+config_opts['macros']['%vendor'] = "CentOS"
+config_opts['macros']['%packager'] = "CentOS BuildSystem <http://bugs.centos.org>"
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+config_opts['macros']['%_host'] = "armv7hl-redhat-linux-gnu"
+#config_opts['macros']['%global _binaries_in_noarch_packages_terminate_build'] = "0"
+
+# no ccache in base repo
+config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['yum_cache_enable'] = False
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+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=
+
+# repos
+
+[c7.1511.00.armhfp]
+name=c7.1511.00.armhfp
+baseurl=http://repohost/repo/c7.1511.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1511.u.armhfp]
+name=c7.1511.u.armhfp
+baseurl=http://repohost/repo/c7.1511.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1611.00.armhfp]
+name=c7.1611.00.armhfp
+baseurl=http://repohost/repo/c7.1611.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1611.u.armhfp]
+name=c7.1611.u.armhfp
+baseurl=http://repohost/repo/c7.1611.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1708.00.armhfp]
+name=c7.1708.00.armhfp
+baseurl=http://repohost/repo/c7.1708.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1708.u.armhfp]
+name=c7.1708.u.armhfp
+baseurl=http://repohost/repo/c7.1708.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1804.00.armhfp]
+name=c7.1804.00.armhfp
+baseurl=http://repohost/repo/c7.1804.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1804.u.armhfp]
+name=c7.1804.u.armhfp
+baseurl=http://repohost/repo/c7.1804.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7-exp-pi.armhfp]
+name=c7-exp-pi.armhfp
+baseurl=http://repohost/repo/c7-exp-pi.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1810.00.armhfp]
+name=c7.1810.00.armhfp
+baseurl=http://repohost/repo/c7.1810.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1810.u.armhfp]
+name=c7.1810.u.armhfp
+baseurl=http://repohost/repo/c7.1810.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1908.00.armhfp]
+name=c7.1908.00.armhfp
+baseurl=http://repohost/repo/c7.1908.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1908.u.armhfp]
+name=c7.1908.u.armhfp
+baseurl=http://repohost/repo/c7.1908.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7-llvm-toolset-7.0.armhfp]
+name=c7-llvm-toolset-7.0.armhfp
+baseurl=http://repohost/repo/c7-llvm-toolset-7.0.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7-devtoolset-8.armhfp]
+name=c7-devtoolset-8.armhfp
+baseurl=http://repohost/repo/c7-devtoolset-8.armhfp/
+enabled=1
+gpgcheck=0
+"""
+
diff --git a/mock/c7-exp-rpi4.armhfp.cfg b/mock/c7-exp-rpi4.armhfp.cfg
new file mode 100644
index 0000000..53f32aa
--- /dev/null
+++ b/mock/c7-exp-rpi4.armhfp.cfg
@@ -0,0 +1,131 @@
+config_opts['root'] = 'TARGETNAME' 
+config_opts['target_arch'] = 'armv7hl'
+config_opts['legal_host_arches'] = ('armv7l')
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build'
+config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['macros']['%dist'] = ".el7"
+config_opts['macros']['_with_rpi4'] = "1"
+config_opts['%centos_ver'] = "7"
+config_opts['macros']['%centos_ver'] = "7"
+config_opts['macros']['%rhel'] = "7"
+config_opts['macros']['%el7'] = "1"
+config_opts['macros']['%redhat'] = "7"
+config_opts['macros']['%vendor'] = "CentOS"
+config_opts['macros']['%packager'] = "CentOS BuildSystem <http://bugs.centos.org>"
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+config_opts['macros']['%_host'] = "armv7hl-redhat-linux-gnu"
+#config_opts['macros']['%global _binaries_in_noarch_packages_terminate_build'] = "0"
+
+# no ccache in base repo
+config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['yum_cache_enable'] = False
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+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=
+
+# repos
+
+[c7.1511.00.armhfp]
+name=c7.1511.00.armhfp
+baseurl=http://repohost/repo/c7.1511.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1511.u.armhfp]
+name=c7.1511.u.armhfp
+baseurl=http://repohost/repo/c7.1511.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1611.00.armhfp]
+name=c7.1611.00.armhfp
+baseurl=http://repohost/repo/c7.1611.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1611.u.armhfp]
+name=c7.1611.u.armhfp
+baseurl=http://repohost/repo/c7.1611.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1708.00.armhfp]
+name=c7.1708.00.armhfp
+baseurl=http://repohost/repo/c7.1708.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1708.u.armhfp]
+name=c7.1708.u.armhfp
+baseurl=http://repohost/repo/c7.1708.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1804.00.armhfp]
+name=c7.1804.00.armhfp
+baseurl=http://repohost/repo/c7.1804.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1804.u.armhfp]
+name=c7.1804.u.armhfp
+baseurl=http://repohost/repo/c7.1804.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7-exp-rpi4.armhfp]
+name=c7-exp-rpi4.armhfp
+baseurl=http://repohost/repo/c7-exp-rpi4.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1810.00.armhfp]
+name=c7.1810.00.armhfp
+baseurl=http://repohost/repo/c7.1810.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1810.u.armhfp]
+name=c7.1810.u.armhfp
+baseurl=http://repohost/repo/c7.1810.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1908.00.armhfp]
+name=c7.1908.00.armhfp
+baseurl=http://repohost/repo/c7.1908.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1908.u.armhfp]
+name=c7.1908.u.armhfp
+baseurl=http://repohost/repo/c7.1908.u.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7-llvm-toolset-7.0.armhfp]
+name=c7-llvm-toolset-7.0.armhfp
+baseurl=http://repohost/repo/c7-llvm-toolset-7.0.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7-devtoolset-8.armhfp]
+name=c7-devtoolset-8.armhfp
+baseurl=http://repohost/repo/c7-devtoolset-8.armhfp/
+enabled=1
+gpgcheck=0
+"""
+
diff --git a/mock/c7-exp.aarch64.cfg b/mock/c7-exp.aarch64.cfg
index e236651..5e1ad61 100644
--- a/mock/c7-exp.aarch64.cfg
+++ b/mock/c7-exp.aarch64.cfg
@@ -30,11 +30,6 @@ syslog_ident=mock
 syslog_device=
 
 # repos
-[c7-kernels.aarch64]
-name=c7-kernels.aarch64
-baseurl=http://repohost/repo/c7-kernels.aarch64/
-gpgcheck=0
-
 [c7-exp.aarch64]
 name=c7-exp.aarch64
 baseurl=http://repohost/repo/c7-exp.aarch64/
diff --git a/mock/c7-kernels-rpi4.armhfp.cfg b/mock/c7-kernels-rpi4.armhfp.cfg
index 7f5e082..ca9b37a 100644
--- a/mock/c7-kernels-rpi4.armhfp.cfg
+++ b/mock/c7-kernels-rpi4.armhfp.cfg
@@ -86,12 +86,6 @@ baseurl=http://repohost/repo/c7.1804.u.armhfp/
 enabled=1
 gpgcheck=0
 
-[c7-kernels.armhfp]
-name=c7-kernels.armhfp
-baseurl=http://repohost/repo/c7-kernels.armhfp/
-enabled=1
-gpgcheck=0
-
 [c7-kernels-rpi4.armhfp]
 name=c7-kernels-rpi4.armhfp
 baseurl=http://repohost/repo/c7-kernels-rpi4.armhfp/