diff --git a/infra/gcp/terraform/kubernetes-public/10-cluster-configuration.tf b/infra/gcp/terraform/kubernetes-public/10-cluster-configuration.tf
index 54d2e5a1750..01940cc68ca 100644
--- a/infra/gcp/terraform/kubernetes-public/10-cluster-configuration.tf
+++ b/infra/gcp/terraform/kubernetes-public/10-cluster-configuration.tf
@@ -159,6 +159,9 @@ resource "google_container_cluster" "cluster" {
 
   // Configure cluster addons
   addons_config {
+    gce_persistent_disk_csi_driver_config {
+      enabled = true
+    }
     horizontal_pod_autoscaling {
       disabled = false
     }
diff --git a/infra/gcp/terraform/modules/gke-cluster/main.tf b/infra/gcp/terraform/modules/gke-cluster/main.tf
index a615c80ccb5..b72da4aa7d4 100644
--- a/infra/gcp/terraform/modules/gke-cluster/main.tf
+++ b/infra/gcp/terraform/modules/gke-cluster/main.tf
@@ -161,6 +161,9 @@ resource "google_container_cluster" "prod_cluster" {
 
   // Configure cluster addons
   addons_config {
+    gce_persistent_disk_csi_driver_config {
+      enabled = true
+    }
     horizontal_pod_autoscaling {
       disabled = false
     }