diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 506fb623e..0a5c90b65 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 = "77709fee8ccf4e6e24572c38d10b6fe880b68d0d"
-ENVOY_SHA = "fb2dfee46db50913e2aa1a67ca284e3eee7bca3bf292db33f6a5fd8d70e04548"
+ENVOY_COMMIT = "d79d5543a785e28cfb725e235d5bc0eb8db2f200"
+ENVOY_SHA = "269895430ede3105463e66bdd45e98c4f13d6dfaaf6cd65144fdba87635e3bd7"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.2"  # October 12th, 2020
 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
diff --git a/extensions_build_config.bzl b/extensions_build_config.bzl
index db0d13a2e..c866d7abf 100644
--- a/extensions_build_config.bzl
+++ b/extensions_build_config.bzl
@@ -7,6 +7,9 @@ EXTENSIONS = {
     "envoy.tracers.zipkin": "//source/extensions/tracers/zipkin:config",
     "envoy.transport_sockets.raw_buffer": "//source/extensions/transport_sockets/raw_buffer:config",
     "envoy.access_loggers.file": "//source/extensions/access_loggers/file:config",
+    "envoy.clusters.static": "//source/extensions/clusters/static:static_cluster_lib",
+    "envoy.clusters.strict_dns": "//source/extensions/clusters/strict_dns:strict_dns_cluster_lib",
+    "envoy.network.dns_resolver.cares": "//source/extensions/network/dns_resolver/cares:config",
 }
 
 DISABLED_BY_DEFAULT_EXTENSIONS = {
diff --git a/requirements.txt b/requirements.txt
index 46221e318..06b232b2f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,4 +23,4 @@ execnet==1.9.0
 tomli==2.0.1
 pyparsing==3.0.7
 charset_normalizer==3.0.0
-exceptiongroup==1.0.0
\ No newline at end of file
+exceptiongroup==1.0.0
diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc
index 94b93a7dd..ed7863cb1 100644
--- a/source/client/process_impl.cc
+++ b/source/client/process_impl.cc
@@ -732,9 +732,10 @@ bool ProcessImpl::runInternal(OutputCollector& collector, const UriPtr& tracing_
     server_factory_context_ = std::make_unique<NighthawkServerFactoryContext>(*server_);
     cluster_manager_factory_ = std::make_unique<ClusterManagerFactory>(
         *server_factory_context_, admin_, Envoy::Runtime::LoaderSingleton::get(), store_root_, tls_,
-        dns_resolver, *ssl_context_manager_, *dispatcher_, *local_info_, secret_manager_,
-        validation_context_, *api_, http_context_, grpc_context_, router_context_,
-        access_log_manager_, *singleton_manager_, envoy_options_, quic_stat_names_, *server_);
+        [dns_resolver]() -> Envoy::Network::DnsResolverSharedPtr { return dns_resolver; },
+        *ssl_context_manager_, *dispatcher_, *local_info_, secret_manager_, validation_context_,
+        *api_, http_context_, grpc_context_, router_context_, access_log_manager_,
+        *singleton_manager_, envoy_options_, quic_stat_names_, *server_);
     cluster_manager_factory_->setConnectionReuseStrategy(
         options_.h1ConnectionReuseStrategy() == nighthawk::client::H1ConnectionReuseStrategy::LRU
             ? Http1PoolImpl::ConnectionReuseStrategy::LRU
diff --git a/tools/code_format/config.yaml b/tools/code_format/config.yaml
index 9bc4ff65c..a061507a0 100644
--- a/tools/code_format/config.yaml
+++ b/tools/code_format/config.yaml
@@ -304,7 +304,10 @@ unsorted_flags:
 # https://github.com/envoyproxy/envoy/issues/9953
 # PLEASE DO NOT ADD FILES TO THIS LIST WITHOUT SENIOR MAINTAINER APPROVAL
 visibility_excludes:
+- source/extensions/clusters/strict_dns/
+- source/extensions/clusters/static/
 - source/extensions/clusters/original_dst/
+- source/extensions/clusters/logical_dns/
 - source/extensions/early_data/BUILD
 - source/extensions/filters/http/buffer/BUILD
 - source/extensions/filters/network/common/BUILD