diff --git a/chart/templates/crds.yaml b/chart/templates/crds.yaml
index 6a0f08b..4086ef8 100644
--- a/chart/templates/crds.yaml
+++ b/chart/templates/crds.yaml
@@ -537,44 +537,44 @@ spec:
     listKind: BackupTargetList
     plural: backuptargets
     shortNames:
-      - lhbt
+    - lhbt
     singular: backuptarget
   scope: Namespaced
   versions:
-    - name: v1beta1
-      served: true
-      storage: true
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              x-kubernetes-preserve-unknown-fields: true
-            status:
-              x-kubernetes-preserve-unknown-fields: true
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - name: URL
-          type: string
-          description: The backup target URL
-          jsonPath: .spec.backupTargetURL
-        - name: Credential
-          type: string
-          description: The backup target credential secret
-          jsonPath: .spec.credentialSecret
-        - name: Interval
-          type: string
-          description: The backup target poll interval
-          jsonPath: .spec.pollInterval
-        - name: Available
-          type: boolean
-          description: Indicate whether the backup target is available or not
-          jsonPath: .status.available
-        - name: LastSyncedAt
-          type: string
-          description: The backup target last synced time
-          jsonPath: .status.lastSyncedAt
+  - name: v1beta1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            x-kubernetes-preserve-unknown-fields: true
+    subresources:
+      status: {}
+    additionalPrinterColumns:
+    - name: URL
+      type: string
+      description: The backup target URL
+      jsonPath: .spec.backupTargetURL
+    - name: Credential
+      type: string
+      description: The backup target credential secret
+      jsonPath: .spec.credentialSecret
+    - name: Interval
+      type: string
+      description: The backup target poll interval
+      jsonPath: .spec.pollInterval
+    - name: Available
+      type: boolean
+      description: Indicate whether the backup target is available or not
+      jsonPath: .status.available
+    - name: LastSyncedAt
+      type: string
+      description: The backup target last synced time
+      jsonPath: .status.lastSyncedAt
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -589,40 +589,40 @@ spec:
     listKind: BackupVolumeList
     plural: backupvolumes
     shortNames:
-      - lhbv
+    - lhbv
     singular: backupvolume
   scope: Namespaced
   versions:
-    - name: v1beta1
-      served: true
-      storage: true
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              x-kubernetes-preserve-unknown-fields: true
-            status:
-              x-kubernetes-preserve-unknown-fields: true
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - name: CreatedAt
-          type: string
-          description: The backup volume creation time
-          jsonPath: .status.createdAt
-        - name: LastBackupName
-          type: string
-          description: The backup volume last backup name
-          jsonPath: .status.lastBackupName
-        - name: LastBackupAt
-          type: string
-          description: The backup volume last backup time
-          jsonPath: .status.lastBackupAt
-        - name: LastSyncedAt
-          type: string
-          description: The backup volume last synced time
-          jsonPath: .status.lastSyncedAt
+  - name: v1beta1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            x-kubernetes-preserve-unknown-fields: true
+    subresources:
+      status: {}
+    additionalPrinterColumns:
+    - name: CreatedAt
+      type: string
+      description: The backup volume creation time
+      jsonPath: .status.createdAt
+    - name: LastBackupName
+      type: string
+      description: The backup volume last backup name
+      jsonPath: .status.lastBackupName
+    - name: LastBackupAt
+      type: string
+      description: The backup volume last backup time
+      jsonPath: .status.lastBackupAt
+    - name: LastSyncedAt
+      type: string
+      description: The backup volume last synced time
+      jsonPath: .status.lastSyncedAt
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -637,44 +637,44 @@ spec:
     listKind: BackupList
     plural: backups
     shortNames:
-      - lhb
+    - lhb
     singular: backup
   scope: Namespaced
   versions:
-    - name: v1beta1
-      served: true
-      storage: true
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              x-kubernetes-preserve-unknown-fields: true
-            status:
-              x-kubernetes-preserve-unknown-fields: true
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - name: SnapshotName
-          type: string
-          description: The snapshot name
-          jsonPath: .status.snapshotName
-        - name: SnapshotSize
-          type: string
-          description: The snapshot size
-          jsonPath: .status.size
-        - name: SnapshotCreatedAt
-          type: string
-          description: The snapshot creation time
-          jsonPath: .status.snapshotCreatedAt
-        - name: State
-          type: string
-          description: The backup state
-          jsonPath: .status.state
-        - name: LastSyncedAt
-          type: string
-          description: The backup last synced time
-          jsonPath: .status.lastSyncedAt
+  - name: v1beta1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            x-kubernetes-preserve-unknown-fields: true
+    subresources:
+      status: {}
+    additionalPrinterColumns:
+    - name: SnapshotName
+      type: string
+      description: The snapshot name
+      jsonPath: .status.snapshotName
+    - name: SnapshotSize
+      type: string
+      description: The snapshot size
+      jsonPath: .status.size
+    - name: SnapshotCreatedAt
+      type: string
+      description: The snapshot creation time
+      jsonPath: .status.snapshotCreatedAt
+    - name: State
+      type: string
+      description: The backup state
+      jsonPath: .status.state
+    - name: LastSyncedAt
+      type: string
+      description: The backup last synced time
+      jsonPath: .status.lastSyncedAt
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -689,70 +689,70 @@ spec:
     listKind: RecurringJobList
     plural: recurringjobs
     shortNames:
-      - lhrj
+    - lhrj
     singular: recurringjob
   scope: Namespaced
   versions:
-    - name: v1beta1
-      served: true
-      storage: true
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            metadata:
-              type: object
-              properties:
-                name:
+  - name: v1beta1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          metadata:
+            type: object
+            properties:
+              name:
+                type: string
+          spec:
+            type: object
+            properties:
+              groups:
+                type: array
+                items:
                   type: string
-            spec:
-              type: object
-              properties:
-                groups:
-                  type: array
-                  items:
-                    type: string
-                task:
-                  type: string
-                  pattern: "^snapshot|backup$"
-                cron:
-                  type: string
-                retain:
-                  type: integer
-                concurrency:
-                  type: integer
-                labels:
-                  x-kubernetes-preserve-unknown-fields: true
-            status:
-              x-kubernetes-preserve-unknown-fields: true
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - name: Groups
-          type: string
-          description: Sets groupings to the jobs. When set to "default" group will be added to the volume label when no other job label exist in volume.
-          jsonPath: .spec.groups
-        - name: Task
-          type: string
-          description: Should be one of "backup" or "snapshot".
-          jsonPath: .spec.task
-        - name: Cron
-          type: string
-          description: The cron expression represents recurring job scheduling.
-          jsonPath: .spec.cron
-        - name: Retain
-          type: integer
-          description: The number of snapshots/backups to keep for the volume.
-          jsonPath: .spec.retain
-        - name: Concurrency
-          type: integer
-          description: The concurrent job to run by each cron job.
-          jsonPath: .spec.concurrency
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-        - name: Labels
-          type: string
-          description: Specify the labels
-          jsonPath: .spec.labels
+              task:
+                type: string
+                pattern: "^snapshot|backup$"
+              cron:
+                type: string
+              retain:
+                type: integer
+              concurrency:
+                type: integer
+              labels:
+                x-kubernetes-preserve-unknown-fields: true
+          status:
+            x-kubernetes-preserve-unknown-fields: true
+    subresources:
+      status: {}
+    additionalPrinterColumns:
+    - name: Groups
+      type: string
+      description: Sets groupings to the jobs. When set to "default" group will be added to the volume label when no other job label exist in volume.
+      jsonPath: .spec.groups
+    - name: Task
+      type: string
+      description: Should be one of "backup" or "snapshot".
+      jsonPath: .spec.task
+    - name: Cron
+      type: string
+      description: The cron expression represents recurring job scheduling.
+      jsonPath: .spec.cron
+    - name: Retain
+      type: integer
+      description: The number of snapshots/backups to keep for the volume.
+      jsonPath: .spec.retain
+    - name: Concurrency
+      type: integer
+      description: The concurrent job to run by each cron job.
+      jsonPath: .spec.concurrency
+    - name: Age
+      type: date
+      jsonPath: .metadata.creationTimestamp
+    - name: Labels
+      type: string
+      description: Specify the labels
+      jsonPath: .spec.labels
 ---
diff --git a/chart/templates/daemonset-sa.yaml b/chart/templates/daemonset-sa.yaml
index 636a4c0..9ce2dd0 100644
--- a/chart/templates/daemonset-sa.yaml
+++ b/chart/templates/daemonset-sa.yaml
@@ -91,7 +91,6 @@ spec:
       {{- if .Values.longhornManager.priorityClass }}
       priorityClassName: {{ .Values.longhornManager.priorityClass | quote}}
       {{- end }}
-      serviceAccountName: longhorn-service-account
       {{- if .Values.longhornManager.tolerations }}
       tolerations:
 {{ toYaml .Values.longhornManager.tolerations | indent 6 }}
@@ -100,6 +99,7 @@ spec:
       nodeSelector:
 {{ toYaml .Values.longhornManager.nodeSelector | indent 8 }}
       {{- end }}
+      serviceAccountName: longhorn-service-account
   updateStrategy:
     rollingUpdate:
       maxUnavailable: "100%"