diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
index 15bf8d642..76eaf54f6 100644
--- a/autogen/main/cluster.tf.tmpl
+++ b/autogen/main/cluster.tf.tmpl
@@ -495,13 +495,18 @@ resource "google_container_node_pool" "pools" {
 resource "null_resource" "wait_for_cluster" {
   count = var.skip_provisioners ? 0 : 1
 
+  triggers = {
+    project_id = var.project_id
+    name       = var.name
+  }
+
   provisioner "local-exec" {
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   depends_on = [
diff --git a/cluster.tf b/cluster.tf
index 7046a2414..e65dcc682 100644
--- a/cluster.tf
+++ b/cluster.tf
@@ -227,13 +227,18 @@ resource "google_container_node_pool" "pools" {
 resource "null_resource" "wait_for_cluster" {
   count = var.skip_provisioners ? 0 : 1
 
+  triggers = {
+    project_id = var.project_id
+    name       = var.name
+  }
+
   provisioner "local-exec" {
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   depends_on = [
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
index 961b18073..ae28cc0a8 100644
--- a/modules/beta-private-cluster-update-variant/cluster.tf
+++ b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -447,13 +447,18 @@ resource "google_container_node_pool" "pools" {
 resource "null_resource" "wait_for_cluster" {
   count = var.skip_provisioners ? 0 : 1
 
+  triggers = {
+    project_id = var.project_id
+    name       = var.name
+  }
+
   provisioner "local-exec" {
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   depends_on = [
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
index b75eb1a54..2cc0c2b85 100644
--- a/modules/beta-private-cluster/cluster.tf
+++ b/modules/beta-private-cluster/cluster.tf
@@ -374,13 +374,18 @@ resource "google_container_node_pool" "pools" {
 resource "null_resource" "wait_for_cluster" {
   count = var.skip_provisioners ? 0 : 1
 
+  triggers = {
+    project_id = var.project_id
+    name       = var.name
+  }
+
   provisioner "local-exec" {
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   depends_on = [
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
index 496f60f11..92b515f96 100644
--- a/modules/beta-public-cluster/cluster.tf
+++ b/modules/beta-public-cluster/cluster.tf
@@ -361,13 +361,18 @@ resource "google_container_node_pool" "pools" {
 resource "null_resource" "wait_for_cluster" {
   count = var.skip_provisioners ? 0 : 1
 
+  triggers = {
+    project_id = var.project_id
+    name       = var.name
+  }
+
   provisioner "local-exec" {
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   depends_on = [
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
index f4abd61db..139e79ea7 100644
--- a/modules/private-cluster-update-variant/cluster.tf
+++ b/modules/private-cluster-update-variant/cluster.tf
@@ -313,13 +313,18 @@ resource "google_container_node_pool" "pools" {
 resource "null_resource" "wait_for_cluster" {
   count = var.skip_provisioners ? 0 : 1
 
+  triggers = {
+    project_id = var.project_id
+    name       = var.name
+  }
+
   provisioner "local-exec" {
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   depends_on = [
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
index 32dc76bf2..877df33c4 100644
--- a/modules/private-cluster/cluster.tf
+++ b/modules/private-cluster/cluster.tf
@@ -240,13 +240,18 @@ resource "google_container_node_pool" "pools" {
 resource "null_resource" "wait_for_cluster" {
   count = var.skip_provisioners ? 0 : 1
 
+  triggers = {
+    project_id = var.project_id
+    name       = var.name
+  }
+
   provisioner "local-exec" {
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   provisioner "local-exec" {
     when    = destroy
-    command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
+    command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
   }
 
   depends_on = [