diff --git a/autogen/main/outputs.tf.tmpl b/autogen/main/outputs.tf.tmpl
index ca912ef9d..3899ddfef 100644
--- a/autogen/main/outputs.tf.tmpl
+++ b/autogen/main/outputs.tf.tmpl
@@ -54,7 +54,7 @@ output "endpoint" {
     */
     google_container_cluster.primary,
     google_container_node_pool.pools,
-    null_resource.wait_for_cluster.id,
+    module.gcloud_wait_for_cluster.wait,
   ]
 }
 
diff --git a/modules/beta-private-cluster-update-variant/outputs.tf b/modules/beta-private-cluster-update-variant/outputs.tf
index 908051f6c..4f7b9196c 100644
--- a/modules/beta-private-cluster-update-variant/outputs.tf
+++ b/modules/beta-private-cluster-update-variant/outputs.tf
@@ -54,7 +54,7 @@ output "endpoint" {
     */
     google_container_cluster.primary,
     google_container_node_pool.pools,
-    null_resource.wait_for_cluster.id,
+    module.gcloud_wait_for_cluster.wait,
   ]
 }
 
diff --git a/modules/beta-private-cluster/outputs.tf b/modules/beta-private-cluster/outputs.tf
index 908051f6c..4f7b9196c 100644
--- a/modules/beta-private-cluster/outputs.tf
+++ b/modules/beta-private-cluster/outputs.tf
@@ -54,7 +54,7 @@ output "endpoint" {
     */
     google_container_cluster.primary,
     google_container_node_pool.pools,
-    null_resource.wait_for_cluster.id,
+    module.gcloud_wait_for_cluster.wait,
   ]
 }
 
diff --git a/modules/beta-public-cluster-update-variant/outputs.tf b/modules/beta-public-cluster-update-variant/outputs.tf
index 5ded07d53..57172b134 100644
--- a/modules/beta-public-cluster-update-variant/outputs.tf
+++ b/modules/beta-public-cluster-update-variant/outputs.tf
@@ -54,7 +54,7 @@ output "endpoint" {
     */
     google_container_cluster.primary,
     google_container_node_pool.pools,
-    null_resource.wait_for_cluster.id,
+    module.gcloud_wait_for_cluster.wait,
   ]
 }
 
diff --git a/modules/beta-public-cluster/outputs.tf b/modules/beta-public-cluster/outputs.tf
index 5ded07d53..57172b134 100644
--- a/modules/beta-public-cluster/outputs.tf
+++ b/modules/beta-public-cluster/outputs.tf
@@ -54,7 +54,7 @@ output "endpoint" {
     */
     google_container_cluster.primary,
     google_container_node_pool.pools,
-    null_resource.wait_for_cluster.id,
+    module.gcloud_wait_for_cluster.wait,
   ]
 }
 
diff --git a/modules/private-cluster-update-variant/outputs.tf b/modules/private-cluster-update-variant/outputs.tf
index 051cbb6aa..e88ca49e3 100644
--- a/modules/private-cluster-update-variant/outputs.tf
+++ b/modules/private-cluster-update-variant/outputs.tf
@@ -54,7 +54,7 @@ output "endpoint" {
     */
     google_container_cluster.primary,
     google_container_node_pool.pools,
-    null_resource.wait_for_cluster.id,
+    module.gcloud_wait_for_cluster.wait,
   ]
 }
 
diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf
index 051cbb6aa..e88ca49e3 100644
--- a/modules/private-cluster/outputs.tf
+++ b/modules/private-cluster/outputs.tf
@@ -54,7 +54,7 @@ output "endpoint" {
     */
     google_container_cluster.primary,
     google_container_node_pool.pools,
-    null_resource.wait_for_cluster.id,
+    module.gcloud_wait_for_cluster.wait,
   ]
 }
 
diff --git a/outputs.tf b/outputs.tf
index 4ba8c1d30..64263516b 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -54,7 +54,7 @@ output "endpoint" {
     */
     google_container_cluster.primary,
     google_container_node_pool.pools,
-    null_resource.wait_for_cluster.id,
+    module.gcloud_wait_for_cluster.wait,
   ]
 }