diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml
index b40880af45..4814b7f96f 100644
--- a/charts/aws-ebs-csi-driver/Chart.yaml
+++ b/charts/aws-ebs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.8.1"
 name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
-version: 0.8.1
+version: 0.8.2
 kubeVersion: ">=1.14.0-0"
 home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
 sources:
diff --git a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml
index 1888a9b8b9..92a8b40f80 100644
--- a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml
+++ b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: ebs-csi-controller-sa
+    name: {{ .Values.serviceAccount.controller.name }}
     namespace: kube-system
 roleRef:
   kind: ClusterRole
diff --git a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml
index 0fd549909c..e2478b9360 100644
--- a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml
+++ b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: ebs-csi-controller-sa
+    name: {{ .Values.serviceAccount.controller.name }}
     namespace: kube-system
 roleRef:
   kind: ClusterRole
diff --git a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-resizer.yaml b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-resizer.yaml
index b23063aa1c..997dc28eaf 100644
--- a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-resizer.yaml
+++ b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-resizer.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: ebs-csi-controller-sa
+    name: {{ .Values.serviceAccount.controller.name }}
     namespace: kube-system
 roleRef:
   kind: ClusterRole
diff --git a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshot-controller.yaml b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshot-controller.yaml
index df4937a6c3..cb46730950 100644
--- a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshot-controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshot-controller.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: ebs-snapshot-controller
+    name: {{ .Values.serviceAccount.snapshot.name }}
     namespace: kube-system
 roleRef:
   kind: ClusterRole
diff --git a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshotter.yaml b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshotter.yaml
index 6ebb1d91dc..f55c38e459 100644
--- a/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshotter.yaml
+++ b/charts/aws-ebs-csi-driver/templates/clusterrolebinding-snapshotter.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: ebs-csi-controller-sa
+    name: {{ .Values.serviceAccount.controller.name }}
     namespace: kube-system
 roleRef:
   kind: ClusterRole
diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
index ad7d24ee53..c0c94060e2 100644
--- a/charts/aws-ebs-csi-driver/templates/controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -26,7 +26,7 @@ spec:
         {{- with .Values.nodeSelector }}
 {{ toYaml . | indent 8 }}
         {{- end }}
-      serviceAccountName: ebs-csi-controller-sa
+      serviceAccountName: {{ .Values.serviceAccount.controller.name }}
       priorityClassName: system-cluster-critical
       {{- with .Values.affinity }}
       affinity: {{ toYaml . | nindent 8 }}
diff --git a/charts/aws-ebs-csi-driver/templates/rolebinding-snapshot-controller-leaderelection.yaml b/charts/aws-ebs-csi-driver/templates/rolebinding-snapshot-controller-leaderelection.yaml
index 1b7f71ecc9..0670c7051c 100644
--- a/charts/aws-ebs-csi-driver/templates/rolebinding-snapshot-controller-leaderelection.yaml
+++ b/charts/aws-ebs-csi-driver/templates/rolebinding-snapshot-controller-leaderelection.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: ebs-snapshot-controller
+    name: {{ .Values.serviceAccount.snapshot.name }}
     namespace: kube-system
 roleRef:
   kind: Role
diff --git a/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-controller.yaml b/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-controller.yaml
index 9e2cf7cc70..8ec4c4e001 100644
--- a/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/serviceaccount-csi-controller.yaml
@@ -1,7 +1,8 @@
+{{- if .Values.serviceAccount.controller.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: ebs-csi-controller-sa
+  name: {{ .Values.serviceAccount.controller.name }}
   namespace: kube-system
   labels:
     {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
@@ -13,3 +14,4 @@ metadata:
   #annotations:
   #  eks.amazonaws.com/role-arn: arn:aws:iam::586565787010:role/ebs-csi-role
   {{- end }}
+{{- end -}}
diff --git a/charts/aws-ebs-csi-driver/templates/serviceaccount-snapshot-controller.yaml b/charts/aws-ebs-csi-driver/templates/serviceaccount-snapshot-controller.yaml
index baa39c84e6..3b5ef2bca7 100644
--- a/charts/aws-ebs-csi-driver/templates/serviceaccount-snapshot-controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/serviceaccount-snapshot-controller.yaml
@@ -1,9 +1,10 @@
 {{- if .Values.enableVolumeSnapshot }}
+{{- if .Values.serviceAccount.snapshot.create }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: ebs-snapshot-controller
+  name: {{ .Values.serviceAccount.snapshot.name }}
   namespace: kube-system
   labels:
     {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
@@ -11,3 +12,4 @@ metadata:
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/aws-ebs-csi-driver/templates/statefulset.yaml b/charts/aws-ebs-csi-driver/templates/statefulset.yaml
index 08a43ededa..6a904c4b35 100644
--- a/charts/aws-ebs-csi-driver/templates/statefulset.yaml
+++ b/charts/aws-ebs-csi-driver/templates/statefulset.yaml
@@ -20,7 +20,7 @@ spec:
         app: ebs-snapshot-controller
         {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }}
     spec:
-      serviceAccountName: ebs-snapshot-controller
+      serviceAccountName: {{ .Values.serviceAccount.snapshot.name }}
       containers:
         - name: snapshot-controller
           image: quay.io/k8scsi/snapshot-controller:v2.1.1
diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
index 5fc3ca2725..0e746c7893 100644
--- a/charts/aws-ebs-csi-driver/values.yaml
+++ b/charts/aws-ebs-csi-driver/values.yaml
@@ -91,6 +91,10 @@ node:
 
 serviceAccount:
   controller:
+    create: true # A service account will be created for you if set to true. Set to false if you want to use your own.
+    name: ebs-csi-controller-sa # Name of the service-account to be used/created.
     annotations: {}
   snapshot:
+    create: true
+    name: ebs-snapshot-controller
     annotations: {}