diff --git a/java/google/registry/proxy/terraform/modules/dns.tf b/java/google/registry/proxy/terraform/modules/dns.tf
deleted file mode 100644
index 5ac480799..000000000
--- a/java/google/registry/proxy/terraform/modules/dns.tf
+++ /dev/null
@@ -1,36 +0,0 @@
-resource "google_dns_managed_zone" "proxy_domain" {
-  name     = "proxy-domain"
-  dns_name = "${var.proxy_domain_name}."
-}
-
-resource "google_dns_record_set" "proxy_epp_a_record" {
-  name         = "epp.${google_dns_managed_zone.proxy_domain.dns_name}"
-  type         = "A"
-  ttl          = 300
-  managed_zone = "${google_dns_managed_zone.proxy_domain.name}"
-  rrdatas      = ["${module.proxy_networking.proxy_ipv4_address}"]
-}
-
-resource "google_dns_record_set" "proxy_epp_aaaa_record" {
-  name         = "epp.${google_dns_managed_zone.proxy_domain.dns_name}"
-  type         = "AAAA"
-  ttl          = 300
-  managed_zone = "${google_dns_managed_zone.proxy_domain.name}"
-  rrdatas      = ["${module.proxy_networking.proxy_ipv6_address}"]
-}
-
-resource "google_dns_record_set" "proxy_whois_a_record" {
-  name         = "whois.${google_dns_managed_zone.proxy_domain.dns_name}"
-  type         = "A"
-  ttl          = 300
-  managed_zone = "${google_dns_managed_zone.proxy_domain.name}"
-  rrdatas      = ["${module.proxy_networking.proxy_ipv4_address}"]
-}
-
-resource "google_dns_record_set" "proxy_whois_aaaa_record" {
-  name         = "whois.${google_dns_managed_zone.proxy_domain.dns_name}"
-  type         = "AAAA"
-  ttl          = 300
-  managed_zone = "${google_dns_managed_zone.proxy_domain.name}"
-  rrdatas      = ["${module.proxy_networking.proxy_ipv6_address}"]
-}
diff --git a/java/google/registry/proxy/terraform/modules/networking.tf b/java/google/registry/proxy/terraform/modules/networking.tf
index 2c797cad8..41550093a 100644
--- a/java/google/registry/proxy/terraform/modules/networking.tf
+++ b/java/google/registry/proxy/terraform/modules/networking.tf
@@ -1,7 +1,14 @@
+resource "google_dns_managed_zone" "proxy_domain" {
+  name     = "proxy-domain"
+  dns_name = "${var.proxy_domain_name}."
+}
+
 module "proxy_networking" {
   source                = "./networking"
   proxy_instance_groups = "${local.proxy_instance_groups}"
   proxy_ports           = "${var.proxy_ports}"
+  proxy_domain          = "${google_dns_managed_zone.proxy_domain.name}"
+  proxy_domain_name     = "${google_dns_managed_zone.proxy_domain.dns_name}"
 }
 
 module "proxy_networking_canary" {
@@ -9,4 +16,6 @@ module "proxy_networking_canary" {
   proxy_instance_groups = "${local.proxy_instance_groups}"
   suffix                = "-canary"
   proxy_ports           = "${var.proxy_ports_canary}"
+  proxy_domain          = "${google_dns_managed_zone.proxy_domain.name}"
+  proxy_domain_name     = "${google_dns_managed_zone.proxy_domain.dns_name}"
 }