diff --git a/helm-charts/kubeinvaders/templates/deployment.yaml b/helm-charts/kubeinvaders/templates/deployment.yaml
index 950a172..acdc6ae 100644
--- a/helm-charts/kubeinvaders/templates/deployment.yaml
+++ b/helm-charts/kubeinvaders/templates/deployment.yaml
@@ -19,8 +19,8 @@ spec:
         app.kubernetes.io/name: kubeinvaders
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
+      serviceAccountName: kubeinvaders
       containers:
-        serviceAccountName: {{ template "kubeinvaders.serviceAccountName" . }
         - env:
           - name: ENDPOINT
             value: "{{ .Values.ingress.hostName }}"
diff --git a/helm-charts/kubeinvaders/templates/serviceaccount.yaml b/helm-charts/kubeinvaders/templates/serviceaccount.yaml
index 4703351..a261355 100644
--- a/helm-charts/kubeinvaders/templates/serviceaccount.yaml
+++ b/helm-charts/kubeinvaders/templates/serviceaccount.yaml
@@ -3,7 +3,7 @@ kind: ServiceAccount
 metadata:
   annotations:
     "helm.sh/hook": "pre-install"
-  name: {{ template "kubeinvaders.serviceAccountName" . }}
+  name: kubeinvaders
   labels:
     app: {{ template "kubeinvaders.name" . }}
     chart: {{ template "kubeinvaders.chart" . }}