diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
index 80200fe7a2..d5d26e91c9 100644
--- a/autogen/main/cluster.tf.tmpl
+++ b/autogen/main/cluster.tf.tmpl
@@ -660,7 +660,6 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
-  {% if beta_cluster %}
 
   node_pool_defaults {
     node_config_defaults {
@@ -674,13 +673,14 @@ resource "google_container_cluster" "primary" {
       }
       {% endif %}
       {% if autopilot_cluster != true %}
+      {% if beta_cluster %}
       gcfs_config {
         enabled = var.enable_gcfs
       }
       {% endif %}
+      {% endif %}
     }
   }
-  {% endif %}
   {% if beta_cluster %}
 
   depends_on = [google_project_iam_member.service_agent]
diff --git a/cluster.tf b/cluster.tf
index ad40edfcd6..f0f6ecd155 100644
--- a/cluster.tf
+++ b/cluster.tf
@@ -499,6 +499,11 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
+
+  node_pool_defaults {
+    node_config_defaults {
+    }
+  }
 }
 /******************************************
   Create Container Cluster node pools
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
index f857959530..d0661fc6f2 100644
--- a/modules/private-cluster-update-variant/cluster.tf
+++ b/modules/private-cluster-update-variant/cluster.tf
@@ -520,6 +520,11 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
+
+  node_pool_defaults {
+    node_config_defaults {
+    }
+  }
 }
 /******************************************
   Create Container Cluster node pools
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
index 382e1b8cfd..cd6eee13b6 100644
--- a/modules/private-cluster/cluster.tf
+++ b/modules/private-cluster/cluster.tf
@@ -520,6 +520,11 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
+
+  node_pool_defaults {
+    node_config_defaults {
+    }
+  }
 }
 /******************************************
   Create Container Cluster node pools