diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
index 8b5ce3463..910c7b6f1 100644
--- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
+++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
@@ -39,7 +39,7 @@ spec:
                     values:
                       - csi-cephfsplugin-provisioner
               topologyKey: "kubernetes.io/hostname"
-      serviceAccount: cephfs-csi-provisioner
+      serviceAccountName: cephfs-csi-provisioner
       priorityClassName: system-cluster-critical
       containers:
         - name: csi-provisioner
diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
index 7c869cdea..da49b30d4 100644
--- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
+++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
@@ -12,7 +12,7 @@ spec:
       labels:
         app: csi-cephfsplugin
     spec:
-      serviceAccount: cephfs-csi-nodeplugin
+      serviceAccountName: cephfs-csi-nodeplugin
       priorityClassName: system-node-critical
       hostNetwork: true
       # to use e.g. Rook orchestrated cluster, and mons' FQDN is
diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
index c99e0ed7f..0d20cc367 100644
--- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
+++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
@@ -39,7 +39,7 @@ spec:
                     values:
                       - csi-rbdplugin-provisioner
               topologyKey: "kubernetes.io/hostname"
-      serviceAccount: rbd-csi-provisioner
+      serviceAccountName: rbd-csi-provisioner
       priorityClassName: system-cluster-critical
       containers:
         - name: csi-provisioner
diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
index 6759c5c32..d15894aee 100644
--- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml
+++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
@@ -12,7 +12,7 @@ spec:
       labels:
         app: csi-rbdplugin
     spec:
-      serviceAccount: rbd-csi-nodeplugin
+      serviceAccountName: rbd-csi-nodeplugin
       hostNetwork: true
       hostPID: true
       priorityClassName: system-node-critical
diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md
index 594a10b60..067479a36 100644
--- a/docs/ceph-csi-upgrade.md
+++ b/docs/ceph-csi-upgrade.md
@@ -195,7 +195,7 @@ spec:
       labels:
         app: csi-cephfsplugin
     spec:
-      serviceAccount: cephfs-csi-nodeplugin
+      serviceAccountName: cephfs-csi-nodeplugin
 ```
 
 in the above template we have added `updateStrategy` and its `type` to the
@@ -313,7 +313,7 @@ spec:
       labels:
         app: csi-rbdplugin
     spec:
-      serviceAccount: rbd-csi-nodeplugin
+      serviceAccountName: rbd-csi-nodeplugin
 ```
 
 in the above template we have added `updateStrategy` and its `type` to the
diff --git a/examples/kms/vault/vault.yaml b/examples/kms/vault/vault.yaml
index d03497c11..53dd8fba2 100644
--- a/examples/kms/vault/vault.yaml
+++ b/examples/kms/vault/vault.yaml
@@ -119,7 +119,7 @@ spec:
     metadata:
       name: vault-init-job
     spec:
-      serviceAccount: rbd-csi-vault-token-review
+      serviceAccountName: rbd-csi-vault-token-review
       volumes:
         - name: init-scripts-volume
           configMap: