diff --git a/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml b/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
index 11d1bcc37..271ef9b05 100644
--- a/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
+++ b/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
@@ -85,7 +85,7 @@ spec:
               mountPath: /csi
         - name: csi-snapshotter
           # NOTE: replace with official image when released: quay.io/k8scsi/csi-snapshotter:v2.0.0
-          image: quay.io/k8scsi/csi-snapshotter:v2.0.0-rc2
+          image: quay.io/k8scsi/csi-snapshotter:v2.0.0-rc4
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -93,7 +93,7 @@ spec:
           env:
             - name: ADDRESS
               value: /csi/csi.sock
-          imagePullPolicy: IfNotPresent #Always
+          imagePullPolicy: Always
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
diff --git a/deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml b/deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml
index 72e0d157a..fee85af76 100644
--- a/deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml
+++ b/deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml
@@ -56,7 +56,7 @@ roleRef:
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  namespace: default # TODO: replace with the namespace you want for your sidecar
+  namespace: default # TODO: replace with the namespace you want for your controller
   name: snapshot-controller-leaderelection
 rules:
 - apiGroups: ["coordination.k8s.io"]
@@ -68,11 +68,11 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: snapshot-controller-leaderelection
-  namespace: default # TODO: replace with the namespace you want for your sidecar
+  namespace: default # TODO: replace with the namespace you want for your controller
 subjects:
   - kind: ServiceAccount
     name: snapshot-controller
-    namespace: default # TODO: replace with the namespace you want for your sidecar
+    namespace: default # TODO: replace with the namespace you want for your controller
 roleRef:
   kind: Role
   name: snapshot-controller-leaderelection
diff --git a/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml b/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
index 714af7667..f3adafa6b 100644
--- a/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
+++ b/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
@@ -20,8 +20,8 @@ spec:
       containers:
         - name: snapshot-controller
           # NOTE: replace with official image when released: quay.io/k8scsi/snapshot-controller:v2.0.0
-          image: quay.io/k8scsi/snapshot-controller:v2.0.0-rc2
+          image: quay.io/k8scsi/snapshot-controller:v2.0.0-rc4
           args:
             - "--v=5"
             - "--leader-election=false"
-          imagePullPolicy: IfNotPresent #Always
+          imagePullPolicy: Always