diff --git a/Makefile b/Makefile
index 2ddc158..6bf2c5d 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.13
+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 4169d55..ea8fef0 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -57,4 +57,4 @@ tags:
 - 'bats'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
index 9eba0ab..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.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
diff --git a/examples/agent_policy_detailed_example/README.md b/examples/agent_policy_detailed_example/README.md
index 3e2a2ff..df065ea 100644
--- a/examples/agent_policy_detailed_example/README.md
+++ b/examples/agent_policy_detailed_example/README.md
@@ -11,7 +11,7 @@ This example illustrates how to use the `agent-policy` module.
 
 ## Outputs
 
-No output.
+No outputs.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
diff --git a/examples/agent_policy_simple_example/README.md b/examples/agent_policy_simple_example/README.md
index 3e2a2ff..df065ea 100644
--- a/examples/agent_policy_simple_example/README.md
+++ b/examples/agent_policy_simple_example/README.md
@@ -11,7 +11,7 @@ This example illustrates how to use the `agent-policy` module.
 
 ## Outputs
 
-No output.
+No outputs.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
diff --git a/examples/agent_policy_update_example/README.md b/examples/agent_policy_update_example/README.md
index 6b262c6..a82d4f8 100644
--- a/examples/agent_policy_update_example/README.md
+++ b/examples/agent_policy_update_example/README.md
@@ -17,7 +17,7 @@ This example is specifically for testing update functionality.
 
 ## Outputs
 
-No output.
+No outputs.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
diff --git a/modules/agent-policy/README.md b/modules/agent-policy/README.md
index 5d58780..7c88226 100644
--- a/modules/agent-policy/README.md
+++ b/modules/agent-policy/README.md
@@ -92,7 +92,7 @@ Functional examples are included in the [examples](./../../examples) directory.
 
 ## Outputs
 
-No output.
+No outputs.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
diff --git a/modules/simple-uptime-check/outputs.tf b/modules/simple-uptime-check/outputs.tf
index 43ff2ec..ee709ce 100644
--- a/modules/simple-uptime-check/outputs.tf
+++ b/modules/simple-uptime-check/outputs.tf
@@ -26,5 +26,5 @@ output "alert_policy_id" {
 
 output "notification_channel_ids" {
   description = "The ids of the notification channels"
-  value       = values(google_monitoring_notification_channel.notification_channel).*.id
+  value       = values(google_monitoring_notification_channel.notification_channel)[*].id
 }
diff --git a/modules/simple-uptime-check/versions.tf b/modules/simple-uptime-check/versions.tf
index c96969a..233c47d 100644
--- a/modules/simple-uptime-check/versions.tf
+++ b/modules/simple-uptime-check/versions.tf
@@ -20,7 +20,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.0"
+      version = ">= 4.0, < 6"
     }
   }