diff --git a/charts/spire/charts/spire-server/templates/_helpers.tpl b/charts/spire/charts/spire-server/templates/_helpers.tpl
index c6de080..726f40e 100644
--- a/charts/spire/charts/spire-server/templates/_helpers.tpl
+++ b/charts/spire/charts/spire-server/templates/_helpers.tpl
@@ -84,3 +84,7 @@ Create the name of the service account to use
 {{- end -}}
 {{- end -}}
 {{- end }}
+
+{{- define "spire-k8s-workload-registrar.fullname" -}}
+{{ include "spire-server.fullname" . | trimSuffix "-server" }}-k8s-workload-registrar
+{{- end }}
diff --git a/charts/spire/charts/spire-server/templates/k8s-workload-registrar-configmap.yaml b/charts/spire/charts/spire-server/templates/k8s-workload-registrar-configmap.yaml
index 17ffead..5cdcc86 100644
--- a/charts/spire/charts/spire-server/templates/k8s-workload-registrar-configmap.yaml
+++ b/charts/spire/charts/spire-server/templates/k8s-workload-registrar-configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "spire-server.fullname" . }}-k8s-workload-registrar
+  name: {{ include "spire-k8s-workload-registrar.fullname" . }}
   namespace: {{ .Release.Namespace }}
 data:
   workload-registrar.conf: |
diff --git a/charts/spire/charts/spire-server/templates/k8s-workload-registrar-roles.yaml b/charts/spire/charts/spire-server/templates/k8s-workload-registrar-roles.yaml
index 7e9ff39..e4022f3 100644
--- a/charts/spire/charts/spire-server/templates/k8s-workload-registrar-roles.yaml
+++ b/charts/spire/charts/spire-server/templates/k8s-workload-registrar-roles.yaml
@@ -4,7 +4,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "spire-server.fullname" . }}-k8s-workload-registrar
+  name: {{ include "spire-k8s-workload-registrar.fullname" . }}
 rules:
   - apiGroups: [""]
     resources: ["pods", "nodes", "endpoints"]
@@ -13,11 +13,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "spire-server.fullname" . }}-k8s-workload-registrar
+  name: {{ include "spire-k8s-workload-registrar.fullname" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ include "spire-server.fullname" . }}-k8s-workload-registrar
+  name: {{ include "spire-k8s-workload-registrar.fullname" . }}
 subjects:
   - kind: ServiceAccount
     name: {{ include "spire-server.serviceAccountName" . }}
@@ -26,7 +26,7 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ include "spire-server.fullname" . }}-k8s-workload-registrar
+  name: {{ include "spire-k8s-workload-registrar.fullname" . }}
   namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: [""]
@@ -43,11 +43,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "spire-server.fullname" . }}-k8s-workload-registrar
+  name: {{ include "spire-k8s-workload-registrar.fullname" . }}
   namespace: {{ .Release.Namespace }}
 roleRef:
   kind: Role
-  name: {{ include "spire-server.fullname" . }}-k8s-workload-registrar
+  name: {{ include "spire-k8s-workload-registrar.fullname" . }}
   apiGroup: rbac.authorization.k8s.io
 subjects:
   - kind: ServiceAccount
diff --git a/charts/spire/charts/spire-server/templates/statefulset.yaml b/charts/spire/charts/spire-server/templates/statefulset.yaml
index 8e607e2..3904a9d 100644
--- a/charts/spire/charts/spire-server/templates/statefulset.yaml
+++ b/charts/spire/charts/spire-server/templates/statefulset.yaml
@@ -127,7 +127,7 @@ spec:
         {{- if eq (.Values.k8sWorkloadRegistrar.enabled | toString) "true" }}
         - name: k8s-workload-registrar-config
           configMap:
-            name: {{ include "spire-server.fullname" . }}-k8s-workload-registrar
+            name: {{ include "spire-k8s-workload-registrar.fullname" . }}
         {{- end }}
   volumeClaimTemplates:
     {{- if eq (.Values.dataStorage.enabled | toString) "true" }}