diff --git a/deploy/kubernetes/images/prow-gke-release-staging-rc-1-16/image.yaml b/deploy/kubernetes/images/prow-gke-release-staging-rc-1-16/image.yaml
index 7c2a4e05d..f70edf39b 100644
--- a/deploy/kubernetes/images/prow-gke-release-staging-rc-1-16/image.yaml
+++ b/deploy/kubernetes/images/prow-gke-release-staging-rc-1-16/image.yaml
@@ -32,7 +32,7 @@ metadata:
 imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
-  newTag: "v1.2.0"
+  newTag: "v1.2.0-gke.8"
 ---
 
 apiVersion: builtin
diff --git a/deploy/kubernetes/images/prow-gke-release-staging-rc-1-17/image.yaml b/deploy/kubernetes/images/prow-gke-release-staging-rc-1-17/image.yaml
index e21efd809..fb524e10c 100644
--- a/deploy/kubernetes/images/prow-gke-release-staging-rc-1-17/image.yaml
+++ b/deploy/kubernetes/images/prow-gke-release-staging-rc-1-17/image.yaml
@@ -32,7 +32,7 @@ metadata:
 imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
-  newTag: "v1.2.0"
+  newTag: "v1.2.0-gke.8"
 ---
 
 apiVersion: builtin
diff --git a/deploy/kubernetes/images/prow-gke-release-staging-rc-1-18/image.yaml b/deploy/kubernetes/images/prow-gke-release-staging-rc-1-18/image.yaml
index 6acc3b9ac..0a46c09c3 100644
--- a/deploy/kubernetes/images/prow-gke-release-staging-rc-1-18/image.yaml
+++ b/deploy/kubernetes/images/prow-gke-release-staging-rc-1-18/image.yaml
@@ -32,7 +32,7 @@ metadata:
 imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
-  newTag: "v1.2.0"
+  newTag: "v1.2.0-gke.8"
 ---
 
 apiVersion: builtin
diff --git a/deploy/kubernetes/images/prow-gke-release-staging-rc-1-19/image.yaml b/deploy/kubernetes/images/prow-gke-release-staging-rc-1-19/image.yaml
index 6acc3b9ac..0a46c09c3 100644
--- a/deploy/kubernetes/images/prow-gke-release-staging-rc-1-19/image.yaml
+++ b/deploy/kubernetes/images/prow-gke-release-staging-rc-1-19/image.yaml
@@ -32,7 +32,7 @@ metadata:
 imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
-  newTag: "v1.2.0"
+  newTag: "v1.2.0-gke.8"
 ---
 
 apiVersion: builtin
diff --git a/deploy/kubernetes/images/prow-gke-release-staging-rc-master/image.yaml b/deploy/kubernetes/images/prow-gke-release-staging-rc-master/image.yaml
index 6acc3b9ac..0a46c09c3 100644
--- a/deploy/kubernetes/images/prow-gke-release-staging-rc-master/image.yaml
+++ b/deploy/kubernetes/images/prow-gke-release-staging-rc-master/image.yaml
@@ -32,7 +32,7 @@ metadata:
 imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
-  newTag: "v1.2.0"
+  newTag: "v1.2.0-gke.8"
 ---
 
 apiVersion: builtin
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-18/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-18/kustomization.yaml
index 83e11bd44..31daa5b0e 100644
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-18/kustomization.yaml
+++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-18/kustomization.yaml
@@ -1,6 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace:
+  gce-pd-csi-driver
 resources:
-- ../stable-1-18
+- ../../base
 transformers:
 - ../../images/prow-gke-release-staging-rc-1-18
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-19/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-19/kustomization.yaml
index 1390db410..320d43bd3 100644
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-19/kustomization.yaml
+++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-19/kustomization.yaml
@@ -1,6 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace:
+  gce-pd-csi-driver
 resources:
-- ../stable-1-19
+- ../../base
 transformers:
 - ../../images/prow-gke-release-staging-rc-1-19
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc-master/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc-master/kustomization.yaml
index 398497268..4251fe3c2 100644
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc-master/kustomization.yaml
+++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc-master/kustomization.yaml
@@ -1,6 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace:
+  gce-pd-csi-driver
 resources:
-- ../stable-master
+- ../../base
 transformers:
 - ../../images/prow-gke-release-staging-rc-master