diff --git a/deploy/charts/rawfile-csi/Chart.yaml b/deploy/charts/rawfile-csi/Chart.yaml
index fc0c41d..7c55dce 100644
--- a/deploy/charts/rawfile-csi/Chart.yaml
+++ b/deploy/charts/rawfile-csi/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: rawfile-csi
 description: RawFile Driver Container Storage Interface
 type: application
-version: 0.8.2
+version: 0.9.0
 appVersion: 0.8.0
diff --git a/deploy/charts/rawfile-csi/rawfile-csi-0.9.0.tgz b/deploy/charts/rawfile-csi/rawfile-csi-0.9.0.tgz
new file mode 100644
index 0000000..aa711bf
Binary files /dev/null and b/deploy/charts/rawfile-csi/rawfile-csi-0.9.0.tgz differ
diff --git a/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
index b021c62..84a4ead 100644
--- a/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
+++ b/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
@@ -69,7 +69,7 @@ spec:
           resources:
             {{- toYaml .Values.controller.resources | nindent 12 }}
         - name: external-resizer
-          image: ghcr.io/canonical/sig-storage/csi-resizer:v1.7.0
+          image: {{ .Values.images.csiResizer }}
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
diff --git a/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
index d360090..5044217 100644
--- a/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
+++ b/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
@@ -91,7 +91,7 @@ spec:
           resources:
             {{- toYaml .Values.node.resources | nindent 12 }}
         - name: node-driver-registrar
-          image: ghcr.io/canonical/sig-storage/csi-node-driver-registrar:v2.10.0
+          image: {{ .Values.images.nodeDriverRegistrar }}
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)
@@ -124,7 +124,7 @@ spec:
               cpu: 10m
               memory: 100Mi
         - name: external-provisioner
-          image: ghcr.io/canonical/sig-storage/csi-provisioner:v3.4.1
+          image: {{ .Values.images.csiProvisioner }}
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
@@ -154,7 +154,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: external-snapshotter
-          image: ghcr.io/canonical/sig-storage/csi-snapshotter:v6.2.1
+          image: {{ .Values.images.csiSnapshotter }}
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
diff --git a/deploy/charts/rawfile-csi/templates/02-storageclass.yaml b/deploy/charts/rawfile-csi/templates/02-storageclass.yaml
index 8a50f36..dee772a 100644
--- a/deploy/charts/rawfile-csi/templates/02-storageclass.yaml
+++ b/deploy/charts/rawfile-csi/templates/02-storageclass.yaml
@@ -4,7 +4,7 @@ kind: StorageClass
 metadata:
   name: {{ .Values.storageClass.name }}
   annotations:
-    storageclass.kubernetes.io/is-default-class: "{{ .Values.storageClass.isDefault }}"
+    storageclass.kubernetes.io/is-default-class: {{ .Values.storageClass.isDefault | quote }}
 provisioner: rawfile.csi.openebs.io
 reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }}
 volumeBindingMode: {{ .Values.storageClass.volumeBindingMode }}
diff --git a/deploy/charts/rawfile-csi/values.yaml b/deploy/charts/rawfile-csi/values.yaml
index 87800e7..f555c2a 100644
--- a/deploy/charts/rawfile-csi/values.yaml
+++ b/deploy/charts/rawfile-csi/values.yaml
@@ -19,6 +19,12 @@ controller:
     - csi-driver
     - --disable-metrics
 
+images:
+  csiNodeDriverRegistrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
+  csiProvisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
+  csiResizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
+  csiSnapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
+
 node:
   <<: *defaults
   storage: