diff --git a/mock/c7-firefox60.x86_64.cfg b/mock/c7-firefox60.x86_64.cfg
new file mode 100644
index 0000000..1195b83
--- /dev/null
+++ b/mock/c7-firefox60.x86_64.cfg
@@ -0,0 +1,150 @@
+config_opts['root'] = 'TARGETNAME'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+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 scl-utils-build   c7-llvm-toolset-7-build c7-rust-toolst-7-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']['%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'] = "x86_64-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=
+
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+exclude=redhat-logos redhat-release* fakesystemd systemd-container*
+
+# repos
+[c7.00.04]
+name=c7.00.04
+enabled=1
+baseurl=http://repohost/repo/c7.00.04/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.00.03]
+name=c7.00.03
+enabled=1
+baseurl=http://repohost/repo/c7.00.03/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.00.02]
+name=c7.00.02
+enabled=1
+baseurl=http://repohost/repo/c7.00.02/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7-extras.x86_64]
+name=c7-extras.x86_64
+enabled=1
+baseurl=http://repohost/repo/c7-extras.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7-updates]
+name=c7-updates
+enabled=1
+baseurl=http://repohost/repo/c7-updates/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.01.00]
+name=c7.01.00
+enabled=1
+baseurl=http://repohost/repo/c7.01.00/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+
+[c7.01.u]
+name=c7.01.u
+enabled=1
+baseurl=http://repohost/repo/c7.01.u/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1511.u]
+name=c7.1511.u
+enabled=1
+baseurl=http://repohost/repo/c7.1511.u/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1511.00]
+name=c7.1511.00
+enabled=1
+baseurl=http://repohost/repo/c7.1511.00/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1611.u]
+name=c7.1611.u
+enabled=1
+baseurl=http://repohost/repo/c7.1611.u/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1611.00]
+name=c7.1611.00
+enabled=1
+baseurl=http://repohost/repo/c7.1611.00/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1611.01]
+name=c7.1611.01
+enabled=1
+baseurl=http://repohost/repo/c7.1611.01/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1708.u.x86_64]
+name=c7.1708.u.x86_64
+enabled=1
+baseurl=http://repohost/repo/c7.1708.u.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1708.00]
+name=c7.1708.00
+enabled=1
+baseurl=http://repohost/repo/c7.1708.00/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1804.u.x86_64]
+name=c7.1804.u.x86_64
+enabled=1
+baseurl=http://repohost/repo/c7.1804.u.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1804.00.x86_64]
+name=c7.1804.00.x86_64
+enabled=1
+baseurl=http://repohost/repo/c7.1804.00.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7-devtoolset-7]
+name=c7-devtoolset-7
+enabled=1
+baseurl=http://repohost/repo/c7-devtoolset-7.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7-llvm-toolset-7]
+name=c7-llvm-toolset-7
+enabled=1
+baseurl=http://repohost/repo/c7-llvm-toolset-7.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7-rust-toolset-7]
+name=c7-rust-toolset-7
+enabled=1
+baseurl=http://repohost/repo/c7-rust-toolset-7.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+"""
diff --git a/mock/c7-firefox60.x86_64.config b/mock/c7-firefox60.x86_64.config
deleted file mode 100644
index 1195b83..0000000
--- a/mock/c7-firefox60.x86_64.config
+++ /dev/null
@@ -1,150 +0,0 @@
-config_opts['root'] = 'TARGETNAME'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-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 scl-utils-build   c7-llvm-toolset-7-build c7-rust-toolst-7-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']['%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'] = "x86_64-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=
-
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-exclude=redhat-logos redhat-release* fakesystemd systemd-container*
-
-# repos
-[c7.00.04]
-name=c7.00.04
-enabled=1
-baseurl=http://repohost/repo/c7.00.04/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.00.03]
-name=c7.00.03
-enabled=1
-baseurl=http://repohost/repo/c7.00.03/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.00.02]
-name=c7.00.02
-enabled=1
-baseurl=http://repohost/repo/c7.00.02/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7-extras.x86_64]
-name=c7-extras.x86_64
-enabled=1
-baseurl=http://repohost/repo/c7-extras.x86_64/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7-updates]
-name=c7-updates
-enabled=1
-baseurl=http://repohost/repo/c7-updates/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.01.00]
-name=c7.01.00
-enabled=1
-baseurl=http://repohost/repo/c7.01.00/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-
-[c7.01.u]
-name=c7.01.u
-enabled=1
-baseurl=http://repohost/repo/c7.01.u/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.1511.u]
-name=c7.1511.u
-enabled=1
-baseurl=http://repohost/repo/c7.1511.u/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.1511.00]
-name=c7.1511.00
-enabled=1
-baseurl=http://repohost/repo/c7.1511.00/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.1611.u]
-name=c7.1611.u
-enabled=1
-baseurl=http://repohost/repo/c7.1611.u/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.1611.00]
-name=c7.1611.00
-enabled=1
-baseurl=http://repohost/repo/c7.1611.00/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.1611.01]
-name=c7.1611.01
-enabled=1
-baseurl=http://repohost/repo/c7.1611.01/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.1708.u.x86_64]
-name=c7.1708.u.x86_64
-enabled=1
-baseurl=http://repohost/repo/c7.1708.u.x86_64/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.1708.00]
-name=c7.1708.00
-enabled=1
-baseurl=http://repohost/repo/c7.1708.00/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.1804.u.x86_64]
-name=c7.1804.u.x86_64
-enabled=1
-baseurl=http://repohost/repo/c7.1804.u.x86_64/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7.1804.00.x86_64]
-name=c7.1804.00.x86_64
-enabled=1
-baseurl=http://repohost/repo/c7.1804.00.x86_64/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7-devtoolset-7]
-name=c7-devtoolset-7
-enabled=1
-baseurl=http://repohost/repo/c7-devtoolset-7.x86_64/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7-llvm-toolset-7]
-name=c7-llvm-toolset-7
-enabled=1
-baseurl=http://repohost/repo/c7-llvm-toolset-7.x86_64/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-
-[c7-rust-toolset-7]
-name=c7-rust-toolset-7
-enabled=1
-baseurl=http://repohost/repo/c7-rust-toolset-7.x86_64/
-includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
-"""