diff --git a/charts/README.md b/charts/README.md
index 236c456ec4..321cb5f618 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -125,11 +125,11 @@ The following table lists the configurable parameters of the latest Azure Disk C
 | `driver.azureGoSDKLogLevel`                       | [Azure go sdk log level](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/previous-versions-quickstart.md#built-in-basic-requestresponse-logging)  | ``(no logs), `DEBUG`, `INFO`, `WARNING`, `ERROR`, [etc](https://github.com/Azure/go-autorest/blob/50e09bb39af124f28f29ba60efde3fa74a4fe93f/logger/logger.go#L65-L73) |
 | `feature.enableFSGroupPolicy`                     | enable `fsGroupPolicy` on a k8s 1.20+ cluster              | `true`                      |
 | `image.baseRepo`                                  | base repository of driver images                           | `mcr.microsoft.com`                      |
-| `image.azuredisk.repository`                      | azuredisk-csi-driver docker image                          | `/oss/csi/azuredisk-csi`                      |
-| `image.azuredisk.tag`                             | azuredisk-csi-driver docker image tag                      | `latest`                                                       |
+| `image.azuredisk.repository`                      | azuredisk-csi-driver docker image                          | `/oss/kubernetes-csi/azuredisk-csi`                      |
+| `image.azuredisk.tag`                             | azuredisk-csi-driver docker image tag                      | ``                                                       |
 | `image.azuredisk.pullPolicy`                      | azuredisk-csi-driver image pull policy                     | `IfNotPresent`                                                 |
 | `image.csiProvisioner.repository`                 | csi-provisioner docker image                               | `/oss/kubernetes-csi/csi-provisioner`         |
-| `image.csiProvisioner.tag`                        | csi-provisioner docker image tag                           | `v3.1.1`                                                       |
+| `image.csiProvisioner.tag`                        | csi-provisioner docker image tag                           | `v3.2.0`                                                       |
 | `image.csiProvisioner.pullPolicy`                 | csi-provisioner image pull policy                          | `IfNotPresent`                                                 |
 | `image.csiAttacher.repository`                    | csi-attacher docker image                                  | `/oss/kubernetes-csi/csi-attacher`            |
 | `image.csiAttacher.tag`                           | csi-attacher docker image tag                              | `v3.5.0`                                                       |
diff --git a/charts/latest/azuredisk-csi-driver-v1.20.0.tgz b/charts/latest/azuredisk-csi-driver-v1.20.0.tgz
index b40c0df5b0..1ab8a1bed7 100644
Binary files a/charts/latest/azuredisk-csi-driver-v1.20.0.tgz and b/charts/latest/azuredisk-csi-driver-v1.20.0.tgz differ
diff --git a/charts/latest/azuredisk-csi-driver/values.yaml b/charts/latest/azuredisk-csi-driver/values.yaml
index 50a77a9d12..bb91e46689 100644
--- a/charts/latest/azuredisk-csi-driver/values.yaml
+++ b/charts/latest/azuredisk-csi-driver/values.yaml
@@ -6,7 +6,7 @@ image:
     pullPolicy: IfNotPresent
   csiProvisioner:
     repository: /oss/kubernetes-csi/csi-provisioner
-    tag: v3.1.1
+    tag: v3.2.0
     pullPolicy: IfNotPresent
   csiAttacher:
     repository: /oss/kubernetes-csi/csi-attacher
diff --git a/charts/v1.17.0/azuredisk-csi-driver-v1.17.0.tgz b/charts/v1.17.0/azuredisk-csi-driver-v1.17.0.tgz
index 49fdb293f7..66329684dc 100644
Binary files a/charts/v1.17.0/azuredisk-csi-driver-v1.17.0.tgz and b/charts/v1.17.0/azuredisk-csi-driver-v1.17.0.tgz differ
diff --git a/charts/v1.17.0/azuredisk-csi-driver/values.yaml b/charts/v1.17.0/azuredisk-csi-driver/values.yaml
index 7182cea83b..8cddb39caf 100644
--- a/charts/v1.17.0/azuredisk-csi-driver/values.yaml
+++ b/charts/v1.17.0/azuredisk-csi-driver/values.yaml
@@ -1,7 +1,7 @@
 image:
   baseRepo: mcr.microsoft.com
   azuredisk:
-    repository: /k8s/csi/azuredisk-csi
+    repository: /oss/kubernetes-csi/azuredisk-csi
     tag: v1.17.0
     pullPolicy: IfNotPresent
   csiProvisioner:
diff --git a/charts/v1.18.0/azuredisk-csi-driver-v1.18.0.tgz b/charts/v1.18.0/azuredisk-csi-driver-v1.18.0.tgz
index afc3b85040..154343a528 100644
Binary files a/charts/v1.18.0/azuredisk-csi-driver-v1.18.0.tgz and b/charts/v1.18.0/azuredisk-csi-driver-v1.18.0.tgz differ
diff --git a/charts/v1.18.0/azuredisk-csi-driver/values.yaml b/charts/v1.18.0/azuredisk-csi-driver/values.yaml
index bcdd1efaf3..666fe78ecf 100644
--- a/charts/v1.18.0/azuredisk-csi-driver/values.yaml
+++ b/charts/v1.18.0/azuredisk-csi-driver/values.yaml
@@ -1,7 +1,7 @@
 image:
   baseRepo: mcr.microsoft.com
   azuredisk:
-    repository: /k8s/csi/azuredisk-csi
+    repository: /oss/kubernetes-csi/azuredisk-csi
     tag: v1.18.0
     pullPolicy: IfNotPresent
   csiProvisioner:
diff --git a/charts/v1.19.0/azuredisk-csi-driver-v1.19.0.tgz b/charts/v1.19.0/azuredisk-csi-driver-v1.19.0.tgz
index 8bc8e528d9..b9befc619a 100644
Binary files a/charts/v1.19.0/azuredisk-csi-driver-v1.19.0.tgz and b/charts/v1.19.0/azuredisk-csi-driver-v1.19.0.tgz differ
diff --git a/charts/v1.19.0/azuredisk-csi-driver/values.yaml b/charts/v1.19.0/azuredisk-csi-driver/values.yaml
index bb5530746a..2a74c55fce 100644
--- a/charts/v1.19.0/azuredisk-csi-driver/values.yaml
+++ b/charts/v1.19.0/azuredisk-csi-driver/values.yaml
@@ -1,7 +1,7 @@
 image:
   baseRepo: mcr.microsoft.com
   azuredisk:
-    repository: /k8s/csi/azuredisk-csi
+    repository: /oss/kubernetes-csi/azuredisk-csi
     tag: v1.19.0
     pullPolicy: IfNotPresent
   csiProvisioner:
diff --git a/deploy/csi-azuredisk-controller.yaml b/deploy/csi-azuredisk-controller.yaml
index 3bc063cb02..f851decd39 100644
--- a/deploy/csi-azuredisk-controller.yaml
+++ b/deploy/csi-azuredisk-controller.yaml
@@ -31,7 +31,7 @@ spec:
           effect: "NoSchedule"
       containers:
         - name: csi-provisioner
-          image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.1.1
+          image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.2.0
           args:
             - "--feature-gates=Topology=true"
             - "--csi-address=$(ADDRESS)"
diff --git a/deploy/v1.17.0/csi-azuredisk-controller.yaml b/deploy/v1.17.0/csi-azuredisk-controller.yaml
index 3315c2c1a2..eae0316393 100644
--- a/deploy/v1.17.0/csi-azuredisk-controller.yaml
+++ b/deploy/v1.17.0/csi-azuredisk-controller.yaml
@@ -133,7 +133,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.17.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.17.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.17.0/csi-azuredisk-node-windows-hostprocess.yaml b/deploy/v1.17.0/csi-azuredisk-node-windows-hostprocess.yaml
index 3460287be4..7c82b51501 100644
--- a/deploy/v1.17.0/csi-azuredisk-node-windows-hostprocess.yaml
+++ b/deploy/v1.17.0/csi-azuredisk-node-windows-hostprocess.yaml
@@ -41,7 +41,7 @@ spec:
       hostNetwork: true
       initContainers:
         - name: init
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.17.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.17.0
           imagePullPolicy: IfNotPresent
           command:
             - "powershell.exe"
@@ -94,7 +94,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.17.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.17.0
           imagePullPolicy: IfNotPresent
           command:
             - "azurediskplugin.exe"
diff --git a/deploy/v1.17.0/csi-azuredisk-node-windows.yaml b/deploy/v1.17.0/csi-azuredisk-node-windows.yaml
index 4cf07caeb2..9698a4d519 100644
--- a/deploy/v1.17.0/csi-azuredisk-node-windows.yaml
+++ b/deploy/v1.17.0/csi-azuredisk-node-windows.yaml
@@ -91,7 +91,7 @@ spec:
               cpu: 10m
               memory: 40Mi
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.17.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.17.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.17.0/csi-azuredisk-node.yaml b/deploy/v1.17.0/csi-azuredisk-node.yaml
index c9c9d4b68d..ab971ba18e 100644
--- a/deploy/v1.17.0/csi-azuredisk-node.yaml
+++ b/deploy/v1.17.0/csi-azuredisk-node.yaml
@@ -82,7 +82,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.17.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.17.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.18.0/csi-azuredisk-controller.yaml b/deploy/v1.18.0/csi-azuredisk-controller.yaml
index 00391c5993..751da4b0e2 100644
--- a/deploy/v1.18.0/csi-azuredisk-controller.yaml
+++ b/deploy/v1.18.0/csi-azuredisk-controller.yaml
@@ -133,7 +133,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.18.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.18.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.18.0/csi-azuredisk-node-windows-hostprocess.yaml b/deploy/v1.18.0/csi-azuredisk-node-windows-hostprocess.yaml
index 9de5cd2c9f..75308a2b77 100644
--- a/deploy/v1.18.0/csi-azuredisk-node-windows-hostprocess.yaml
+++ b/deploy/v1.18.0/csi-azuredisk-node-windows-hostprocess.yaml
@@ -41,7 +41,7 @@ spec:
       hostNetwork: true
       initContainers:
         - name: init
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.18.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.18.0
           imagePullPolicy: IfNotPresent
           command:
             - "powershell.exe"
@@ -94,7 +94,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.18.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.18.0
           imagePullPolicy: IfNotPresent
           command:
             - "azurediskplugin.exe"
diff --git a/deploy/v1.18.0/csi-azuredisk-node-windows.yaml b/deploy/v1.18.0/csi-azuredisk-node-windows.yaml
index e67cc4cb86..8f6840b42a 100644
--- a/deploy/v1.18.0/csi-azuredisk-node-windows.yaml
+++ b/deploy/v1.18.0/csi-azuredisk-node-windows.yaml
@@ -91,7 +91,7 @@ spec:
               cpu: 10m
               memory: 40Mi
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.18.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.18.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.18.0/csi-azuredisk-node.yaml b/deploy/v1.18.0/csi-azuredisk-node.yaml
index 674a3ca4ca..7e2be08dc4 100644
--- a/deploy/v1.18.0/csi-azuredisk-node.yaml
+++ b/deploy/v1.18.0/csi-azuredisk-node.yaml
@@ -82,7 +82,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.18.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.18.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.19.0/csi-azuredisk-controller.yaml b/deploy/v1.19.0/csi-azuredisk-controller.yaml
index 6a9fb2fcaf..fd4e6225c9 100644
--- a/deploy/v1.19.0/csi-azuredisk-controller.yaml
+++ b/deploy/v1.19.0/csi-azuredisk-controller.yaml
@@ -133,7 +133,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.19.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.19.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.19.0/csi-azuredisk-node-windows-hostprocess.yaml b/deploy/v1.19.0/csi-azuredisk-node-windows-hostprocess.yaml
index 7b93c47eb5..3e83ae11d1 100644
--- a/deploy/v1.19.0/csi-azuredisk-node-windows-hostprocess.yaml
+++ b/deploy/v1.19.0/csi-azuredisk-node-windows-hostprocess.yaml
@@ -41,7 +41,7 @@ spec:
       hostNetwork: true
       initContainers:
         - name: init
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.19.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.19.0
           imagePullPolicy: IfNotPresent
           command:
             - "powershell.exe"
@@ -94,7 +94,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.19.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.19.0
           imagePullPolicy: IfNotPresent
           command:
             - "azurediskplugin.exe"
diff --git a/deploy/v1.19.0/csi-azuredisk-node-windows.yaml b/deploy/v1.19.0/csi-azuredisk-node-windows.yaml
index c3ffa14b3d..85291a6771 100644
--- a/deploy/v1.19.0/csi-azuredisk-node-windows.yaml
+++ b/deploy/v1.19.0/csi-azuredisk-node-windows.yaml
@@ -91,7 +91,7 @@ spec:
               cpu: 10m
               memory: 40Mi
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.19.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.19.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.19.0/csi-azuredisk-node.yaml b/deploy/v1.19.0/csi-azuredisk-node.yaml
index a182a3bea6..bcedb49fd5 100644
--- a/deploy/v1.19.0/csi-azuredisk-node.yaml
+++ b/deploy/v1.19.0/csi-azuredisk-node.yaml
@@ -82,7 +82,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: azuredisk
-          image: mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.19.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.19.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"