diff --git a/helm-charts/0.21.0/charts/safe/templates/identity.yaml b/helm-charts/0.21.0/charts/safe/templates/identity.yaml
index 25bef02d..45f4eafa 100644
--- a/helm-charts/0.21.0/charts/safe/templates/identity.yaml
+++ b/helm-charts/0.21.0/charts/safe/templates/identity.yaml
@@ -23,5 +23,5 @@ spec:
       app.kubernetes.io/name: {{ include "safe.fullname" . }}
       app.kubernetes.io/part-of: {{ .Values.global.vsecm.namespace }}
   workloadSelectorTemplates:
-    - "k8s:ns:{{`{{ .PodMeta.Namespace }}`}}"
-    - "k8s:sa:{{`{{ .PodSpec.ServiceAccountName }}`}}"
+    - "k8s:ns:{{ .Values.global.vsecm.namespace }}"
+    - "k8s:sa:{{ include "safe.serviceAccountName" . }}"
diff --git a/helm-charts/0.21.0/charts/safe/values.yaml b/helm-charts/0.21.0/charts/safe/values.yaml
index 1375776d..fe3dbf28 100644
--- a/helm-charts/0.21.0/charts/safe/values.yaml
+++ b/helm-charts/0.21.0/charts/safe/values.yaml
@@ -62,7 +62,7 @@ serviceAccount:
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: ""
+  name: "vsecm-safe"
 
 podAnnotations: {}
 
diff --git a/helm-charts/0.21.0/charts/sentinel/values.yaml b/helm-charts/0.21.0/charts/sentinel/values.yaml
index 9dd161b7..587bf804 100644
--- a/helm-charts/0.21.0/charts/sentinel/values.yaml
+++ b/helm-charts/0.21.0/charts/sentinel/values.yaml
@@ -30,7 +30,7 @@ serviceAccount:
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: ""
+  name: "vsecm-sentinel"
 
 podAnnotations: {}