diff --git a/autogen/cluster_regional.tf b/autogen/cluster_regional.tf
index cf1c427b5f..d4b17b8cf0 100644
--- a/autogen/cluster_regional.tf
+++ b/autogen/cluster_regional.tf
@@ -103,7 +103,7 @@ resource "google_container_node_pool" "pools" {
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
   region             = "${var.region}"
-  cluster            = "${var.name}"
+  cluster            = "${google_container_cluster.primary.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_regional)}"
   initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
@@ -144,8 +144,6 @@ resource "google_container_node_pool" "pools" {
     update = "30m"
     delete = "30m"
   }
-
-  depends_on = ["google_container_cluster.primary"]
 }
 
 resource "null_resource" "wait_for_regional_cluster" {
diff --git a/autogen/cluster_zonal.tf b/autogen/cluster_zonal.tf
index d56191b222..da99b4b43f 100644
--- a/autogen/cluster_zonal.tf
+++ b/autogen/cluster_zonal.tf
@@ -103,7 +103,7 @@ resource "google_container_node_pool" "zonal_pools" {
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
   zone               = "${var.zones[0]}"
-  cluster            = "${var.name}"
+  cluster            = "${google_container_cluster.zonal_primary.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_zonal)}"
   initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
@@ -144,8 +144,6 @@ resource "google_container_node_pool" "zonal_pools" {
     update = "30m"
     delete = "30m"
   }
-
-  depends_on = ["google_container_cluster.zonal_primary"]
 }
 
 resource "null_resource" "wait_for_zonal_cluster" {
diff --git a/cluster_regional.tf b/cluster_regional.tf
index 2446483943..f31877961a 100644
--- a/cluster_regional.tf
+++ b/cluster_regional.tf
@@ -96,7 +96,7 @@ resource "google_container_node_pool" "pools" {
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
   region             = "${var.region}"
-  cluster            = "${var.name}"
+  cluster            = "${google_container_cluster.primary.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_regional)}"
   initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
@@ -137,8 +137,6 @@ resource "google_container_node_pool" "pools" {
     update = "30m"
     delete = "30m"
   }
-
-  depends_on = ["google_container_cluster.primary"]
 }
 
 resource "null_resource" "wait_for_regional_cluster" {
diff --git a/cluster_zonal.tf b/cluster_zonal.tf
index 10b8b6a3f8..aa26cc4fc4 100644
--- a/cluster_zonal.tf
+++ b/cluster_zonal.tf
@@ -96,7 +96,7 @@ resource "google_container_node_pool" "zonal_pools" {
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
   zone               = "${var.zones[0]}"
-  cluster            = "${var.name}"
+  cluster            = "${google_container_cluster.zonal_primary.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_zonal)}"
   initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
@@ -137,8 +137,6 @@ resource "google_container_node_pool" "zonal_pools" {
     update = "30m"
     delete = "30m"
   }
-
-  depends_on = ["google_container_cluster.zonal_primary"]
 }
 
 resource "null_resource" "wait_for_zonal_cluster" {