diff --git a/charts/index.yaml b/charts/index.yaml
index 55b76854ce..85d699652d 100644
--- a/charts/index.yaml
+++ b/charts/index.yaml
@@ -3,16 +3,16 @@ entries:
   azuredisk-csi-driver:
   - apiVersion: v1
     appVersion: v2.0.0-alpha.1
-    created: "2021-05-25T10:38:09.888718427-07:00"
+    created: "2021-05-25T18:06:46.5216282Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
-    digest: c300d843bef251dd0d89fdfa9b0a9a1f7e1eb0c4469d577f2caa836cb4b7f421
+    digest: 785b22d89fea05d1b677365433530af01821976cdcdc5f9b5a58ab06ad8c7600
     name: azuredisk-csi-driver
     urls:
     - https://raw.githubusercontent.com/abhisheksinghbaghel/azuredisk-csi-driver/master/charts/v2.0.0-alpha.1/azuredisk-csi-driver-v2.0.0-alpha.1.tgz
     version: v2.0.0-alpha.1
   - apiVersion: v1
     appVersion: latest
-    created: "2021-05-25T10:38:09.871128566-07:00"
+    created: "2021-05-25T18:06:46.5093623Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: fa28b8a63ae984366bce7b6afddd184aaed4ab3f36b7c16dab1b95b84af6f1d0
     name: azuredisk-csi-driver
@@ -21,7 +21,7 @@ entries:
     version: v1.4.0
   - apiVersion: v1
     appVersion: v1.3.0
-    created: "2021-05-25T10:38:09.887070278-07:00"
+    created: "2021-05-25T18:06:46.5204822Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 2665483e922a577feb8539ca7f774bc70c945ce490294fd3378f098c2d244dde
     name: azuredisk-csi-driver
@@ -30,7 +30,7 @@ entries:
     version: v1.3.0
   - apiVersion: v1
     appVersion: v1.2.0
-    created: "2021-05-25T10:38:09.883856776-07:00"
+    created: "2021-05-25T18:06:46.5195353Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 2bbfe2f9d080f1b3ff10590c7168d05ce026c5a73332b4d48014610a52337808
     name: azuredisk-csi-driver
@@ -39,7 +39,7 @@ entries:
     version: v1.2.0
   - apiVersion: v1
     appVersion: v1.1.1
-    created: "2021-05-25T10:38:09.880590376-07:00"
+    created: "2021-05-25T18:06:46.518562Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: dd7066be8f499f6c1a396ab27c0013c09f5a8d8319cc04fbdd480d31107bb851
     name: azuredisk-csi-driver
@@ -48,7 +48,7 @@ entries:
     version: v1.1.1
   - apiVersion: v1
     appVersion: v1.1.0
-    created: "2021-05-25T10:38:09.87949161-07:00"
+    created: "2021-05-25T18:06:46.5176299Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 3d2a5189416dd6a43bd3e2097bbe23a8db347b6e1a36c6a43fd59cc9c9633ff3
     name: azuredisk-csi-driver
@@ -57,7 +57,7 @@ entries:
     version: v1.1.0
   - apiVersion: v1
     appVersion: v1.0.0
-    created: "2021-05-25T10:38:09.878309246-07:00"
+    created: "2021-05-25T18:06:46.5166367Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: d179bc6f338518859b6efdc3b3bed8d06513313e8047563eb4b654b2d417c81e
     name: azuredisk-csi-driver
@@ -66,7 +66,7 @@ entries:
     version: v1.0.0
   - apiVersion: v1
     appVersion: v0.10.0
-    created: "2021-05-25T10:38:09.872038938-07:00"
+    created: "2021-05-25T18:06:46.5116436Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 3dbbaca098fe8316de079236598253b5831e8e85fd88b390231d828157d62206
     name: azuredisk-csi-driver
@@ -75,7 +75,7 @@ entries:
     version: v0.10.0
   - apiVersion: v1
     appVersion: v0.9.0
-    created: "2021-05-25T10:38:09.876907889-07:00"
+    created: "2021-05-25T18:06:46.5157373Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: a978f3e6ef5d678c3b6512bd8a63277cb4ce40d3f3e34b80370f0c37298824f2
     name: azuredisk-csi-driver
@@ -84,7 +84,7 @@ entries:
     version: v0.9.0
   - apiVersion: v1
     appVersion: v0.8.0
-    created: "2021-05-25T10:38:09.87590042-07:00"
+    created: "2021-05-25T18:06:46.5148748Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 1762b832389b4f7a5eab9748127fa6dbb85131485d67bc3fe485bbe86c468128
     name: azuredisk-csi-driver
@@ -93,7 +93,7 @@ entries:
     version: v0.8.0
   - apiVersion: v1
     appVersion: v0.7.0
-    created: "2021-05-25T10:38:09.874176473-07:00"
+    created: "2021-05-25T18:06:46.5139194Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 29e21f686814f46c1edaaaa95ce2d25579ff1aad270c58b774bdb5a89858b8bf
     name: azuredisk-csi-driver
@@ -102,11 +102,11 @@ entries:
     version: v0.7.0
   - apiVersion: v1
     appVersion: v0.6.0
-    created: "2021-05-25T10:38:09.872992809-07:00"
+    created: "2021-05-25T18:06:46.513038Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: b11d8dfee371ca7c63a1448ba27c1fd1f032ea33575fefeeb16927fc95d1eeb7
     name: azuredisk-csi-driver
     urls:
     - https://raw.githubusercontent.com/abhisheksinghbaghel/azuredisk-csi-driver/master/charts/v0.6.0/azuredisk-csi-driver-v0.6.0.tgz
     version: v0.6.0
-generated: "2021-05-25T10:38:09.869728109-07:00"
+generated: "2021-05-25T18:06:46.5081933Z"
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index f964ac8781..6d43e6dac8 100755
--- a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -174,7 +174,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index ae00212696..ca94010374 100755
--- a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -128,7 +128,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: C:\k\azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: "C:\\var\\lib\\kubelet"
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 4d5227242d..03d581d7b1 100755
--- a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -121,7 +121,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index ae9bfc0317..59f9183c89 100644
--- a/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -160,7 +160,7 @@ spec:
               value: unix:///csi/csi.sock
             - name: AZURE_ENVIRONMENT_FILEPATH  # For Azure Stack Cloud
               value: /etc/kubernetes/azurestackcloud.json
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index ea33bfcb96..b8529de181 100644
--- a/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -118,7 +118,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: AZURE_ENVIRONMENT_FILEPATH  # For Azure Stack Cloud
               value: C:\k\azurestackcloud.json
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 9743ab48a4..7d8f326110 100644
--- a/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v0.10.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -115,7 +115,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: AZURE_ENVIRONMENT_FILEPATH  # For Azure Stack Cloud
               value: /etc/kubernetes/azurestackcloud.json
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.5.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v0.5.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index 5914b8bfc2..966ddfa6b2 100755
--- a/charts/v0.5.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v0.5.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -118,7 +118,7 @@ spec:
               value: "/etc/kubernetes/azure.json"
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v0.5.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v0.5.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index c72d66c40e..f4c5ad0f6f 100755
--- a/charts/v0.5.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v0.5.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -75,7 +75,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.6.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v0.6.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index 476d3a01cb..f3c1688210 100644
--- a/charts/v0.6.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v0.6.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -163,7 +163,7 @@ spec:
               value: "/etc/kubernetes/azure.json"
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v0.6.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v0.6.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 6e6dc9b9dc..e060d7074c 100644
--- a/charts/v0.6.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v0.6.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -94,7 +94,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index 049bb45ed6..09ffbf2802 100644
--- a/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -151,7 +151,7 @@ spec:
               value: "/etc/kubernetes/azure.json"
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index 33ee12c882..39aa1a6a0a 100644
--- a/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -102,7 +102,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index fe1e8a2d7e..55a1a175da 100644
--- a/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v0.7.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -98,7 +98,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index f57aaec7f5..4733e6b7c3 100644
--- a/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -153,7 +153,7 @@ spec:
                   optional: true
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index 069cf54e7e..2c85ede511 100644
--- a/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -106,7 +106,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 45bdfbede6..9b9f1794e9 100644
--- a/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v0.8.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -102,7 +102,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index ea4f43fff8..09fd10c212 100644
--- a/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -155,7 +155,7 @@ spec:
                   optional: true
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index a383facbec..9956c368c7 100644
--- a/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -107,7 +107,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 1163db2374..b3af7e7ee8 100644
--- a/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v0.9.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -103,7 +103,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index 67042d95b2..af34e55a70 100755
--- a/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -163,7 +163,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index 6da0d16204..904630cdba 100755
--- a/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -120,7 +120,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: C:\k\azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: "C:\\var\\lib\\kubelet"
diff --git a/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 1837596ba6..9d14e136f9 100755
--- a/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v1.0.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -117,7 +117,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index 5fccc2dfc1..2701b9d809 100755
--- a/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -164,7 +164,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index 0272ee8f70..83dddc331a 100755
--- a/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -124,7 +124,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: C:\k\azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: "C:\\var\\lib\\kubelet"
diff --git a/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 3fd7eb8e04..eade2d0496 100755
--- a/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v1.1.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -117,7 +117,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index e81c8e66fa..9d21b42c30 100755
--- a/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -163,7 +163,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index 0272ee8f70..83dddc331a 100755
--- a/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -124,7 +124,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: C:\k\azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: "C:\\var\\lib\\kubelet"
diff --git a/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 3fd7eb8e04..eade2d0496 100755
--- a/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v1.1.1/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -117,7 +117,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index 82d60845a9..950f371f17 100755
--- a/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -166,7 +166,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index f1d1e411b6..466854a322 100755
--- a/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -128,7 +128,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: C:\k\azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: "C:\\var\\lib\\kubelet"
diff --git a/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 3fd7eb8e04..eade2d0496 100755
--- a/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v1.2.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -117,7 +117,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index 0ee07572f6..d51721b2f8 100755
--- a/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -173,7 +173,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index ae00212696..ca94010374 100755
--- a/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -128,7 +128,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: C:\k\azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: "C:\\var\\lib\\kubelet"
diff --git a/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 4d5227242d..03d581d7b1 100755
--- a/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/v1.3.0/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -121,7 +121,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/v2.0.0-alpha.1/azuredisk-csi-driver-v2.0.0-alpha.1.tgz b/charts/v2.0.0-alpha.1/azuredisk-csi-driver-v2.0.0-alpha.1.tgz
index 74655575e7..e9049e3779 100644
Binary files a/charts/v2.0.0-alpha.1/azuredisk-csi-driver-v2.0.0-alpha.1.tgz and b/charts/v2.0.0-alpha.1/azuredisk-csi-driver-v2.0.0-alpha.1.tgz differ
diff --git a/charts/v2.0.0-alpha.1/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/v2.0.0-alpha.1/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index a91003f5af..b7385a3d6d 100644
--- a/charts/v2.0.0-alpha.1/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/v2.0.0-alpha.1/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -165,7 +165,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/v2.0.0-alpha.1/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/v2.0.0-alpha.1/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
index ad822ccc2f..64e0d25ba7 100644
--- a/charts/v2.0.0-alpha.1/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
+++ b/charts/v2.0.0-alpha.1/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -126,7 +126,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: C:\k\azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: "C:\\var\\lib\\kubelet"
diff --git a/test/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/test/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index eb68a4d072..be3e5e2159 100644
--- a/test/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/test/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -56,7 +56,7 @@ spec:
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /etc/kubernetes/azurestackcloud.json
             {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir