diff --git a/Builds/containers/centos-builder/centos_setup.sh b/Builds/containers/centos-builder/centos_setup.sh
index fb7fd4f1ca..4a864d436f 100755
--- a/Builds/containers/centos-builder/centos_setup.sh
+++ b/Builds/containers/centos-builder/centos_setup.sh
@@ -10,6 +10,8 @@ yum -y install \
     wget curl time gcc-c++ time yum-utils \
     libstdc++-static rpm-build gnupg which make cmake \
     devtoolset-7 devtoolset-7-gdb devtoolset-7-libasan-devel devtoolset-7-libtsan-devel devtoolset-7-libubsan-devel \
+    devtoolset-8 devtoolset-8-gdb devtoolset-8-binutils devtoolset-8-libstdc++-devel \
+    devtoolset-8-libasan-devel devtoolset-8-libtsan-devel devtoolset-8-libubsan-devel devtoolset-8-liblsan-devel \
     flex flex-devel bison bison-devel parallel \
     ncurses ncurses-devel ncurses-libs graphviz graphviz-devel \
     lzip p7zip bzip2 bzip2-devel lzma-sdk lzma-sdk-devel xz-devel \
@@ -29,10 +31,9 @@ if [ "${CI_USE}" = true ] ; then
     yum -y install ftp://ftp.pbone.net/mirror/archive.fedoraproject.org/fedora-secondary/updates/26/i386/Packages/p/python2-six-1.10.0-9.fc26.noarch.rpm
 
     yum -y install \
-        devtoolset-4 devtoolset-4-gdb devtoolset-4-libasan-devel devtoolset-4-libtsan-devel devtoolset-4-libubsan-devel \
-        devtoolset-6 devtoolset-6-gdb devtoolset-6-libasan-devel devtoolset-6-libtsan-devel devtoolset-6-libubsan-devel \
         llvm-toolset-7 llvm-toolset-7-runtime llvm-toolset-7-build llvm-toolset-7-clang \
         llvm-toolset-7-clang-analyzer llvm-toolset-7-clang-devel llvm-toolset-7-clang-libs \
         llvm-toolset-7-clang-tools-extra llvm-toolset-7-compiler-rt llvm-toolset-7-lldb \
-        llvm-toolset-7-lldb-devel llvm-toolset-7-python-lldb 
+        llvm-toolset-7-lldb-devel llvm-toolset-7-python-lldb
+
 fi
diff --git a/Builds/containers/packaging/dpkg/build_dpkg.sh b/Builds/containers/packaging/dpkg/build_dpkg.sh
index 0b5b8ca034..d3b5f11fe1 100755
--- a/Builds/containers/packaging/dpkg/build_dpkg.sh
+++ b/Builds/containers/packaging/dpkg/build_dpkg.sh
@@ -40,6 +40,8 @@ CHANGELOG
 # PATH must be preserved for our more modern cmake in /opt/local
 # TODO : consider allowing lintian to run in future ?
 export DH_BUILD_DDEBS=1
+export CC=gcc-8
+export CXX=g++-8
 debuild --no-lintian --preserve-envvar PATH --preserve-env -us -uc
 rc=$?; if [[ $rc != 0 ]]; then
     error "error building dpkg"
diff --git a/Builds/containers/packaging/rpm/build_rpm.sh b/Builds/containers/packaging/rpm/build_rpm.sh
index 4396f20f49..8c5c0a57d3 100755
--- a/Builds/containers/packaging/rpm/build_rpm.sh
+++ b/Builds/containers/packaging/rpm/build_rpm.sh
@@ -34,7 +34,7 @@ git archive --format tar.gz --prefix rippled/ -o ../rpmbuild/SOURCES/rippled.tar
 cd ..
 tar -zc --exclude-vcs -f ./rpmbuild/SOURCES/validator-keys.tar.gz validator-keys-tool/
 
-source /opt/rh/devtoolset-7/enable
+source /opt/rh/devtoolset-8/enable
 
 rpmbuild --define "_topdir ${PWD}/rpmbuild" -ba rippled.spec
 rc=$?; if [[ $rc != 0 ]]; then
diff --git a/Builds/containers/ubuntu-builder/Dockerfile b/Builds/containers/ubuntu-builder/Dockerfile
index 2f13b6c673..1083a34183 100644
--- a/Builds/containers/ubuntu-builder/Dockerfile
+++ b/Builds/containers/ubuntu-builder/Dockerfile
@@ -30,5 +30,7 @@ COPY shared/update_sources.sh ./
 COPY shared/rippled.service /opt/rippled_bld/pkg/debian/
 
 COPY packaging/dpkg/build_dpkg.sh ./
+RUN update-alternatives --set gcc /usr/bin/gcc-8
+
 CMD ./build_dpkg.sh