diff --git a/charts/index.yaml b/charts/index.yaml
index 2a9b5de0f7..b989401bba 100644
--- a/charts/index.yaml
+++ b/charts/index.yaml
@@ -3,16 +3,16 @@ entries:
   azuredisk-csi-driver:
   - apiVersion: v1
     appVersion: latest-v2
-    created: "2022-06-13T17:24:35.912987342Z"
+    created: "2022-06-22T20:48:14.8225211-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
-    digest: 1e33cc997d016dc16a65681335cd8b7d141872b4a5592f194fca7d4aec6ae5d4
+    digest: f61af8a297282ddaf172d7d8ce4d0c47bbac063f44fe38c5484b513e3d0bb47f
     name: azuredisk-csi-driver
     urls:
     - https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/main_v2/charts/latest-v2/azuredisk-csi-driver-v2.0.0-beta.4.tgz
     version: v2.0.0-beta.4
   - apiVersion: v1
     appVersion: v2.0.0-beta.3
-    created: "2022-06-13T17:24:35.967414842Z"
+    created: "2022-06-22T20:48:14.887998-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: ddfe774c7b2326ff61c71a7e6fbfe687e97f06b6a8cc5e87c0b50ac0f320c7fe
     name: azuredisk-csi-driver
@@ -21,7 +21,7 @@ entries:
     version: v2.0.0-beta.3
   - apiVersion: v1
     appVersion: v2.0.0-beta.2
-    created: "2022-06-13T17:24:35.964372342Z"
+    created: "2022-06-22T20:48:14.8856883-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 7c1b8159465e7642b7460ec8e4e2a2965be11e8abb8310d86d9487676adb6adc
     name: azuredisk-csi-driver
@@ -30,7 +30,7 @@ entries:
     version: v2.0.0-beta.2
   - apiVersion: v1
     appVersion: v2.0.0-beta.1
-    created: "2022-06-13T17:24:35.962322142Z"
+    created: "2022-06-22T20:48:14.881013-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: f327e1205e7197cf87693012848e2fd76a213c7852ac57a50753ba9e41207612
     name: azuredisk-csi-driver
@@ -39,7 +39,7 @@ entries:
     version: v2.0.0-beta.1
   - apiVersion: v1
     appVersion: v2.0.0-alpha.1
-    created: "2022-06-13T17:24:35.959858242Z"
+    created: "2022-06-22T20:48:14.8765057-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 20690f0e55cf5aa24bd3e70f1428f690e3977df49d7827db2cce88b79fb4daa8
     name: azuredisk-csi-driver
@@ -48,7 +48,7 @@ entries:
     version: v2.0.0-alpha.1
   - apiVersion: v1
     appVersion: latest
-    created: "2022-06-13T17:24:35.909779242Z"
+    created: "2022-06-22T20:48:14.8192451-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: ae425482b8a802a9321b80ff8d5401da8d51c2e1a9aa1f8592b22fbc543a0263
     name: azuredisk-csi-driver
@@ -57,7 +57,7 @@ entries:
     version: v1.20.0
   - apiVersion: v1
     appVersion: v1.19.0
-    created: "2022-06-13T17:24:35.939261142Z"
+    created: "2022-06-22T20:48:14.85381-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 6b98ffbc5462143c6ba9b15568998eccd96806b4561527de60d6b0d517461666
     name: azuredisk-csi-driver
@@ -66,7 +66,7 @@ entries:
     version: v1.19.0
   - apiVersion: v1
     appVersion: v1.18.0
-    created: "2022-06-13T17:24:35.937805342Z"
+    created: "2022-06-22T20:48:14.8520556-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: e994ca2e19b31f4b70d2f11d608d735b2e1de0b2b1342d2824b272d85a7552a1
     name: azuredisk-csi-driver
@@ -75,7 +75,7 @@ entries:
     version: v1.18.0
   - apiVersion: v1
     appVersion: v1.17.0
-    created: "2022-06-13T17:24:35.936325942Z"
+    created: "2022-06-22T20:48:14.8502444-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: b78cd58c63ed60529c3ef9d75a72d11771c1e0f8103046e9e69c3bbc8e09fb44
     name: azuredisk-csi-driver
@@ -84,7 +84,7 @@ entries:
     version: v1.17.0
   - apiVersion: v1
     appVersion: v1.16.0
-    created: "2022-06-13T17:24:35.934817742Z"
+    created: "2022-06-22T20:48:14.8465759-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 95108dce3a4da8aad2729ff8bc1587906b917925e6fe2e5935b5d25805080fb4
     name: azuredisk-csi-driver
@@ -93,7 +93,7 @@ entries:
     version: v1.16.0
   - apiVersion: v1
     appVersion: v1.15.0
-    created: "2022-06-13T17:24:35.932807742Z"
+    created: "2022-06-22T20:48:14.8448031-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 3da85b9206af81dc4217a3304bf14839158112300de7dbb95841e30daaf5e4e5
     name: azuredisk-csi-driver
@@ -102,7 +102,7 @@ entries:
     version: v1.15.0
   - apiVersion: v1
     appVersion: v1.14.0
-    created: "2022-06-13T17:24:35.931203242Z"
+    created: "2022-06-22T20:48:14.8430169-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 89e87dead7767f8abd56096e436956b23a666802040f7aad91d5b6c36af8b098
     name: azuredisk-csi-driver
@@ -111,7 +111,7 @@ entries:
     version: v1.14.0
   - apiVersion: v1
     appVersion: v1.13.0
-    created: "2022-06-13T17:24:35.929518442Z"
+    created: "2022-06-22T20:48:14.8412582-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: c109533218e0625e9ca33c2db5e73c4b550b88943f7950b33e02a344a8ff9f8c
     name: azuredisk-csi-driver
@@ -120,7 +120,7 @@ entries:
     version: v1.13.0
   - apiVersion: v1
     appVersion: v1.12.0
-    created: "2022-06-13T17:24:35.926876242Z"
+    created: "2022-06-22T20:48:14.839543-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: e41f089e5216fc9263039310990d1e41bcb468a85879289af1834dea0c457aaa
     name: azuredisk-csi-driver
@@ -129,7 +129,7 @@ entries:
     version: v1.12.0
   - apiVersion: v1
     appVersion: v1.11.0
-    created: "2022-06-13T17:24:35.923610842Z"
+    created: "2022-06-22T20:48:14.8378172-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: f35447c256488b1942342e9fcf8b6bed5f47b4ae5fb0fdae037110c5926803fe
     name: azuredisk-csi-driver
@@ -138,7 +138,7 @@ entries:
     version: v1.11.0
   - apiVersion: v1
     appVersion: v1.10.0
-    created: "2022-06-13T17:24:35.922103642Z"
+    created: "2022-06-22T20:48:14.8359977-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 12bd0e1f20a2e2adcb04b6954423438d9ece7a2ad0fb4b4fe2969844d14cfb86
     name: azuredisk-csi-driver
@@ -147,7 +147,7 @@ entries:
     version: v1.10.0
   - apiVersion: v1
     appVersion: v1.9.0
-    created: "2022-06-13T17:24:35.958030942Z"
+    created: "2022-06-22T20:48:14.8726536-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: d917427661ca4ec13add77efcfe31d2c7c989e20b1427dd566a05ad1bdd98fa9
     name: azuredisk-csi-driver
@@ -156,7 +156,7 @@ entries:
     version: v1.9.0
   - apiVersion: v1
     appVersion: v1.8.0
-    created: "2022-06-13T17:24:35.955405342Z"
+    created: "2022-06-22T20:48:14.8689616-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: a37491e845671e81b9567f2d1a746dbf4f182fde0c8f9e689dfa632c5651c6c9
     name: azuredisk-csi-driver
@@ -165,7 +165,7 @@ entries:
     version: v1.8.0
   - apiVersion: v1
     appVersion: v1.7.0
-    created: "2022-06-13T17:24:35.953234042Z"
+    created: "2022-06-22T20:48:14.866124-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 4df7a10466206c60deab00efbca57f67f042afd1ecd5daca738df28526f3ffcc
     name: azuredisk-csi-driver
@@ -174,7 +174,7 @@ entries:
     version: v1.7.0
   - apiVersion: v1
     appVersion: v1.6.0
-    created: "2022-06-13T17:24:35.951976642Z"
+    created: "2022-06-22T20:48:14.86352-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: b1a4c384fdfdb6577dd6dfd3709fb746b5c79247846e5c582b93c3a1187f6d88
     name: azuredisk-csi-driver
@@ -183,7 +183,7 @@ entries:
     version: v1.6.0
   - apiVersion: v1
     appVersion: v1.5.1
-    created: "2022-06-13T17:24:35.950671042Z"
+    created: "2022-06-22T20:48:14.8597235-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: efb42e1d56cc5596eb4e695b658c2748bc05cc6c47862e3f20ea6b5b199d01d6
     name: azuredisk-csi-driver
@@ -192,7 +192,7 @@ entries:
     version: v1.5.1
   - apiVersion: v1
     appVersion: v1.5.0
-    created: "2022-06-13T17:24:35.949484842Z"
+    created: "2022-06-22T20:48:14.8584144-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: c8490efde8d4a43bd25f5c619887498dfb4b41edf3929ac8dbf0a9d3f691e6ae
     name: azuredisk-csi-driver
@@ -201,7 +201,7 @@ entries:
     version: v1.5.0
   - apiVersion: v1
     appVersion: v1.4.0
-    created: "2022-06-13T17:24:35.948259942Z"
+    created: "2022-06-22T20:48:14.8570099-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 55e5e17aac7c144b21a198867654ef70ad272987b0bb165782905adf91ca3c03
     name: azuredisk-csi-driver
@@ -210,7 +210,7 @@ entries:
     version: v1.4.0
   - apiVersion: v1
     appVersion: v1.3.0
-    created: "2022-06-13T17:24:35.947148342Z"
+    created: "2022-06-22T20:48:14.8558275-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 2665483e922a577feb8539ca7f774bc70c945ce490294fd3378f098c2d244dde
     name: azuredisk-csi-driver
@@ -219,7 +219,7 @@ entries:
     version: v1.3.0
   - apiVersion: v1
     appVersion: v1.2.0
-    created: "2022-06-13T17:24:35.946212942Z"
+    created: "2022-06-22T20:48:14.8547386-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 2bbfe2f9d080f1b3ff10590c7168d05ce026c5a73332b4d48014610a52337808
     name: azuredisk-csi-driver
@@ -228,7 +228,7 @@ entries:
     version: v1.2.0
   - apiVersion: v1
     appVersion: v1.1.1
-    created: "2022-06-13T17:24:35.919390142Z"
+    created: "2022-06-22T20:48:14.8317356-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: dd7066be8f499f6c1a396ab27c0013c09f5a8d8319cc04fbdd480d31107bb851
     name: azuredisk-csi-driver
@@ -237,7 +237,7 @@ entries:
     version: v1.1.1
   - apiVersion: v1
     appVersion: v1.1.0
-    created: "2022-06-13T17:24:35.918570042Z"
+    created: "2022-06-22T20:48:14.8296069-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 3d2a5189416dd6a43bd3e2097bbe23a8db347b6e1a36c6a43fd59cc9c9633ff3
     name: azuredisk-csi-driver
@@ -246,7 +246,7 @@ entries:
     version: v1.1.0
   - apiVersion: v1
     appVersion: v1.0.0
-    created: "2022-06-13T17:24:35.917745042Z"
+    created: "2022-06-22T20:48:14.8286087-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: d179bc6f338518859b6efdc3b3bed8d06513313e8047563eb4b654b2d417c81e
     name: azuredisk-csi-driver
@@ -255,7 +255,7 @@ entries:
     version: v1.0.0
   - apiVersion: v1
     appVersion: v0.10.0
-    created: "2022-06-13T17:24:35.913863542Z"
+    created: "2022-06-22T20:48:14.8236765-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 3dbbaca098fe8316de079236598253b5831e8e85fd88b390231d828157d62206
     name: azuredisk-csi-driver
@@ -264,7 +264,7 @@ entries:
     version: v0.10.0
   - apiVersion: v1
     appVersion: v0.9.0
-    created: "2022-06-13T17:24:35.916924342Z"
+    created: "2022-06-22T20:48:14.8275696-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: a978f3e6ef5d678c3b6512bd8a63277cb4ce40d3f3e34b80370f0c37298824f2
     name: azuredisk-csi-driver
@@ -273,7 +273,7 @@ entries:
     version: v0.9.0
   - apiVersion: v1
     appVersion: v0.8.0
-    created: "2022-06-13T17:24:35.916072842Z"
+    created: "2022-06-22T20:48:14.8265033-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 1762b832389b4f7a5eab9748127fa6dbb85131485d67bc3fe485bbe86c468128
     name: azuredisk-csi-driver
@@ -282,7 +282,7 @@ entries:
     version: v0.8.0
   - apiVersion: v1
     appVersion: v0.7.0
-    created: "2022-06-13T17:24:35.915250442Z"
+    created: "2022-06-22T20:48:14.8255101-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 29e21f686814f46c1edaaaa95ce2d25579ff1aad270c58b774bdb5a89858b8bf
     name: azuredisk-csi-driver
@@ -291,11 +291,11 @@ entries:
     version: v0.7.0
   - apiVersion: v1
     appVersion: v0.6.0
-    created: "2022-06-13T17:24:35.914536142Z"
+    created: "2022-06-22T20:48:14.8245596-07:00"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: b11d8dfee371ca7c63a1448ba27c1fd1f032ea33575fefeeb16927fc95d1eeb7
     name: azuredisk-csi-driver
     urls:
     - https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/main_v2/charts/v0.6.0/azuredisk-csi-driver-v0.6.0.tgz
     version: v0.6.0
-generated: "2022-06-13T17:24:35.907638242Z"
+generated: "2022-06-22T20:48:14.810869-07:00"
diff --git a/charts/latest-v2/azuredisk-csi-driver-v2.0.0-beta.4.tgz b/charts/latest-v2/azuredisk-csi-driver-v2.0.0-beta.4.tgz
index eb820cdc76..2fd9b6029e 100644
Binary files a/charts/latest-v2/azuredisk-csi-driver-v2.0.0-beta.4.tgz and b/charts/latest-v2/azuredisk-csi-driver-v2.0.0-beta.4.tgz differ
diff --git a/charts/latest-v2/azuredisk-csi-driver/templates/csi-azuredisk-controller-cleanup.yaml b/charts/latest-v2/azuredisk-csi-driver/templates/csi-azuredisk-controller-cleanup.yaml
index a4ad1dee5e..c03b90020d 100644
--- a/charts/latest-v2/azuredisk-csi-driver/templates/csi-azuredisk-controller-cleanup.yaml
+++ b/charts/latest-v2/azuredisk-csi-driver/templates/csi-azuredisk-controller-cleanup.yaml
@@ -8,6 +8,7 @@ metadata:
     "helm.sh/hook-delete-policy": hook-succeeded
 {{ include "azuredisk.labels" . | indent 2 }}
 spec:
+  ttlSecondsAfterFinished: 300
   template:
     spec:
       {{- if .Values.imagePullSecrets }}