diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index fff6526cc..d57a3d8d9 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 = "ee7991d50eb146c89fe801e4cd9a45e311bbbf0a"
-ENVOY_SHA = "5af3647d5a8b6c6cea51ad88e4c8d1fe17eda3ff3a0782c0b0ffb5ba1cb70f9b"
+ENVOY_COMMIT = "a298895dd66a8df6ff834c5d646c38e0fc21e105"
+ENVOY_SHA = "be5954a2e19d02a418f036fff46674ff9d764c55a9632b8f342566739e3420e2"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.2"  # October 12th, 2020
 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
diff --git a/tools/code_format/config.yaml b/tools/code_format/config.yaml
index 3d8d08af1..ae67bc1a2 100644
--- a/tools/code_format/config.yaml
+++ b/tools/code_format/config.yaml
@@ -100,7 +100,6 @@ paths:
     # StausOr where possible.
     - source/common/router/route_config_update_receiver_impl.cc
     - source/common/listener_manager/listener_impl.cc
-    - source/common/listener_manager/listener_manager_impl.cc
     - source/common/upstream/cluster_manager_impl.cc
     - source/common/upstream/upstream_impl.cc
     - source/common/network/listen_socket_impl.cc