diff --git a/charts/argo-workflows/.helmignore b/charts/argo-workflows/.helmignore
index f0c13194..b4af6c20 100644
--- a/charts/argo-workflows/.helmignore
+++ b/charts/argo-workflows/.helmignore
@@ -19,3 +19,4 @@
 .project
 .idea/
 *.tmproj
+ci/
diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index cc7f7c86..078b42b2 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.2.3
+version: 0.2.4
 appVersion: "v3.0.2"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
diff --git a/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml b/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml
index e917bb41..f5e10857 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.controller.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -6,3 +7,4 @@ metadata:
   annotations:
     {{- toYaml .| nindent 4 }}
   {{- end }}
+{{- end }}