diff --git a/.bazelrc b/.bazelrc
index aa0bd78598253..c05b18d033100 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -265,7 +265,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:55d9e4719d2bd0accce8f829b44dab70cd42112a
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:a4bc794b2b87e01cff1c5fe9f9a118b64b0759ce
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 378a45b4f1af2..e1efd443bfba4 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:55d9e4719d2bd0accce8f829b44dab70cd42112a
+FROM gcr.io/envoy-ci/envoy-build:a4bc794b2b87e01cff1c5fe9f9a118b64b0759ce
 
 ARG USERNAME=vscode
 ARG USER_UID=501
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index b817e6efffab7..f93bc85e2aee0 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -65,11 +65,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "envoy-build-tools",
         project_desc = "Common build tools shared by the Envoy/UDPA ecosystem",
         project_url = "https://github.com/envoyproxy/envoy-build-tools",
-        version = "a955a00bed5f35777a83899ee680f8530eee4718",
-        sha256 = "b0830dc6fc1e3a095c5d817ca768c89c407bdd71894e1641daf500d28cb269da",
+        version = "71b7254b3c4d9428704b49ccf200c404b3fb7e8c",
+        sha256 = "b479e1401e9f58e6f1a47da6e29257d7e7fe395dde0ba7cfedc57fd5a8534155",
         strip_prefix = "envoy-build-tools-{version}",
         urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"],
-        release_date = "2021-05-25",
+        release_date = "2021-09-09",
         use_category = ["build"],
     ),
     boringssl = dict(
diff --git a/examples/wasm-cc/docker-compose-wasm.yaml b/examples/wasm-cc/docker-compose-wasm.yaml
index 072928843f428..9481821a47645 100644
--- a/examples/wasm-cc/docker-compose-wasm.yaml
+++ b/examples/wasm-cc/docker-compose-wasm.yaml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   wasm_compile_update:
-    image: envoyproxy/envoy-build-ubuntu:55d9e4719d2bd0accce8f829b44dab70cd42112a
+    image: envoyproxy/envoy-build-ubuntu:a4bc794b2b87e01cff1c5fe9f9a118b64b0759ce
     command: |
       bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_updated_example.wasm && cp -a bazel-bin/examples/wasm-cc/* /build"
     working_dir: /source
@@ -11,7 +11,7 @@ services:
     - ./lib:/build
 
   wasm_compile:
-    image: envoyproxy/envoy-build-ubuntu:55d9e4719d2bd0accce8f829b44dab70cd42112a
+    image: envoyproxy/envoy-build-ubuntu:a4bc794b2b87e01cff1c5fe9f9a118b64b0759ce
     command: |
       bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_example.wasm && cp -a bazel-bin/examples/wasm-cc/* /build"
     working_dir: /source