diff --git a/charts/spire/charts/spire-server/templates/_helpers.tpl b/charts/spire/charts/spire-server/templates/_helpers.tpl
index 726f40e..e7124d6 100644
--- a/charts/spire/charts/spire-server/templates/_helpers.tpl
+++ b/charts/spire/charts/spire-server/templates/_helpers.tpl
@@ -78,9 +78,9 @@ Create the name of the service account to use
 {{- $root := . }}
 {{- with .Values.upstreamAuthority.disk -}}
 {{- if eq (.secret.create | toString) "true" -}}
-{{ include "spire.fullname" $root }}-upstream-ca
+{{ include "spire-server.fullname" $root }}-upstream-ca
 {{- else -}}
-{{ default (include "spire.fullname" $root) .secret.name }}
+{{ default (include "spire-server.fullname" $root) .secret.name }}
 {{- end -}}
 {{- end -}}
 {{- end }}