diff --git a/.bazelrc b/.bazelrc
index 51f693e14351..c7d60664f3a3 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -397,7 +397,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request
 
 # 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:cb86d91cf406995012e330ab58830e6ee10240cb@sha256:d38457962937370aa867620a5cc7d01c568621fc0d1a57e044847599372a8571
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:829698e9a36d266a1497fa222216a2ae91632ffe@sha256:5803eab46f55f3607184a04d8bd1c24fbd15ac3da4fd3057982f9ea901e6a5a8
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker
@@ -567,7 +567,7 @@ common:bes-envoy-engflow --bes_timeout=3600s
 common:bes-envoy-engflow --bes_upload_mode=fully_async
 common:bes-envoy-engflow --nolegacy_important_outputs
 common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com
-common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da
+common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:f9070f04d10ab2f7a0a7a679add13f7bd3ff6654a454e9d52b50e46025e6a28f
 common:rbe-envoy-engflow --jobs=200
 common:rbe-envoy-engflow --define=engflow_rbe=true
 
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7dd0a164394b..3b962f346a1e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:cb86d91cf406995012e330ab58830e6ee10240cb@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da
+FROM gcr.io/envoy-ci/envoy-build:829698e9a36d266a1497fa222216a2ae91632ffe@sha256:f9070f04d10ab2f7a0a7a679add13f7bd3ff6654a454e9d52b50e46025e6a28f
 
 ARG USERNAME=vscode
 ARG USER_UID=501
diff --git a/.github/config.yml b/.github/config.yml
index beab75581347..41f0e7774d22 100644
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -2,11 +2,11 @@ agent-ubuntu: ubuntu-24.04
 build-image:
   # Authoritative configuration for build image/s
   repo: envoyproxy/envoy-build-ubuntu
-  sha: d38457962937370aa867620a5cc7d01c568621fc0d1a57e044847599372a8571
-  mobile-sha: 5ff2c9ce8f3abdb89d305095a39fd0e7ee97422cc017d9578e738f9a56bc33d8
+  sha: 5803eab46f55f3607184a04d8bd1c24fbd15ac3da4fd3057982f9ea901e6a5a8
+  mobile-sha: 4543594d2fa8092ed2446cf473fb6604aea5df5e2f8fcd06beaac2bc4933f689
   # this is authoritative, but is not currently used in github ci
-  gcr-sha: 56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da
-  tag: cb86d91cf406995012e330ab58830e6ee10240cb
+  gcr-sha: f9070f04d10ab2f7a0a7a679add13f7bd3ff6654a454e9d52b50e46025e6a28f
+  tag: 829698e9a36d266a1497fa222216a2ae91632ffe
 
 config:
   envoy:
diff --git a/bazel/rbe/toolchains/configs/linux/clang/config/BUILD b/bazel/rbe/toolchains/configs/linux/clang/config/BUILD
index 611122b2cb03..3e6b961176f6 100755
--- a/bazel/rbe/toolchains/configs/linux/clang/config/BUILD
+++ b/bazel/rbe/toolchains/configs/linux/clang/config/BUILD
@@ -45,7 +45,7 @@ platform(
     ],
     exec_properties = {
         "cache-silo-key": CACHE_SILO_KEY,
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da",
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:f9070f04d10ab2f7a0a7a679add13f7bd3ff6654a454e9d52b50e46025e6a28f",
         "OSFamily": "Linux",
     },
     parents = ["@local_config_platform//:host"],
diff --git a/bazel/rbe/toolchains/configs/linux/clang_libcxx/config/BUILD b/bazel/rbe/toolchains/configs/linux/clang_libcxx/config/BUILD
index f0ec522f2d98..c0f2eedc0b84 100755
--- a/bazel/rbe/toolchains/configs/linux/clang_libcxx/config/BUILD
+++ b/bazel/rbe/toolchains/configs/linux/clang_libcxx/config/BUILD
@@ -45,7 +45,7 @@ platform(
     ],
     exec_properties = {
         "cache-silo-key": CACHE_SILO_KEY,
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da",
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:f9070f04d10ab2f7a0a7a679add13f7bd3ff6654a454e9d52b50e46025e6a28f",
         "OSFamily": "Linux",
     },
     parents = ["@local_config_platform//:host"],
@@ -74,7 +74,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da",
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:f9070f04d10ab2f7a0a7a679add13f7bd3ff6654a454e9d52b50e46025e6a28f",
         "OSFamily": "Linux",
         "Pool": "arm",
     },
diff --git a/bazel/rbe/toolchains/configs/linux/gcc/config/BUILD b/bazel/rbe/toolchains/configs/linux/gcc/config/BUILD
index 496ba319d412..25491771a728 100755
--- a/bazel/rbe/toolchains/configs/linux/gcc/config/BUILD
+++ b/bazel/rbe/toolchains/configs/linux/gcc/config/BUILD
@@ -42,7 +42,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da",
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:f9070f04d10ab2f7a0a7a679add13f7bd3ff6654a454e9d52b50e46025e6a28f",
         "OSFamily": "Linux",
     },
     parents = ["@local_config_platform//:host"],
diff --git a/mobile/third_party/rbe_configs/config/BUILD b/mobile/third_party/rbe_configs/config/BUILD
index 667dd20220cd..fae6f5b3138a 100644
--- a/mobile/third_party/rbe_configs/config/BUILD
+++ b/mobile/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:mobile-cb86d91cf406995012e330ab58830e6ee10240cb@sha256:5ff2c9ce8f3abdb89d305095a39fd0e7ee97422cc017d9578e738f9a56bc33d8",
+        "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-829698e9a36d266a1497fa222216a2ae91632ffe@sha256:4543594d2fa8092ed2446cf473fb6604aea5df5e2f8fcd06beaac2bc4933f689",
         "OSFamily": "Linux",
         "Pool": "linux",
     },
@@ -57,7 +57,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-cb86d91cf406995012e330ab58830e6ee10240cb@sha256:5ff2c9ce8f3abdb89d305095a39fd0e7ee97422cc017d9578e738f9a56bc33d8",
+        "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-829698e9a36d266a1497fa222216a2ae91632ffe@sha256:4543594d2fa8092ed2446cf473fb6604aea5df5e2f8fcd06beaac2bc4933f689",
         "OSFamily": "Linux",
         "Pool": "linux",
         # Necessary to workaround https://github.com/google/sanitizers/issues/916, otherwise, dangling threads in the
diff --git a/test/run_envoy_bazel_coverage.sh b/test/run_envoy_bazel_coverage.sh
index 1c436572de3e..0395e0df5384 100755
--- a/test/run_envoy_bazel_coverage.sh
+++ b/test/run_envoy_bazel_coverage.sh
@@ -113,7 +113,7 @@ else
     cp bazel-out/_coverage/_coverage_report.dat "${COVERAGE_DATA}"
 fi
 
-COVERAGE_VALUE="$(genhtml --prefix "${PWD}" --output "${COVERAGE_DIR}" "${COVERAGE_DATA}" | tee /dev/stderr | grep lines... | cut -d ' ' -f 4)"
+COVERAGE_VALUE="$(genhtml --ignore-errors corrupt,inconsistent --prefix "${PWD}" --output "${COVERAGE_DIR}" "${COVERAGE_DATA}" | tee /dev/stderr | grep lines... | cut -d ' ' -f 4)"
 COVERAGE_VALUE=${COVERAGE_VALUE%?}
 
 echo "Compressing coveraged data"