diff --git a/mock/c7-llvm-toolset-7.0.aarch64.cfg b/mock/c7-llvm-toolset-7.0.aarch64.cfg
index 28ff87f..8022b92 100644
--- a/mock/c7-llvm-toolset-7.0.aarch64.cfg
+++ b/mock/c7-llvm-toolset-7.0.aarch64.cfg
@@ -1,7 +1,7 @@
 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  llvm-toolset-7.0-build devtoolset-7-build'
+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  llvm-toolset-7.0-build devtoolset-8-build'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['%centos_ver'] = "7"
@@ -55,9 +55,9 @@ name=c7.1804.00.aarch64
 baseurl=http://repohost/repo/c7.1804.00.aarch64/
 gpgcheck=0
 
-[c7-devtoolset-7.aarch64]
-name=c7-devtoolset-7
-baseurl=http://repohost/repo/c7-devtoolset-7.aarch64/
+[c7-devtoolset-8.aarch64]
+name=c7-devtoolset-8
+baseurl=http://repohost/repo/c7-devtoolset-8.aarch64/
 gpgcheck=0
 
 [c7-llvm-toolset-7.0.aarch64]
diff --git a/mock/c7-llvm-toolset-7.0.armhfp.cfg b/mock/c7-llvm-toolset-7.0.armhfp.cfg
index 331a69f..94fe407 100644
--- a/mock/c7-llvm-toolset-7.0.armhfp.cfg
+++ b/mock/c7-llvm-toolset-7.0.armhfp.cfg
@@ -1,7 +1,7 @@
 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  llvm-toolset-7.0-build devtoolset-7-build'
+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  llvm-toolset-7.0-build devtoolset-8-build'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['macros']['%dist'] = ".el7"
@@ -18,7 +18,7 @@ config_opts['macros']['%_host'] = "armv7hl-redhat-linux-gnu"
 #config_opts['macros']['%global _binaries_in_noarch_packages_terminate_build'] = "0"
 
 # Added for devtoolset-6
-config_opts['scl'] = "devtoolset-7"
+config_opts['scl'] = "devtoolset-8"
 
 
 # no ccache in base repo
@@ -89,9 +89,9 @@ baseurl=http://repohost/repo/c7.1804.u.armhfp/
 enabled=1
 gpgcheck=0
 
-[c7-devtoolset-7.armhfp]
-name=c7-devtoolset-7.armhfp
-baseurl=http://repohost/repo/c7-devtoolset-7.armhfp/
+[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-llvm-toolset-7.0.i386.cfg b/mock/c7-llvm-toolset-7.0.i386.cfg
index a5d35eb..eec6f1a 100644
--- a/mock/c7-llvm-toolset-7.0.i386.cfg
+++ b/mock/c7-llvm-toolset-7.0.i386.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'TARGETNAME'
 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 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 llvm-toolset-7.0-build devtoolset-7-build'
+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 llvm-toolset-7.0-build devtoolset-8-build'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['%centos_ver'] = "7"
@@ -117,10 +117,10 @@ name=c7.1804.00.i386
 enabled=1
 baseurl=http://repohost/repo/c7.1804.00.i386/
 
-[c7-devtoolset-7.i386]
-name=c7-devtoolset-7
+[c7-devtoolset-8.i386]
+name=c7-devtoolset-8
 enabled=1
-baseurl=http://repohost/repo/c7-devtoolset-7.i386/
+baseurl=http://repohost/repo/c7-devtoolset-8.i386/
 
 [c7-llvm-toolset-7.0.i386]
 name=c7-llvm-toolset-7.0
diff --git a/mock/c7-llvm-toolset-7.0.ppc.cfg b/mock/c7-llvm-toolset-7.0.ppc.cfg
index 6eb39a5..322953e 100644
--- a/mock/c7-llvm-toolset-7.0.ppc.cfg
+++ b/mock/c7-llvm-toolset-7.0.ppc.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'TARGETNAME'
 config_opts['target_arch'] = 'ppc'
 config_opts['legal_host_arches'] = ('ppc','ppc64')
-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  llvm-toolset-7.0-build devtoolst-7-build'
+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  llvm-toolset-7.0-build devtoolset-8-build'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['%centos_ver'] = "7"
@@ -56,9 +56,9 @@ name=c7.1804.00.ppc
 baseurl=http://repohost/repo/c7.1804.00.ppc/
 gpgcheck=0
 
-[c7-devtoolset-7.ppc]
-name=c7-devtoolset-7
-baseurl=http://repohost/repo/c7-devtoolset-7.ppc/
+[c7-devtoolset-8.ppc]
+name=c7-devtoolset-8
+baseurl=http://repohost/repo/c7-devtoolset-8.ppc/
 gpgcheck=0
 
 [c7-llvm-toolset-7.0.ppc]
diff --git a/mock/c7-llvm-toolset-7.0.ppc64.cfg b/mock/c7-llvm-toolset-7.0.ppc64.cfg
index 147f859..a89fc31 100644
--- a/mock/c7-llvm-toolset-7.0.ppc64.cfg
+++ b/mock/c7-llvm-toolset-7.0.ppc64.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'TARGETNAME'
 config_opts['target_arch'] = 'ppc64'
 config_opts['legal_host_arches'] = ('ppc64',)
-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 scl-utils-build  llvm-toolset-7.0-build devtoolset-7-build'
+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 scl-utils-build  llvm-toolset-7.0-build devtoolset-8-build'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['%centos_ver'] = "7"
@@ -60,9 +60,9 @@ baseurl=http://repohost/repo/c7.1804.00.ppc64/
 gpgcheck=0
 includepkgs=*.ppc64 *.noarch glibc.ppc glibc-devel.ppc nss-softokn-freebl*.ppc
 
-[c7-devtoolset-7.ppc64]
-name=c7-devtoolset-7
-baseurl=http://repohost/repo/c7-devtoolset-7.ppc64/
+[c7-devtoolset-8.ppc64]
+name=c7-devtoolset-8
+baseurl=http://repohost/repo/c7-devtoolset-8.ppc64/
 gpgcheck=0
 includepkgs=*.ppc64 *.noarch glibc.ppc glibc-devel.ppc nss-softokn-freebl*.ppc
 [c7-llvm-toolset-7.0.ppc64]
diff --git a/mock/c7-llvm-toolset-7.0.ppc64le.cfg b/mock/c7-llvm-toolset-7.0.ppc64le.cfg
index 27ead84..1105efe 100644
--- a/mock/c7-llvm-toolset-7.0.ppc64le.cfg
+++ b/mock/c7-llvm-toolset-7.0.ppc64le.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'TARGETNAME'
 config_opts['target_arch'] = 'ppc64le'
 config_opts['legal_host_arches'] = ('ppc64le',)
-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   llvm-toolset-7.0-build devtoolset-7-build'
+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   llvm-toolset-7.0-build devtoolset-8-build'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['%centos_ver'] = "7"
@@ -55,9 +55,9 @@ name=c7.1804.00.ppc64le
 baseurl=http://repohost/repo/c7.1804.00.ppc64le/
 gpgcheck=0
 
-[c7-devtoolset-7.ppc64le]
-name=c7-devtoolset-7
-baseurl=http://repohost/repo/c7-devtoolset-7.ppc64le/
+[c7-devtoolset-8.ppc64le]
+name=c7-devtoolset-8
+baseurl=http://repohost/repo/c7-devtoolset-8.ppc64le/
 gpgcheck=0
 
 [c7-llvm-toolset-7.0.ppc64le]