diff --git a/files/secrets-store/csi-secrets-store-DaemonSet.yaml b/files/secrets-store/csi-secrets-store-DaemonSet.yaml
index c518b73..a13f0ec 100644
--- a/files/secrets-store/csi-secrets-store-DaemonSet.yaml
+++ b/files/secrets-store/csi-secrets-store-DaemonSet.yaml
@@ -16,20 +16,11 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
+          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
           args:
             - --v=5
             - --csi-address=/csi/csi.sock
             - --kubelet-registration-path=/var/lib/kubelet/plugins/csi-secrets-store/csi.sock
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                  [
-                    "/bin/sh",
-                    "-c",
-                    "rm -rf /registration/secrets-store.csi.k8s.io-reg.sock",
-                  ]
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
@@ -50,13 +41,13 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: secrets-store
-          image: us.gcr.io/k8s-artifacts-prod/csi-secrets-store/driver:v0.0.16
+          image: k8s.gcr.io/csi-secrets-store/driver:v0.0.17
           args:
-            - "--debug=true"
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
             - "--provider-volume=/etc/kubernetes/secrets-store-csi-providers"
             - "--metrics-addr=:8095"
+            - "--grpc-supported-providers=gcp;"
             - "--enable-secret-rotation=false"
             - "--rotation-poll-interval=2m"
           env:
@@ -98,7 +89,7 @@ spec:
               cpu: 50m
               memory: 100Mi
         - name: liveness-probe
-          image: quay.io/k8scsi/livenessprobe:v2.0.0
+          image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0
           imagePullPolicy: Always
           args:
           - --csi-address=/csi/csi.sock
diff --git a/files/secrets-store/provider-vault-installer.yaml b/files/secrets-store/provider-vault-installer.yaml
index 3f2b17d..7630f54 100644
--- a/files/secrets-store/provider-vault-installer.yaml
+++ b/files/secrets-store/provider-vault-installer.yaml
@@ -19,7 +19,7 @@ spec:
       tolerations:
       containers:
         - name: provider-vault-installer
-          image: hashicorp/secrets-store-csi-driver-provider-vault:0.0.4
+          image: hashicorp/secrets-store-csi-driver-provider-vault:0.0.6
           imagePullPolicy: Always
           resources:
             requests:
diff --git a/vars/secrets_store_files_list.yml b/vars/secrets_store_files_list.yml
index 616940d..b78f4cd 100644
--- a/vars/secrets_store_files_list.yml
+++ b/vars/secrets_store_files_list.yml
@@ -1,8 +1,8 @@
 ---
 secrets_store_files:
+  - "secrets-store/secretproviderclasses-rolebinding-ClusterRoleBinding.yaml"
   - "secrets-store/secrets-store-csi-driver-ServiceAccount.yaml"
   - "secrets-store/secretproviderclasses-role-ClusterRole.yaml"
-  - "secrets-store/secretproviderclasses-rolebinding-ClusterRoleBinding.yaml"
   - "secrets-store/secrets-store.csi.k8s.io-CSIDriver.yaml"
   - "secrets-store/secretproviderclasses.secrets-store.csi.x-k8s.io-CustomResourceDefinition.yaml"
   - "secrets-store/csi-secrets-store-DaemonSet.yaml"