diff --git a/charts/spire/charts/spire-server/templates/configmap.yaml b/charts/spire/charts/spire-server/templates/configmap.yaml
index 2fa417b..5750db9 100644
--- a/charts/spire/charts/spire-server/templates/configmap.yaml
+++ b/charts/spire/charts/spire-server/templates/configmap.yaml
@@ -3,7 +3,7 @@
 {{- include "spire-lib.check-strict-mode" (list . "jwtIssuer must be set" (eq (include "spire-lib.jwt-issuer" .) "https://oidc-discovery.example.org"))}}
 {{- include "spire-lib.check-strict-mode" (list . "caSubject.country must be set" (eq (include "spire-server.ca-subject-country" .) "ARPA"))}}
 {{- include "spire-lib.check-strict-mode" (list . "caSubject.organization must be set" (eq (include "spire-server.ca-subject-organization" .) "Example"))}}
-{{- include "spire-lib.check-strict-mode" (list . "caSubject.commonNname must be set" (eq (include "spire-server.ca-subject-common-name" .) "example.org"))}}
+{{- include "spire-lib.check-strict-mode" (list . "caSubject.commonName must be set" (eq (include "spire-server.ca-subject-common-name" .) "example.org"))}}
 {{- range $type, $tvals := .Values.customPlugins }}
 {{-   if not (has $type (list "bundlePublisher" "credentialComposer" "keyManager" "nodeAttestor" "upstreamAuthority" "notifier")) }}
 {{-     fail (printf "Unknown plugin type specified: %s" $type) }}
diff --git a/charts/spire/charts/spire-server/templates/server-resource.yaml b/charts/spire/charts/spire-server/templates/server-resource.yaml
index b8e7422..c1ec81e 100644
--- a/charts/spire/charts/spire-server/templates/server-resource.yaml
+++ b/charts/spire/charts/spire-server/templates/server-resource.yaml
@@ -27,11 +27,11 @@
 {{- if hasKey .Values.nodeAttestor "k8sPsat" }}
 {{-   fail "k8sPsat was renamed to k8sPSAT. Please update your config." }}
 {{- end }}
-{{- if hasKey .Values.nodeAttestor "externalK8sPSA" }}
+{{- if hasKey .Values.nodeAttestor "externalK8sPsat" }}
 {{-   fail "externalK8sPsat was renamed to externalK8sPSAT. Please update your config." }}
 {{- end }}
 {{- if hasKey .Values.notifier "k8sbundle" }}
-{{-   fail "k8sbundle was renmaed to k8sBundle. Please update your config." }}
+{{-   fail "k8sbundle was renamed to k8sBundle. Please update your config." }}
 {{- end }}
 {{- if eq .Values.kind "statefulset" }}
 {{-   if not (has .Values.persistence.type (list "pvc" "hostPath" "emptyDir")) }}