diff --git a/mycloud-authentik/templates/release.yaml b/mycloud-authentik/templates/release.yaml
index 316ecca..9b45628 100644
--- a/mycloud-authentik/templates/release.yaml
+++ b/mycloud-authentik/templates/release.yaml
@@ -69,7 +69,7 @@ spec:
     # https://github.com/goauthentik/helm/pull/146
     #
     serviceAccount:
-      create: true
+      create: false
 
     {{- $host := .Values.ingress.host | default (printf "auth.%s" .Values.commons.ingress.domain) }}
     global:
@@ -88,6 +88,7 @@ spec:
           labels:
             {{- toYaml .Values.commons.prometheus.monitor.labels | nindent 12 }}
 
+      serviceAccount: {{ .Release.Name }}
       extraContainers:
         - name: sidecar-blueprints
           image: "ghcr.io/kiwigrid/k8s-sidecar:1.26.0"
@@ -137,6 +138,8 @@ spec:
           labels:
             {{- toYaml .Values.commons.prometheus.monitor.labels | nindent 12 }}
 
+
+      serviceAccount: {{ .Release.Name }}
       extraContainers:
         - name: sidecar-blueprints
           image: "ghcr.io/kiwigrid/k8s-sidecar:1.26.0"
diff --git a/mycloud-authentik/templates/role-binding.yaml b/mycloud-authentik/templates/role-binding.yaml
index b153763..232b836 100644
--- a/mycloud-authentik/templates/role-binding.yaml
+++ b/mycloud-authentik/templates/role-binding.yaml
@@ -8,4 +8,4 @@ roleRef:
   name: {{ .Release.Name }}-blueprint-sidecar
 subjects:
   - kind: ServiceAccount
-    name: {{ .Release.Name }}-hr
+    name: {{ .Release.Name }}
diff --git a/mycloud-authentik/templates/serviceaccount.yaml b/mycloud-authentik/templates/serviceaccount.yaml
new file mode 100644
index 0000000..cb203d6
--- /dev/null
+++ b/mycloud-authentik/templates/serviceaccount.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}