diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
index 1f77921b1a..e2862b2688 100644
--- a/autogen/main/cluster.tf.tmpl
+++ b/autogen/main/cluster.tf.tmpl
@@ -1103,7 +1103,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1265,7 +1265,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
diff --git a/cluster.tf b/cluster.tf
index 2fdadf7683..83e5e0ded7 100644
--- a/cluster.tf
+++ b/cluster.tf
@@ -812,7 +812,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -966,7 +966,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
@@ -1199,7 +1199,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1353,7 +1353,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
index d3a438fcda..ddf2b0ccca 100644
--- a/modules/beta-private-cluster-update-variant/cluster.tf
+++ b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -956,7 +956,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1116,7 +1116,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
@@ -1357,7 +1357,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1517,7 +1517,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
index 2f3639e0d8..3eb774cc6f 100644
--- a/modules/beta-private-cluster/cluster.tf
+++ b/modules/beta-private-cluster/cluster.tf
@@ -870,7 +870,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1030,7 +1030,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
@@ -1270,7 +1270,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1430,7 +1430,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
index d7dda4820c..bece69d9b5 100644
--- a/modules/beta-public-cluster-update-variant/cluster.tf
+++ b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -934,7 +934,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1094,7 +1094,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
@@ -1335,7 +1335,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1495,7 +1495,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
index 2a12e72873..e982ae8272 100644
--- a/modules/beta-public-cluster/cluster.tf
+++ b/modules/beta-public-cluster/cluster.tf
@@ -848,7 +848,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1008,7 +1008,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
@@ -1248,7 +1248,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1408,7 +1408,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
index 4db46f5b3c..dcb3b2bab5 100644
--- a/modules/private-cluster-update-variant/cluster.tf
+++ b/modules/private-cluster-update-variant/cluster.tf
@@ -919,7 +919,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1073,7 +1073,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
@@ -1307,7 +1307,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1461,7 +1461,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
index 341b4bcc35..b4203e3458 100644
--- a/modules/private-cluster/cluster.tf
+++ b/modules/private-cluster/cluster.tf
@@ -834,7 +834,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -988,7 +988,7 @@ resource "google_container_node_pool" "pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
@@ -1221,7 +1221,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "queued_provisioning" {
-    for_each = lookup(each.value, "queued_provisioning", false) ? [true] : []
+    for_each = lookup(each.value, "queued_provisioning", null) != null ? [true] : []
     content {
       enabled = lookup(each.value, "queued_provisioning", null)
     }
@@ -1375,7 +1375,7 @@ resource "google_container_node_pool" "windows_pools" {
     }
 
     dynamic "advanced_machine_features" {
-      for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
+      for_each = lookup(each.value, "threads_per_core", null) != null || lookup(each.value, "enable_nested_virtualization", null) != null || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
       content {
         threads_per_core             = lookup(each.value, "threads_per_core", 0)
         enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)