diff --git a/charts/csi-isilon/templates/controller.yaml b/charts/csi-isilon/templates/controller.yaml
index 07a3d1e7..84f005f0 100644
--- a/charts/csi-isilon/templates/controller.yaml
+++ b/charts/csi-isilon/templates/controller.yaml
@@ -196,7 +196,7 @@ spec:
         {{- if hasKey .Values "podmon" }}
         {{- if eq .Values.podmon.enabled true }}
         - name: podmon
-          image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
+          image: {{ required "Must provide the podmon container image." .Values.images.podmon.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             {{- toYaml .Values.podmon.controller.args | nindent 12 }}
@@ -223,7 +223,7 @@ spec:
         {{- if hasKey .Values.controller "replication" }}
         {{- if eq .Values.controller.replication.enabled true}}
         - name: dell-csi-replicator
-          image: {{ required "Must provide the Dell CSI Replicator image." .Values.images.replication }}
+          image: {{ required "Must provide the Dell CSI Replicator image." .Values.images.replication.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -250,7 +250,7 @@ spec:
         {{- if hasKey .Values.controller "resizer" }}
         {{- if eq .Values.controller.resizer.enabled true }}
         - name: resizer{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }}
+          image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -274,7 +274,7 @@ spec:
         {{ end }}
         {{ end }}
         - name: attacher{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }}
+          image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -297,7 +297,7 @@ spec:
               mountPath: /var/run/csi
         {{- if not $encrypted }}
         - name: csi-metadata-retriever
-          image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }}
+          image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: [ "/csi-metadata-retriever" ]
           env:
@@ -309,7 +309,7 @@ spec:
         {{- if hasKey .Values.controller "healthMonitor" }}
         {{- if eq .Values.controller.healthMonitor.enabled true }}
         - name: external-health-monitor-controller
-          image: {{ required "Must provide the CSI external-health-monitor-controller container image." .Values.images.healthmonitor }}
+          image: {{ required "Must provide the CSI external-health-monitor-controller container image." .Values.images.healthmonitor.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -337,7 +337,7 @@ spec:
         {{end}}
         {{- end }}
         - name: provisioner{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }}
+          image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -378,7 +378,7 @@ spec:
         {{- if hasKey .Values.controller "snapshot" }}
         {{- if eq .Values.controller.snapshot.enabled true }}
         - name: snapshotter{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter }}
+          image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -404,7 +404,7 @@ spec:
         {{end}}
         {{- if not $encrypted }}
         - name: driver
-          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }}
+          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: [ "/csi-isilon" ]
           args:
@@ -492,7 +492,7 @@ spec:
         {{- if eq .Values.authorization.enabled true }}
         - name: karavi-authorization-proxy
           imagePullPolicy: {{ .Values.imagePullPolicy }}
-          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
+          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization.image }}
           env:
             - name: PROXY_HOST
               value: "{{ .Values.authorization.proxyHost }}"
@@ -522,7 +522,7 @@ spec:
         {{- end }}
         {{- if $encrypted }}
         - name: driver-sec
-          image: {{ .Values.images.encryption }}
+          image: {{ .Values.images.encryption.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - --name={{ .Values.encryption.pluginName }}
diff --git a/charts/csi-isilon/templates/node.yaml b/charts/csi-isilon/templates/node.yaml
index ad245a30..bdc9161a 100644
--- a/charts/csi-isilon/templates/node.yaml
+++ b/charts/csi-isilon/templates/node.yaml
@@ -115,7 +115,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
+          image: {{ required "Must provide the podmon container image." .Values.images.podmon.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             {{- toYaml .Values.podmon.node.args | nindent 12 }}
@@ -169,7 +169,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }}
+          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: CSI_ENDPOINT
@@ -253,7 +253,7 @@ spec:
               mountPath: /csi-isilon-config-params
         {{- end }}
         - name: registrar{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar }}
+          image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--v=5"
@@ -275,7 +275,7 @@ spec:
         {{- if eq .Values.authorization.enabled true }}
         - name: karavi-authorization-proxy
           imagePullPolicy: {{ .Values.imagePullPolicy }}
-          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
+          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization.image }}
           env:
             - name: PROXY_HOST
               value: "{{ .Values.authorization.proxyHost }}"
@@ -305,7 +305,7 @@ spec:
         {{- end }}
         {{- if $encrypted }}
         - name: driver-sec
-          image: {{ .Values.images.encryption }}
+          image: {{ .Values.images.encryption.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           securityContext:
             privileged: true
diff --git a/charts/csi-isilon/values.yaml b/charts/csi-isilon/values.yaml
index abcc9aa4..bef8e0fa 100644
--- a/charts/csi-isilon/values.yaml
+++ b/charts/csi-isilon/values.yaml
@@ -6,21 +6,33 @@ version: "v2.11.0"
 
 images:
   # "driver" defines the container image, used for the driver container.
-  driver: dellemc/csi-isilon:v2.11.0
+  driver:
+    image: dellemc/csi-isilon:v2.11.0
   # CSI sidecars
-  attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
-  provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
-  snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
-  resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
-  registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
-  healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.1
+  attacher:
+    image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
+  provisioner:
+    image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
+  snapshotter:
+    image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
+  resizer:
+    image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
+  registrar:
+    image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
+  healthmonitor:
+    image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.1
 
   # CSM sidecars
-  replication: dellemc/dell-csi-replicator:v1.9.0
-  podmon: dellemc/podmon:v1.10.0
-  authorization: dellemc/csm-authorization-sidecar:v1.11.0
-  metadataretriever: dellemc/csi-metadata-retriever:v1.8.0
-  encryption: dellemc/csm-encryption:v0.6.0
+  replication:
+    image: dellemc/dell-csi-replicator:v1.9.0
+  podmon:
+    image: dellemc/podmon:v1.10.0
+  authorization:
+    image: dellemc/csm-authorization-sidecar:v1.11.0
+  metadataretriever:
+    image: dellemc/csi-metadata-retriever:v1.8.0
+  encryption:
+    image: dellemc/csm-encryption:v0.6.0
 
 # CSI driver log level
 # Allowed values: "error", "warn"/"warning", "info", "debug"