diff --git a/.github/workflows/android_tests.yml b/.github/workflows/android_tests.yml
index 7e7361d939..752220d19c 100644
--- a/.github/workflows/android_tests.yml
+++ b/.github/workflows/android_tests.yml
@@ -95,7 +95,7 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
index 417a0ee86e..afa3fd889b 100644
--- a/.github/workflows/asan.yml
+++ b/.github/workflows/asan.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 180
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
diff --git a/.github/workflows/cc_tests.yml b/.github/workflows/cc_tests.yml
index 76f4318675..0b3ba040f9 100644
--- a/.github/workflows/cc_tests.yml
+++ b/.github/workflows/cc_tests.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 120
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
     steps:
       - uses: actions/checkout@v1
         with:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index ff69ffc589..5014926a65 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -15,7 +15,7 @@ jobs:
       run:
         shell: bash
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
     steps:
       - uses: actions/checkout@v1
         with:
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 30137b0811..feb1a3ce83 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 45
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
       env:
         CLANG_FORMAT: /opt/llvm/bin/clang-format
         BUILDIFIER_BIN: /usr/local/bin/buildifier
diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
index 2acafe9e6c..c5fb799648 100644
--- a/.github/workflows/perf.yml
+++ b/.github/workflows/perf.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 120
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 30
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
     steps:
       - uses: actions/checkout@v1
       - uses: actions/download-artifact@v2
diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
index 1c7ce932db..31610f0849 100644
--- a/.github/workflows/python_tests.yml
+++ b/.github/workflows/python_tests.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
     steps:
       - uses: actions/checkout@v1
         with:
diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
index d305c7801b..f0150018e7 100644
--- a/.github/workflows/tsan.yml
+++ b/.github/workflows/tsan.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:8ca107a75ee98b255aa59db2ab40fd0800a3ce99
+      image: envoyproxy/envoy-build-ubuntu:a37d5f539f04b44e284953b4a075826ead117279
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
diff --git a/third_party/rbe_configs/config/BUILD b/third_party/rbe_configs/config/BUILD
index 1a8164b8da..904383b750 100644
--- a/third_party/rbe_configs/config/BUILD
+++ b/third_party/rbe_configs/config/BUILD
@@ -42,7 +42,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:4965eb16ba40bccf8dbf1cb03a544c8671e5a239396a90fd7159a24195181b2a",
+        "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:0adf2b7fe8763e971cfb8c2cb8e5792679b6ba194ae1fcfb1f2d8168ac03158b",
         "OSFamily": "Linux",
         "Pool": "linux",
     },
@@ -57,7 +57,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:4965eb16ba40bccf8dbf1cb03a544c8671e5a239396a90fd7159a24195181b2a",
+        "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:0adf2b7fe8763e971cfb8c2cb8e5792679b6ba194ae1fcfb1f2d8168ac03158b",
         "OSFamily": "Linux",
         "Pool": "linux",
         # Necessary to workaround https://github.com/google/sanitizers/issues/916, otherwise, dangling threads in the