diff --git a/charts/argo/templates/workflow-controller-clusterrole.yaml b/charts/argo/templates/workflow-controller-clusterrole.yaml
index 8df46229..9fb90cb8 100644
--- a/charts/argo/templates/workflow-controller-clusterrole.yaml
+++ b/charts/argo/templates/workflow-controller-clusterrole.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.controller.createServiceAccount }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -78,4 +79,4 @@ rules:
   verbs:
   - get
   - list
-
+{{- end }}
diff --git a/charts/argo/templates/workflow-controller-crb.yaml b/charts/argo/templates/workflow-controller-crb.yaml
index 5dc55111..b374e619 100644
--- a/charts/argo/templates/workflow-controller-crb.yaml
+++ b/charts/argo/templates/workflow-controller-crb.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.controller.createServiceAccount }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -21,3 +22,4 @@ subjects:
   {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml
index dc2781ee..93fee8f8 100644
--- a/charts/argo/templates/workflow-controller-deployment.yaml
+++ b/charts/argo/templates/workflow-controller-deployment.yaml
@@ -36,7 +36,11 @@ spec:
           - "--configmap"
           - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
           - "--executor-image"
+          {{- if .Values.executor.image.tag }}
+          - "{{ .Values.executor.image.name }}:{{ .Values.executor.image.tag }}"
+          {{- else }}
           - "{{ .Values.images.namespace }}/{{ .Values.images.executor }}:{{ default .Values.images.tag .Values.executor.image.tag }}"
+          {{- end }}
           - "--loglevel"
           - "{{ .Values.controller.logging.level }}"
           - "--gloglevel"
diff --git a/charts/argo/templates/workflow-controller-sa.yaml b/charts/argo/templates/workflow-controller-sa.yaml
index af3ef519..af456f50 100644
--- a/charts/argo/templates/workflow-controller-sa.yaml
+++ b/charts/argo/templates/workflow-controller-sa.yaml
@@ -1,4 +1,6 @@
+{{- if .Values.controller.createServiceAccount }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Values.controller.serviceAccount }}
+{{- end }}