diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl
index 211b7d0255..28469bcafb 100644
--- a/autogen/main/versions.tf.tmpl
+++ b/autogen/main/versions.tf.tmpl
@@ -34,17 +34,17 @@ terraform {
   required_providers {
     google = {
       source = "hashicorp/google"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     google-beta = {
       source = "hashicorp/google-beta"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
 {% elif autopilot_cluster  %}
   required_providers {
     google = {
       source = "hashicorp/google"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
 {% else %}
   required_providers {
diff --git a/modules/beta-autopilot-private-cluster/versions.tf b/modules/beta-autopilot-private-cluster/versions.tf
index 747fdf13b1..ecfb5a6e3d 100644
--- a/modules/beta-autopilot-private-cluster/versions.tf
+++ b/modules/beta-autopilot-private-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-autopilot-public-cluster/versions.tf b/modules/beta-autopilot-public-cluster/versions.tf
index 51d905e381..4267d0442b 100644
--- a/modules/beta-autopilot-public-cluster/versions.tf
+++ b/modules/beta-autopilot-public-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json
index 8e2165eeb9..3f61de7673 100755
--- a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json
+++ b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json
@@ -216,7 +216,7 @@
         "effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
         "imageType": "COS_CONTAINERD",
         "kubeletConfig": {
-          "insecureKubeletReadonlyPortEnabled": true
+          "insecureKubeletReadonlyPortEnabled": false
         },
         "labels": {
           "cluster_name": "CLUSTER_NAME",
diff --git a/test/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json b/test/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json
index d9edee89ce..690c9993fb 100644
--- a/test/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json
+++ b/test/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json
@@ -38,7 +38,6 @@
       "publicEndpoint": "KUBERNETES_ENDPOINT"
     }
   },
-  "currentNodeCount": 3,
   "databaseEncryption": {
     "currentState": "CURRENT_STATE_DECRYPTED",
     "state": "DECRYPTED"
diff --git a/test/integration/stub_domains/testdata/TestStubDomains.json b/test/integration/stub_domains/testdata/TestStubDomains.json
index b8bfde4020..81b871bdc1 100644
--- a/test/integration/stub_domains/testdata/TestStubDomains.json
+++ b/test/integration/stub_domains/testdata/TestStubDomains.json
@@ -36,7 +36,6 @@
       "publicEndpoint": "KUBERNETES_ENDPOINT"
     }
   },
-  "currentNodeCount": 3,
   "databaseEncryption": {
     "currentState": "CURRENT_STATE_DECRYPTED",
     "state": "DECRYPTED"
diff --git a/test/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json b/test/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json
index bee27bf7a6..0028583a43 100644
--- a/test/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json
+++ b/test/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json
@@ -36,7 +36,6 @@
       "publicEndpoint": "KUBERNETES_ENDPOINT"
     }
   },
-  "currentNodeCount": 3,
   "databaseEncryption": {
     "currentState": "CURRENT_STATE_DECRYPTED",
     "state": "DECRYPTED"
diff --git a/test/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json b/test/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json
index 7be23db982..27b4cda88b 100644
--- a/test/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json
+++ b/test/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json
@@ -35,7 +35,6 @@
       "privateEndpoint": "KUBERNETES_ENDPOINT"
     }
   },
-  "currentNodeCount": 1,
   "databaseEncryption": {
     "currentState": "CURRENT_STATE_DECRYPTED",
     "state": "DECRYPTED"