diff --git a/mock/c7.00.03-i686.cfg b/mock/c7.00.03-i686.cfg
index ca59de8..e3afa7b 100644
--- a/mock/c7.00.03-i686.cfg
+++ b/mock/c7.00.03-i686.cfg
@@ -2,7 +2,7 @@ config_opts['root'] = 'c7.00.03-i686'
 config_opts['basedir'] = 'MOCKROOT'
 config_opts['target_arch'] = 'i686'
 config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',)
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release-server 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['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'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['%centos_ver'] = "7"
diff --git a/mock/c7.00.04-i686.cfg b/mock/c7.00.04-i686.cfg
index 107c120..037f3c0 100644
--- a/mock/c7.00.04-i686.cfg
+++ b/mock/c7.00.04-i686.cfg
@@ -2,7 +2,7 @@ config_opts['root'] = 'c7.00.03-i686'
 config_opts['basedir'] = 'MOCKROOT'
 config_opts['target_arch'] = 'i686'
 config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',)
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release-server 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['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'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['%centos_ver'] = "7"
diff --git a/mock/c7.00.04-x86_64.cfg b/mock/c7.00.04-x86_64.cfg
index caca51c..0e2c0d3 100644
--- a/mock/c7.00.04-x86_64.cfg
+++ b/mock/c7.00.04-x86_64.cfg
@@ -2,7 +2,7 @@ config_opts['root'] = 'c7.00.03-x86_64'
 config_opts['basedir'] = 'MOCKROOT'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release-server 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['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'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['%centos_ver'] = "7"
diff --git a/mock/gdm-3.8.4-25.el7-x86_64.cfg b/mock/gdm-3.8.4-25.el7-x86_64.cfg
deleted file mode 120000
index b929ec1..0000000
--- a/mock/gdm-3.8.4-25.el7-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-netcf-0.2.3-8.el7-x86_64.cfg
\ No newline at end of file
diff --git a/mock/glusterfs-3.4.0.59rhs-1.el7.cfg b/mock/glusterfs-3.4.0.59rhs-1.el7.cfg
deleted file mode 120000
index b929ec1..0000000
--- a/mock/glusterfs-3.4.0.59rhs-1.el7.cfg
+++ /dev/null
@@ -1 +0,0 @@
-netcf-0.2.3-8.el7-x86_64.cfg
\ No newline at end of file
diff --git a/mock/icu-50.1.2-11.el7-x86_64.cfg b/mock/icu-50.1.2-11.el7-x86_64.cfg
deleted file mode 120000
index b929ec1..0000000
--- a/mock/icu-50.1.2-11.el7-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-netcf-0.2.3-8.el7-x86_64.cfg
\ No newline at end of file
diff --git a/mock/java-1.6.0-openjdk-1.6.0.0-6.1.13.1.el7-x86_64.cfg b/mock/java-1.6.0-openjdk-1.6.0.0-6.1.13.1.el7-x86_64.cfg
deleted file mode 120000
index b929ec1..0000000
--- a/mock/java-1.6.0-openjdk-1.6.0.0-6.1.13.1.el7-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-netcf-0.2.3-8.el7-x86_64.cfg
\ No newline at end of file
diff --git a/mock/libguestfs-1.22.6-22.el7-x86_64.cfg b/mock/libguestfs-1.22.6-22.el7-x86_64.cfg
deleted file mode 120000
index b929ec1..0000000
--- a/mock/libguestfs-1.22.6-22.el7-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-netcf-0.2.3-8.el7-x86_64.cfg
\ No newline at end of file
diff --git a/mock/netcf-0.2.3-8.el7-i386.cfg b/mock/netcf-0.2.3-8.el7-i386.cfg
deleted file mode 120000
index 73078d8..0000000
--- a/mock/netcf-0.2.3-8.el7-i386.cfg
+++ /dev/null
@@ -1 +0,0 @@
-netcf-0.2.3-8.el7-i686.cfg
\ No newline at end of file
diff --git a/mock/netcf-0.2.3-8.el7-i686.cfg b/mock/netcf-0.2.3-8.el7-i686.cfg
deleted file mode 100644
index 01c069d..0000000
--- a/mock/netcf-0.2.3-8.el7-i686.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-config_opts['root'] = 'c7.00.03-i686'
-config_opts['basedir'] = 'MOCKROOT'
-config_opts['target_arch'] = 'i686'
-config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',)
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release-server 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']['%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'] = "i386-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=
-
-exclude=*.x86_64 redhat-logos
-
-# repos
-[c7.00.03]
-name=c7.00.03
-enabled=1
-cost=500
-baseurl=http://repohost/tmp/repo/c7.00.03/
-
-[c7.00.02]
-name=c7.00.02
-enabled=1
-cost=1000
-baseurl=http://repohost/tmp/repo/c7.00.02/
-
-[c7.00.00]
-name=c7.00.00
-enabled=1
-cost=1000
-baseurl=http://repohost/tmp/repo/c7.00.00/
-
-"""
diff --git a/mock/netcf-0.2.3-8.el7-x86_64.cfg b/mock/netcf-0.2.3-8.el7-x86_64.cfg
deleted file mode 100644
index 7a06266..0000000
--- a/mock/netcf-0.2.3-8.el7-x86_64.cfg
+++ /dev/null
@@ -1,49 +0,0 @@
-config_opts['root'] = 'c7.00.03-x86_64'
-config_opts['basedir'] = 'MOCKROOT'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release-server 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']['%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
-
-# repos
-[c7.00.03]
-name=c7.00.03
-enabled=1
-cost=500
-baseurl=http://repohost/tmp/repo/c7.00.03/
-
-[c7.00.02]
-name=c7.00.02
-enabled=1
-cost=1000
-baseurl=http://repohost/tmp/repo/c7.00.02/
-
-"""
diff --git a/mock/realmd-0.14.6-6.el7-x86_64.cfg b/mock/realmd-0.14.6-6.el7-x86_64.cfg
deleted file mode 120000
index b929ec1..0000000
--- a/mock/realmd-0.14.6-6.el7-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-netcf-0.2.3-8.el7-x86_64.cfg
\ No newline at end of file
diff --git a/mock/ruby-2.0.0.353-20.el7-x86_64.cfg b/mock/ruby-2.0.0.353-20.el7-x86_64.cfg
deleted file mode 120000
index b929ec1..0000000
--- a/mock/ruby-2.0.0.353-20.el7-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-netcf-0.2.3-8.el7-x86_64.cfg
\ No newline at end of file
diff --git a/mock/transfig-3.2.5d-13.el7-x86_64.cfg b/mock/transfig-3.2.5d-13.el7-x86_64.cfg
deleted file mode 120000
index b929ec1..0000000
--- a/mock/transfig-3.2.5d-13.el7-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-netcf-0.2.3-8.el7-x86_64.cfg
\ No newline at end of file