diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml
index a0ec2bfb4..1078b3383 100644
--- a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml
+++ b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/configmap.yaml
@@ -31,7 +31,7 @@ data:
 
     workload_api {
       socket_path = {{ include "spiffe-oidc-discovery-provider.workload-api-socket-path" . | quote }}
-      trust_domain = "{{ .Values.trustDomain }}"
+      trust_domain = {{ include "spiffe-oidc-discovery-provider.trust-domain" . | quote }}
     }
 
     health_checks {
diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml
index 72e07e169..316741b5d 100644
--- a/charts/spire/values.yaml
+++ b/charts/spire/values.yaml
@@ -2,12 +2,12 @@
 global:
   k8s:
     # -- This is the value of your clusters `kubeadm init --service-dns-domain` flag
-    clusterDomain: "cluster.local"
+    clusterDomain: cluster.local
   spire:
     # -- Set the name of the Kubernetes cluster
-    clusterName: "example-cluster"
+    clusterName: example-cluster
     # -- Set the trust domain to use for the spiffe identifiers
-    trustDomain: "example.org"
+    trustDomain: example.org
     # -- Override all instances of bundleConfigMap
     bundleConfigMap: ""