diff --git a/charts/spire/README.md b/charts/spire/README.md
index cd76f03..0366609 100644
--- a/charts/spire/README.md
+++ b/charts/spire/README.md
@@ -57,14 +57,11 @@ Kubernetes: `>=1.21.0-0`
 | fullnameOverride | string | `""` |  |
 | k8s-workload-registrar.clusterName | string | `"example-cluster"` |  |
 | k8s-workload-registrar.enabled | bool | `true` |  |
-| k8s-workload-registrar.fullNameOverride | string | `"k8s-workload-registrar"` |  |
 | k8s-workload-registrar.server.socketPath | string | `"/run/spire/server-sockets/spire-server.sock"` |  |
 | k8s-workload-registrar.trustDomain | string | `"example.org"` |  |
 | nameOverride | string | `""` |  |
 | spiffe-csi-driver.agentSocketPath | string | `"/run/spire/agent-sockets/spire-agent.sock"` |  |
-| spiffe-csi-driver.fullNameOverride | string | `"spiffe-csi-driver"` |  |
 | spiffe-oidc-discovery-provider.enabled | bool | `false` |  |
-| spiffe-oidc-discovery-provider.fullNameOverride | string | `"spiffe-oidc-discovery-provider"` |  |
 | spiffe-oidc-discovery-provider.trustDomain | string | `"example.org"` |  |
 | spire-agent.bundleConfigMap | string | `"spire-bundle"` |  |
 | spire-agent.clusterName | string | `"example-cluster"` |  |
diff --git a/charts/spire/charts/k8s-workload-registrar/templates/roles.yaml b/charts/spire/charts/k8s-workload-registrar/templates/roles.yaml
index 0539854..c34635c 100644
--- a/charts/spire/charts/k8s-workload-registrar/templates/roles.yaml
+++ b/charts/spire/charts/k8s-workload-registrar/templates/roles.yaml
@@ -65,9 +65,9 @@ metadata:
   name: {{ include "k8s-workload-registrar.fullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ include "spire.serviceAccountName" . }}
+    name: {{ include "k8s-workload-registrar.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: {{ include "spire.fullname" . }}
+  name: {{ include "k8s-workload-registrar.fullname" . }}
   apiGroup: rbac.authorization.k8s.io
diff --git a/charts/spire/templates/_helpers.tpl b/charts/spire/templates/_helpers.tpl
index a7a399a..7d7d356 100644
--- a/charts/spire/templates/_helpers.tpl
+++ b/charts/spire/templates/_helpers.tpl
@@ -29,54 +29,3 @@ Create chart name and version as used by the chart label.
 {{- define "spire.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "spire.labels" -}}
-helm.sh/chart: {{ include "spire.chart" . }}
-{{ include "spire.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "spire.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "spire.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Common oidc labels
-*/}}
-{{- define "spire.oidc.labels" -}}
-helm.sh/chart: {{ include "spire.chart" . }}
-{{ include "spire.oidc.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector oidc labels
-*/}}
-{{- define "spire.oidc.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "spire.name" . }}-oidc
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "spire.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "spire.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/spire/templates/image-pull-secrets.yaml b/charts/spire/templates/image-pull-secrets.yaml
deleted file mode 100644
index 71b675f..0000000
--- a/charts/spire/templates/image-pull-secrets.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- $fullname := include "spire.fullname" . }}
-{{- $ns := .Release.Namespace }}
-{{- $labels := include "spire.labels" . }}
-{{- range .Values.imagePullSecrets }}
-{{- $registryAuthDocument := dict -}}
-{{- $authMessage := printf "%s:%s" .username .password | b64enc }}
-{{- $_ := set $registryAuthDocument "auth" $authMessage }}
-{{- $dockerAuthDocument := dict .registryURL $registryAuthDocument }}
-{{- $dockerConfigJSONDocument := dict "auths" $dockerAuthDocument -}}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ (printf "%s-%s" $fullname .name) }}
-  namespace: {{ $ns }}
-  labels:
-    {{- $labels | nindent 4 }}
-data:
-  .dockerconfigjson: {{ $dockerConfigJSONDocument | toJson | b64enc | quote }}
-type: kubernetes.io/dockerconfigjson
-{{- end }}
diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml
index 05011ef..4c9bcc1 100644
--- a/charts/spire/values.yaml
+++ b/charts/spire/values.yaml
@@ -21,16 +21,13 @@ spire-agent:
   socketPath: &agentSocketPath /run/spire/agent-sockets/spire-agent.sock
 
 spiffe-csi-driver:
-  fullNameOverride: spiffe-csi-driver
   agentSocketPath: *agentSocketPath
 
 spiffe-oidc-discovery-provider:
-  fullNameOverride: spiffe-oidc-discovery-provider
   enabled: false
   trustDomain: *trustDomain
 
 k8s-workload-registrar:
-  fullNameOverride: k8s-workload-registrar
   enabled: true
 
   clusterName: *clusterName