diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/csi-driver.yaml b/deploy/kubernetes/base/controller/csidriver_info.yaml
similarity index 66%
rename from deploy/kubernetes/overlays/prow-gke-release-staging-head/csi-driver.yaml
rename to deploy/kubernetes/base/controller/csidriver_info.yaml
index d15a496ba..8b82aa413 100644
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-head/csi-driver.yaml
+++ b/deploy/kubernetes/base/controller/csidriver_info.yaml
@@ -1,3 +1,4 @@
+#### TODO: This need to be updated to v1 once we official support 1.18+
 apiVersion: storage.k8s.io/v1beta1
 kind: CSIDriver
 metadata:
diff --git a/deploy/kubernetes/base/controller/kustomization.yaml b/deploy/kubernetes/base/controller/kustomization.yaml
index 9361cfced..59640442a 100644
--- a/deploy/kubernetes/base/controller/kustomization.yaml
+++ b/deploy/kubernetes/base/controller/kustomization.yaml
@@ -5,3 +5,4 @@ namespace:
 resources:
 - cluster_setup.yaml
 - controller.yaml
+- csidriver_info.yaml
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml
index 63a020579..90581f8c8 100644
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml
+++ b/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml
@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../stable
-- ./csi-driver.yaml
 transformers:
 - ../../images/prow-gke-release-staging-head
 patchesJson6902:
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml
deleted file mode 100644
index d15a496ba..000000000
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: storage.k8s.io/v1beta1
-kind: CSIDriver
-metadata:
-  name: pd.csi.storage.gke.io
-spec:
-  attachRequired: true
-  podInfoOnMount: false
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml
index cd60ddf15..d5822d578 100644
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml
+++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml
@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../stable
-- ./csi-driver.yaml
 transformers:
 - ../../images/prow-gke-release-staging-rc
 patchesJson6902: