diff --git a/mock/c7-extras.a64-aarch64.cfg b/mock/c7-extras.a64-aarch64.cfg
deleted file mode 100644
index d3c347b..0000000
--- a/mock/c7-extras.a64-aarch64.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-config_opts['root'] = 'c7-extras.a64-aarch64'
-config_opts['basedir'] = 'MOCKROOT'
-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'
-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.1511.00.a64]
-name=c7.1511.00.a64
-baseurl=http://repohost/tmp/repo/c7.1511.00.a64/
-gpgcheck=0
-cost=2000
-
-[c7.1511.u.a64]
-name=c7.1511.u.a64
-baseurl=http://repohost/tmp/repo/c7.1511.u.a64/
-gpgcheck=0
-cost=1900
-
-[c7-extras.a64]
-name=c7-extras.a64
-baseurl=http://repohost/tmp/repo/c7-extras.a64/
-gpgcheck=0
-cost=500
-
-"""
diff --git a/mock/c7-extras.aarch64.cfg b/mock/c7-extras.aarch64.cfg
new file mode 100644
index 0000000..8f0ce38
--- /dev/null
+++ b/mock/c7-extras.aarch64.cfg
@@ -0,0 +1,48 @@
+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'
+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-extras.aarch64]
+name=c7-extras.aarch64
+baseurl=http://repohost/repo/c7-extras.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
+
+"""