diff --git a/.bazelrc b/.bazelrc
index 4e0897b09..e5a0bfa34 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -294,7 +294,7 @@ build:fuzz-coverage --test_tag_filters=-nocoverage
 # resources required to build and run the tests.
 build:fuzz-coverage --define=wasm=disabled
 build:fuzz-coverage --config=fuzz-coverage-config
-build:fuzz-coverage-config --//tools/coverage:config=//test:fuzz_coverage_config
+build:fuzz-coverage-config --//tools/coverage:config=@envoy//test:fuzz_coverage_config
 
 build:cache-local --remote_cache=grpc://localhost:9092
 
@@ -583,7 +583,7 @@ common:remote-cache-envoy-engflow --config=common-envoy-engflow
 common:remote-cache-envoy-engflow --config=cache-envoy-engflow
 
 # Specifies the rustfmt.toml for all rustfmt_test targets.
-build --@rules_rust//rust/settings:rustfmt.toml=//:rustfmt.toml
+build --@rules_rust//rust/settings:rustfmt.toml=@envoy//:rustfmt.toml
 
 #############################################################################
 # debug: Various Bazel debugging flags
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 0254764b3..cc1d6724c 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "c111d5e358e208a23403f28e55a4492f4dfe8edb"
-ENVOY_SHA = "7501b644369b1a68b74b2f52f5548a8728b80db321a4966f471028854b30fe21"
+ENVOY_COMMIT = "ea1618d7282064767bebfeba98a41de6331b9a0e"
+ENVOY_SHA = "8554628cc5dae06748e2c02745260a1ad858c0eacd530fab831e355479ce981b"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.8"  # June 18th, 2025
 HDR_HISTOGRAM_C_SHA = "bb95351a6a8b242dc9be1f28562761a84d4cf0a874ffc90a9b630770a6468e94"
diff --git a/source/client/stream_decoder.h b/source/client/stream_decoder.h
index 00eb64f30..7ddd22b48 100644
--- a/source/client/stream_decoder.h
+++ b/source/client/stream_decoder.h
@@ -84,6 +84,7 @@ class StreamDecoder : public Envoy::Http::ResponseDecoder,
   void decodeTrailers(Envoy::Http::ResponseTrailerMapPtr&& trailers) override;
   void decodeMetadata(Envoy::Http::MetadataMapPtr&&) override { PANIC("not implemented"); }
   void dumpState(std::ostream&, int) const override { PANIC("not implemented"); }
+  Envoy::Http::ResponseDecoderHandlePtr createResponseDecoderHandle() override { return nullptr; }
 
   // Http::StreamCallbacks
   void onResetStream(Envoy::Http::StreamResetReason reason,
diff --git a/tools/code_format/config.yaml b/tools/code_format/config.yaml
index 6523da836..fd6667ab1 100644
--- a/tools/code_format/config.yaml
+++ b/tools/code_format/config.yaml
@@ -318,6 +318,7 @@ paths:
     - source/common/protobuf/utility.cc
     - source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc
     - source/extensions/http/cache/file_system_http_cache/cache_file_header_proto_util.cc
+    - source/extensions/http/cache_v2/file_system_http_cache/cache_file_header_proto_util.cc
     - test/common/grpc/codec_fuzz_test.cc
     - test/common/grpc/codec_test.cc
     - test/common/protobuf/utility_test.cc
@@ -326,6 +327,7 @@ paths:
     - test/extensions/filters/common/expr/context_test.cc
     - test/extensions/filters/http/common/fuzz/uber_filter.h
     - test/extensions/http/cache/file_system_http_cache/cache_file_header_proto_util_test.cc
+    - test/extensions/http/cache_v2/file_system_http_cache/cache_file_header_proto_util_test.cc
     - test/tools/router_check/router_check.cc
     - source/extensions/bootstrap/reverse_tunnel/downstream_socket_interface/rc_connection_wrapper.cc
     - test/extensions/bootstrap/reverse_tunnel/downstream_socket_interface/rc_connection_wrapper_test.cc