diff --git a/infra/gcp/clusters/projects/kubernetes-public/aaa/00-inputs.tf b/infra/gcp/clusters/projects/kubernetes-public/aaa/00-inputs.tf
index 53eddc53310..d6b31e570f4 100644
--- a/infra/gcp/clusters/projects/kubernetes-public/aaa/00-inputs.tf
+++ b/infra/gcp/clusters/projects/kubernetes-public/aaa/00-inputs.tf
@@ -7,7 +7,7 @@ This file defines:
 */
 
 terraform {
-  required_version = ">= 0.13.6"
+  required_version = "~> 0.13.6"
 
   backend "gcs" {
     bucket = "k8s-infra-tf-public-clusters"
@@ -16,10 +16,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 3.1.0"
+      version = "~> 3.46.0"
     }
     google-beta = {
-      version = "~> 3.1.0"
+      version = "~> 3.46.0"
     }
   }
 }
diff --git a/infra/gcp/clusters/projects/kubernetes-public/aaa/10-cluster-configuration.tf b/infra/gcp/clusters/projects/kubernetes-public/aaa/10-cluster-configuration.tf
index edad7dcf549..7ec3a60613c 100644
--- a/infra/gcp/clusters/projects/kubernetes-public/aaa/10-cluster-configuration.tf
+++ b/infra/gcp/clusters/projects/kubernetes-public/aaa/10-cluster-configuration.tf
@@ -15,24 +15,24 @@ locals {
 
 // Create SA for nodes
 resource "google_service_account" "cluster_node_sa" {
-  project      = "kubernetes-public"
+  project      = data.google_project.project.project_id
   account_id   = "gke-nodes-${local.cluster_name}"
   display_name = "Nodes in GKE cluster '${local.cluster_name}'"
 }
 
 // Add roles for SA
 resource "google_project_iam_member" "cluster_node_sa_logging" {
-  project = "kubernetes-public"
+  project = data.google_project.project.project_id
   role    = "roles/logging.logWriter"
   member  = "serviceAccount:${google_service_account.cluster_node_sa.email}"
 }
 resource "google_project_iam_member" "cluster_node_sa_monitoring_viewer" {
-  project = "kubernetes-public"
+  project = data.google_project.project.project_id
   role    = "roles/monitoring.viewer"
   member  = "serviceAccount:${google_service_account.cluster_node_sa.email}"
 }
 resource "google_project_iam_member" "cluster_node_sa_monitoring_metricwriter" {
-  project = "kubernetes-public"
+  project = data.google_project.project.project_id
   role    = "roles/monitoring.metricWriter"
   member  = "serviceAccount:${google_service_account.cluster_node_sa.email}"
 }
@@ -40,7 +40,7 @@ resource "google_project_iam_member" "cluster_node_sa_monitoring_metricwriter" {
 // BigQuery dataset for usage data
 resource "google_bigquery_dataset" "usage_metering" {
   dataset_id  = replace("usage_metering_${local.cluster_name}", "-", "_")
-  project     = "kubernetes-public"
+  project     = data.google_project.project.project_id
   description = "GKE Usage Metering for cluster '${local.cluster_name}'"
   location    = local.bigquery_location
 
@@ -64,7 +64,7 @@ resource "google_container_cluster" "cluster" {
   location = local.cluster_location
 
   provider = google-beta
-  project  = "kubernetes-public"
+  project  = data.google_project.project.project_id
 
   // GKE clusters are critical objects and should not be destroyed
   // IMPORTANT: should be false on test clusters
@@ -108,7 +108,7 @@ resource "google_container_cluster" "cluster" {
 
   // Enable workload identity for GCP IAM
   workload_identity_config {
-    identity_namespace = "kubernetes-public.svc.id.goog"
+    identity_namespace = "${data.google_project.project.project_id}.svc.id.goog"
   }
 
   // Enable Stackdriver Kubernetes Monitoring