diff --git a/Makefile b/Makefile
index 3316fcc..cac9cf8 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.14
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
index 9f0664d..f002a88 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -38,4 +38,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
index 52b6f68..61c0911 100644
--- a/build/lint.cloudbuild.yaml
+++ b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.14'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
diff --git a/outputs.tf b/outputs.tf
index 3e01bf7..fd98428 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -24,12 +24,12 @@ output "name" {
 
   value = element(
     concat(
-      google_dns_managed_zone.peering.*.name,
-      google_dns_managed_zone.forwarding.*.name,
-      google_dns_managed_zone.private.*.name,
-      google_dns_managed_zone.public.*.name,
-      google_dns_managed_zone.reverse_lookup.*.name,
-      google_dns_managed_zone.service_directory.*.name
+      google_dns_managed_zone.peering[*].name,
+      google_dns_managed_zone.forwarding[*].name,
+      google_dns_managed_zone.private[*].name,
+      google_dns_managed_zone.public[*].name,
+      google_dns_managed_zone.reverse_lookup[*].name,
+      google_dns_managed_zone.service_directory[*].name
     ),
     0,
   )
@@ -40,12 +40,12 @@ output "domain" {
 
   value = element(
     concat(
-      google_dns_managed_zone.peering.*.dns_name,
-      google_dns_managed_zone.forwarding.*.dns_name,
-      google_dns_managed_zone.private.*.dns_name,
-      google_dns_managed_zone.public.*.dns_name,
-      google_dns_managed_zone.reverse_lookup.*.dns_name,
-      google_dns_managed_zone.service_directory.*.dns_name
+      google_dns_managed_zone.peering[*].dns_name,
+      google_dns_managed_zone.forwarding[*].dns_name,
+      google_dns_managed_zone.private[*].dns_name,
+      google_dns_managed_zone.public[*].dns_name,
+      google_dns_managed_zone.reverse_lookup[*].dns_name,
+      google_dns_managed_zone.service_directory[*].dns_name
     ),
     0,
   )
@@ -56,12 +56,12 @@ output "name_servers" {
 
   value = flatten(
     concat(
-      google_dns_managed_zone.peering.*.name_servers,
-      google_dns_managed_zone.forwarding.*.name_servers,
-      google_dns_managed_zone.private.*.name_servers,
-      google_dns_managed_zone.public.*.name_servers,
-      google_dns_managed_zone.reverse_lookup.*.name_servers,
-      google_dns_managed_zone.service_directory.*.name_servers
+      google_dns_managed_zone.peering[*].name_servers,
+      google_dns_managed_zone.forwarding[*].name_servers,
+      google_dns_managed_zone.private[*].name_servers,
+      google_dns_managed_zone.public[*].name_servers,
+      google_dns_managed_zone.reverse_lookup[*].name_servers,
+      google_dns_managed_zone.service_directory[*].name_servers
     ),
   )
 }