diff --git a/charts/static-site/templates/deployment.yaml b/charts/static-site/templates/deployment.yaml
index f496ed1..21770cd 100644
--- a/charts/static-site/templates/deployment.yaml
+++ b/charts/static-site/templates/deployment.yaml
@@ -23,7 +23,9 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ template "robustName" .Release.Name  }}
+      {{- if .Values.serviceAccount }}
+      serviceAccountName: {{ .Values.serviceAccount }}
+      {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }} 
       volumes:
diff --git a/charts/static-site/templates/serviceaccount.yaml b/charts/static-site/templates/serviceaccount.yaml
deleted file mode 100644
index 4dfca3a..0000000
--- a/charts/static-site/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "robustName" .Release.Name  }}
-  labels:
-    {{- include "staticSite.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}