diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index dce775e3e..c844d13b9 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 = "a5b712511d2b470b02f54d4be43e8b9e5647d5d6"
-ENVOY_SHA = "6c2fd534a66218de37ae312de72788c22162a85863f08ee74034d10dd1af05a7"
+ENVOY_COMMIT = "7f3da8ea87ff5a5f57e000ed0ea8a1810d086b03"
+ENVOY_SHA = "79fad722b38267ac3becd3cf93447bd3d5dd76ef8cf56aaf8e75ad1cda1b88f7"
 
 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 322f3c7bd..b23503fd4 100644
--- a/tools/code_format/config.yaml
+++ b/tools/code_format/config.yaml
@@ -102,15 +102,12 @@ paths:
     - source/common/listener_manager/filter_chain_manager_impl.cc
     - source/common/upstream/thread_aware_lb_impl.cc
     - source/common/upstream/subset_lb_config.cc
-    - source/common/upstream/load_balancer_impl.cc
     - source/common/upstream/cluster_manager_impl.cc
-    - source/common/upstream/outlier_detection_impl.cc
     - source/common/upstream/upstream_impl.cc
     - source/common/upstream/default_local_address_selector_factory.cc
     - source/common/network/listen_socket_impl.cc
     - source/common/network/io_socket_handle_base_impl.cc
     - source/common/network/address_impl.cc
-    - source/common/network/cidr_range.cc
     - source/common/network/utility.cc
     - source/common/network/dns_resolver/dns_factory_util.cc
     - source/common/network/resolver_impl.cc