diff --git a/envoy_build_config/BUILD b/envoy_build_config/BUILD
index b59a7dd67c..bf1a3c1282 100644
--- a/envoy_build_config/BUILD
+++ b/envoy_build_config/BUILD
@@ -26,6 +26,7 @@ envoy_cc_library(
         "@envoy//source/extensions/filters/http/router:config",
         "@envoy//source/extensions/filters/network/http_connection_manager:config",
         "@envoy//source/extensions/http/header_formatters/preserve_case:config",
+        "@envoy//source/extensions/network/dns_resolver/getaddrinfo:config",
         "@envoy//source/extensions/stat_sinks/metrics_service:config",
         "@envoy//source/extensions/stat_sinks/statsd:config",
         "@envoy//source/extensions/transport_sockets/http_11_proxy:upstream_config",
diff --git a/envoy_build_config/extension_registry.cc b/envoy_build_config/extension_registry.cc
index 6e0717e513..20667740a1 100644
--- a/envoy_build_config/extension_registry.cc
+++ b/envoy_build_config/extension_registry.cc
@@ -15,6 +15,7 @@
 #include "source/extensions/filters/network/http_connection_manager/config.h"
 #include "source/extensions/http/header_formatters/preserve_case/config.h"
 #include "source/extensions/http/original_ip_detection/xff/config.h"
+#include "source/extensions/network/dns_resolver/getaddrinfo/getaddrinfo.h"
 #include "source/extensions/stat_sinks/metrics_service/config.h"
 #include "source/extensions/transport_sockets/http_11_proxy/config.h"
 #include "source/extensions/transport_sockets/raw_buffer/config.h"
@@ -67,6 +68,7 @@ void ExtensionRegistry::registerFactories() {
   Envoy::Upstream::forceRegisterLogicalDnsClusterFactory();
   ExtensionRegistryPlatformAdditions::registerFactories();
   Router::forceRegisterUpstreamCodecFilterFactory();
+  Envoy::Network::forceRegisterGetAddrInfoDnsResolverFactory();
 
   // TODO: add a "force initialize" function to the upstream code, or clean up the upstream code
   // in such a way that does not depend on the statically initialized variable.