diff --git a/toolchains/configs/clang/bazel_3.0.0/config/BUILD b/toolchains/configs/clang/bazel_3.0.0/config/BUILD
index b36e58f2..febaaa2d 100644
--- a/toolchains/configs/clang/bazel_3.0.0/config/BUILD
+++ b/toolchains/configs/clang/bazel_3.0.0/config/BUILD
@@ -43,7 +43,7 @@ platform(
     remote_execution_properties = """
         properties: {
           name: "container-image"
-          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:b8bf2f4816376633956135738f5f0a2cd8efcaf530e16b71de3a2401f94ca52c"
+          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:74da47f083f1ef9c8d6607c0109eecca1caae1e3d3bd417c0a6b444c26b14747"
         }
         properties {
            name: "OSFamily"
diff --git a/toolchains/configs/clang/bazel_3.1.0/config/BUILD b/toolchains/configs/clang/bazel_3.1.0/config/BUILD
index fb1b50cd..e0cbe30a 100644
--- a/toolchains/configs/clang/bazel_3.1.0/config/BUILD
+++ b/toolchains/configs/clang/bazel_3.1.0/config/BUILD
@@ -43,7 +43,7 @@ platform(
     remote_execution_properties = """
         properties: {
           name: "container-image"
-          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:b8bf2f4816376633956135738f5f0a2cd8efcaf530e16b71de3a2401f94ca52c"
+          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:74da47f083f1ef9c8d6607c0109eecca1caae1e3d3bd417c0a6b444c26b14747"
         }
         properties {
            name: "OSFamily"
diff --git a/toolchains/configs/clang_libcxx/bazel_3.0.0/config/BUILD b/toolchains/configs/clang_libcxx/bazel_3.0.0/config/BUILD
index 7be59e76..ae0dd6ce 100644
--- a/toolchains/configs/clang_libcxx/bazel_3.0.0/config/BUILD
+++ b/toolchains/configs/clang_libcxx/bazel_3.0.0/config/BUILD
@@ -43,7 +43,7 @@ platform(
     remote_execution_properties = """
         properties: {
           name: "container-image"
-          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:b8bf2f4816376633956135738f5f0a2cd8efcaf530e16b71de3a2401f94ca52c"
+          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:74da47f083f1ef9c8d6607c0109eecca1caae1e3d3bd417c0a6b444c26b14747"
         }
         properties {
            name: "OSFamily"
diff --git a/toolchains/configs/clang_libcxx/bazel_3.1.0/config/BUILD b/toolchains/configs/clang_libcxx/bazel_3.1.0/config/BUILD
index 8101a999..1272d8fe 100644
--- a/toolchains/configs/clang_libcxx/bazel_3.1.0/config/BUILD
+++ b/toolchains/configs/clang_libcxx/bazel_3.1.0/config/BUILD
@@ -43,7 +43,7 @@ platform(
     remote_execution_properties = """
         properties: {
           name: "container-image"
-          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:b8bf2f4816376633956135738f5f0a2cd8efcaf530e16b71de3a2401f94ca52c"
+          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:74da47f083f1ef9c8d6607c0109eecca1caae1e3d3bd417c0a6b444c26b14747"
         }
         properties {
            name: "OSFamily"
diff --git a/toolchains/configs/gcc/bazel_3.0.0/config/BUILD b/toolchains/configs/gcc/bazel_3.0.0/config/BUILD
index 9e760a8e..34d9db4a 100644
--- a/toolchains/configs/gcc/bazel_3.0.0/config/BUILD
+++ b/toolchains/configs/gcc/bazel_3.0.0/config/BUILD
@@ -43,7 +43,7 @@ platform(
     remote_execution_properties = """
         properties: {
           name: "container-image"
-          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:b8bf2f4816376633956135738f5f0a2cd8efcaf530e16b71de3a2401f94ca52c"
+          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:74da47f083f1ef9c8d6607c0109eecca1caae1e3d3bd417c0a6b444c26b14747"
         }
         properties {
            name: "OSFamily"
diff --git a/toolchains/configs/gcc/bazel_3.1.0/config/BUILD b/toolchains/configs/gcc/bazel_3.1.0/config/BUILD
index def4b42e..c2aa2f10 100644
--- a/toolchains/configs/gcc/bazel_3.1.0/config/BUILD
+++ b/toolchains/configs/gcc/bazel_3.1.0/config/BUILD
@@ -43,7 +43,7 @@ platform(
     remote_execution_properties = """
         properties: {
           name: "container-image"
-          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:b8bf2f4816376633956135738f5f0a2cd8efcaf530e16b71de3a2401f94ca52c"
+          value:"docker://gcr.io/envoy-ci/envoy-build@sha256:74da47f083f1ef9c8d6607c0109eecca1caae1e3d3bd417c0a6b444c26b14747"
         }
         properties {
            name: "OSFamily"
diff --git a/toolchains/configs/versions.bzl b/toolchains/configs/versions.bzl
index c86975ba..1f4b1817 100644
--- a/toolchains/configs/versions.bzl
+++ b/toolchains/configs/versions.bzl
@@ -6,8 +6,8 @@ toolchain_config_spec1 = struct(config_repos = [], create_cc_configs = True, cre
 toolchain_config_spec2 = struct(config_repos = [], create_cc_configs = True, create_java_configs = False, env = {"BAZEL_COMPILER": "gcc", "BAZEL_LINKLIBS": "-l%:libstdc++.a", "BAZEL_LINKOPTS": "-lm", "CC": "gcc", "CXX": "g++", "PATH": "/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin"}, java_home = None, name = "gcc")
 _TOOLCHAIN_CONFIG_SPECS = [toolchain_config_spec0,toolchain_config_spec1,toolchain_config_spec2]
 _BAZEL_TO_CONFIG_SPEC_NAMES = {"3.0.0": ["clang", "clang_libcxx", "gcc"], "3.1.0": ["clang", "clang_libcxx", "gcc"]}
-LATEST = "sha256:b8bf2f4816376633956135738f5f0a2cd8efcaf530e16b71de3a2401f94ca52c"
-CONTAINER_TO_CONFIG_SPEC_NAMES = {"sha256:b8bf2f4816376633956135738f5f0a2cd8efcaf530e16b71de3a2401f94ca52c": ["clang", "clang_libcxx", "gcc"]}
+LATEST = "sha256:74da47f083f1ef9c8d6607c0109eecca1caae1e3d3bd417c0a6b444c26b14747"
+CONTAINER_TO_CONFIG_SPEC_NAMES = {"sha256:74da47f083f1ef9c8d6607c0109eecca1caae1e3d3bd417c0a6b444c26b14747": ["clang", "clang_libcxx", "gcc"]}
 _DEFAULT_TOOLCHAIN_CONFIG_SPEC = toolchain_config_spec0
 TOOLCHAIN_CONFIG_AUTOGEN_SPEC = struct(
         bazel_to_config_spec_names_map = _BAZEL_TO_CONFIG_SPEC_NAMES,
diff --git a/toolchains/rbe_toolchains_config.bzl b/toolchains/rbe_toolchains_config.bzl
index eff48dbe..256250b8 100644
--- a/toolchains/rbe_toolchains_config.bzl
+++ b/toolchains/rbe_toolchains_config.bzl
@@ -4,8 +4,8 @@ load("@envoy_build_tools//toolchains:configs/versions.bzl", _generated_toolchain
 
 _ENVOY_BUILD_IMAGE_REGISTRY = "gcr.io"
 _ENVOY_BUILD_IMAGE_REPOSITORY = "envoy-ci/envoy-build"
-_ENVOY_BUILD_IMAGE_DIGEST = "sha256:b8bf2f4816376633956135738f5f0a2cd8efcaf530e16b71de3a2401f94ca52c"
-_ENVOY_BUILD_IMAGE_TAG = "04f06115b6ee7cfea74930353fb47a41149cbec3"
+_ENVOY_BUILD_IMAGE_DIGEST = "sha256:74da47f083f1ef9c8d6607c0109eecca1caae1e3d3bd417c0a6b444c26b14747"
+_ENVOY_BUILD_IMAGE_TAG = "9b7dc527351b9888805377a05e5975d6ef8d6ae1"
 _CONFIGS_OUTPUT_BASE = "toolchains/configs"
 
 _CLANG_ENV = {