diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index f6df8715..3f2fb613 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v2.8.0
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.12.1
+version: 0.12.2
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo/templates/server-crb.yaml b/charts/argo/templates/server-crb.yaml
index a919e573..d1ad5ea4 100644
--- a/charts/argo/templates/server-crb.yaml
+++ b/charts/argo/templates/server-crb.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.server.enabled -}}
+{{- if and .Values.server.enabled .Values.server.createServiceAccount -}}
 apiVersion: rbac.authorization.k8s.io/v1
 {{- if .Values.singleNamespace }}
 kind: RoleBinding
diff --git a/charts/argo/templates/server-sa.yaml b/charts/argo/templates/server-sa.yaml
index c0d332e1..5b419a65 100644
--- a/charts/argo/templates/server-sa.yaml
+++ b/charts/argo/templates/server-sa.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.server.enabled -}}
+{{- if and .Values.server.enabled .Values.server.createServiceAccount -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 5914600c..bc031487 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -157,6 +157,9 @@ server:
   servicePort: 2746
   # servicePortName: http
   serviceAccount: argo-server
+  # Whether to create the service account with the name specified in
+  # server.serviceAccount and bind it to the server role.
+  createServiceAccount: true
   # Service account annotations
   serviceAccountAnnotations: {}
   # Annotations to be applied to the UI Service