diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml
index 59e7bed8..42d05c5b 100644
--- a/charts/latest/csi-driver-nfs/values.yaml
+++ b/charts/latest/csi-driver-nfs/values.yaml
@@ -1,7 +1,7 @@
 image:
     nfs:
-        repository: gcr.io/k8s-staging-sig-storage/nfsplugin
-        tag: amd64-linux-canary
+        repository: mcr.microsoft.com/k8s/csi/nfs-csi
+        tag: latest
         pullPolicy: IfNotPresent
     csiProvisioner:
         repository: k8s.gcr.io/sig-storage/csi-provisioner
diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml
index 9a2f3ef2..d7f44bec 100644
--- a/deploy/csi-nfs-controller.yaml
+++ b/deploy/csi-nfs-controller.yaml
@@ -61,7 +61,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: nfs
-          image: gcr.io/k8s-staging-sig-storage/nfsplugin:amd64-linux-canary
+          image: mcr.microsoft.com/k8s/csi/nfs-csi:latest
           securityContext:
             privileged: true
             capabilities:
diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml
index 2cd3323b..dd66fa8d 100644
--- a/deploy/csi-nfs-node.yaml
+++ b/deploy/csi-nfs-node.yaml
@@ -63,7 +63,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: gcr.io/k8s-staging-sig-storage/nfsplugin:amd64-linux-canary
+          image: mcr.microsoft.com/k8s/csi/nfs-csi:latest
           args:
             - "-v=5"
             - "--nodeid=$(NODE_ID)"
diff --git a/deploy/example/storageclass-nfs.yaml b/deploy/example/storageclass-nfs.yaml
index fdd8137c..d3f7d748 100644
--- a/deploy/example/storageclass-nfs.yaml
+++ b/deploy/example/storageclass-nfs.yaml
@@ -7,7 +7,7 @@ provisioner: nfs.csi.k8s.io
 parameters:
   server: nfs-server.default.svc.cluster.local
   share: /
-reclaimPolicy: Retain  # only retain is supported
+reclaimPolicy: Retain
 volumeBindingMode: Immediate
 mountOptions:
   - hard