diff --git a/application/templates/cronjob.yaml b/application/templates/cronjob.yaml
index 417b87ea..41b0fbe5 100644
--- a/application/templates/cronjob.yaml
+++ b/application/templates/cronjob.yaml
@@ -54,12 +54,8 @@ spec:
           annotations: {{ toYaml . | nindent 12 }}
           {{- end }}
         spec:
-          {{- if $.Values.rbac.enabled }}
-          {{- if $.Values.rbac.serviceAccount.name }}
-          serviceAccountName: {{ $.Values.rbac.serviceAccount.name }}
-            {{- else }}
-          serviceAccountName: {{ template "application.name" $ }}
-          {{- end }}
+          {{- if and $.Values.rbac.enabled $.Values.rbac.serviceAccount.enabled }}
+          serviceAccountName: {{ default (include "application.name" $) $.Values.rbac.serviceAccount.name }}
           {{- end }}
           containers:
           - name: {{ $name }}
diff --git a/application/templates/deployment.yaml b/application/templates/deployment.yaml
index 1f827f4f..7aa3f5bf 100644
--- a/application/templates/deployment.yaml
+++ b/application/templates/deployment.yaml
@@ -311,12 +311,8 @@ spec:
         {{- end }}
         {{- end }}
       {{- end }}
-      {{- if .Values.rbac.serviceAccount.enabled }}
-      {{- if .Values.rbac.serviceAccount.name }}
-      serviceAccountName: {{ .Values.rbac.serviceAccount.name }}
-      {{- else }}
-      serviceAccountName: {{ template "application.name" $ }}
-      {{- end }}
+      {{- if and .Values.rbac.enabled .Values.rbac.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "application.name" .) .Values.rbac.serviceAccount.name }}
       {{- end }}
       {{- if .Values.deployment.hostNetwork }}
       hostNetwork: {{ .Values.deployment.hostNetwork }}
diff --git a/application/templates/job.yaml b/application/templates/job.yaml
index 6dc0501e..6e37724d 100644
--- a/application/templates/job.yaml
+++ b/application/templates/job.yaml
@@ -37,12 +37,8 @@ spec:
       annotations: {{ toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      {{- if $.Values.rbac.enabled }}
-      {{- if $.Values.rbac.serviceAccount.name }}
-      serviceAccountName: {{ $.Values.rbac.serviceAccount.name }}
-        {{- else }}
-      serviceAccountName: {{ template "application.name" $ }}
-      {{- end }}
+      {{- if and $.Values.rbac.enabled $.Values.rbac.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "application.name" $) $.Values.rbac.serviceAccount.name }}
       {{- end }}
       containers:
       - name: {{ $name }}