diff --git a/chart/templates/clusterrole.yaml b/chart/templates/clusterrole.yaml
index f42ed41..48ebf54 100644
--- a/chart/templates/clusterrole.yaml
+++ b/chart/templates/clusterrole.yaml
@@ -29,7 +29,7 @@ rules:
   resources: ["priorityclasses"]
   verbs: ["watch", "list"]
 - apiGroups: ["storage.k8s.io"]
-  resources: ["storageclasses", "volumeattachments", "csinodes", "csidrivers"]
+  resources: ["storageclasses", "volumeattachments", "volumeattachments/status", "csinodes", "csidrivers"]
   verbs: ["*"]
 - apiGroups: ["snapshot.storage.k8s.io"]
   resources: ["volumesnapshotclasses", "volumesnapshots", "volumesnapshotcontents", "volumesnapshotcontents/status"]
diff --git a/chart/values.yaml b/chart/values.yaml
index aaaafd1..026f672 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -27,20 +27,20 @@ image:
       tag: v2_20210820
   csi:
     attacher:
-      repository: longhornio/csi-attacher
-      tag: v2.2.1-lh2
+      repository: k8s.gcr.io/sig-storage/csi-attacher
+      tag: v3.2.1
     provisioner:
-      repository: longhornio/csi-provisioner
-      tag: v1.6.0-lh2
+      repository: k8s.gcr.io/sig-storage/csi-provisioner
+      tag: v2.1.2
     nodeDriverRegistrar:
-      repository: longhornio/csi-node-driver-registrar
-      tag: v1.2.0-lh1
+      repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+      tag: v2.3.0
     resizer:
-      repository: longhornio/csi-resizer
-      tag: v0.5.1-lh2
+      repository: k8s.gcr.io/sig-storage/csi-resizer
+      tag: v1.2.0
     snapshotter:
-      repository: longhornio/csi-snapshotter
-      tag: v2.1.1-lh2
+      repository: k8s.gcr.io/sig-storage/csi-snapshotter
+      tag: v3.0.3
   pullPolicy: IfNotPresent
 
 service:
diff --git a/deploy/longhorn-images.txt b/deploy/longhorn-images.txt
index 5af69f3..8018d53 100644
--- a/deploy/longhorn-images.txt
+++ b/deploy/longhorn-images.txt
@@ -1,8 +1,8 @@
-longhornio/csi-attacher:v2.2.1-lh2
-longhornio/csi-node-driver-registrar:v1.2.0-lh1
-longhornio/csi-provisioner:v1.6.0-lh2
-longhornio/csi-resizer:v0.5.1-lh2
-longhornio/csi-snapshotter:v2.1.1-lh2
+k8s.gcr.io/sig-storage/csi-attacher:v3.2.1
+k8s.gcr.io/sig-storage/csi-provisioner:v2.1.2
+k8s.gcr.io/sig-storage/csi-resizer:v1.2.0
+k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3
+k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
 longhornio/backing-image-manager:v2_20210820
 longhornio/longhorn-engine:v1.2.0-rc1
 longhornio/longhorn-instance-manager:v1_20210731
diff --git a/deploy/release-images.txt b/deploy/release-images.txt
deleted file mode 100644
index 5af69f3..0000000
--- a/deploy/release-images.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-longhornio/csi-attacher:v2.2.1-lh2
-longhornio/csi-node-driver-registrar:v1.2.0-lh1
-longhornio/csi-provisioner:v1.6.0-lh2
-longhornio/csi-resizer:v0.5.1-lh2
-longhornio/csi-snapshotter:v2.1.1-lh2
-longhornio/backing-image-manager:v2_20210820
-longhornio/longhorn-engine:v1.2.0-rc1
-longhornio/longhorn-instance-manager:v1_20210731
-longhornio/longhorn-manager:v1.2.0-rc1
-longhornio/longhorn-share-manager:v1_20210820
-longhornio/longhorn-ui:v1.2.0-rc1