diff --git a/base/templates/release.yaml b/base/templates/release.yaml
index 31eb577..61760c7 100644
--- a/base/templates/release.yaml
+++ b/base/templates/release.yaml
@@ -5,7 +5,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
-  name: "{{ $.Release.Name }}-{{ $componentInstance }}"
+  name: "{{ printf "%s-%s" $.Release.Name $componentInstance | replace (printf "%s-%s" $.Release.Name $.Release.Name) $.Release.Name }}"
 spec:
   chart:
     spec:
@@ -13,7 +13,7 @@ spec:
         {{- toYaml $.Values.commons.helm.chart.sourceRef | nindent 8 }}
       chart: "./{{ $componentName }}"
       reconcileStrategy: "Revision"
-  releaseName: "{{ $.Release.Name }}-{{ $componentInstance }}"
+  releaseName: "{{ printf "%s-%s" $.Release.Name $componentInstance | replace (printf "%s-%s" $.Release.Name $.Release.Name) $.Release.Name }}"
   targetNamespace: "{{ ($config.namespace | default (dict)).name | default (dict) | default $.Release.Namespace }}"
   install:
     {{- toYaml $.Values.commons.helm.release.install | nindent 4 }}
diff --git a/docs/modules/infra/pages/auth.adoc b/docs/modules/infra/pages/auth.adoc
index 8a229ba..c2ae373 100644
--- a/docs/modules/infra/pages/auth.adoc
+++ b/docs/modules/infra/pages/auth.adoc
@@ -9,7 +9,7 @@ commons:
     namespace: "mycloud" <2>
     authentik:
       domain: "auth.wrenix.eu" <3>
-      backend: "mycloud-mycloud-authentik-hr" <4>
+      backend: "mycloud-authentik-hr" <4>
 
 components:
   infra-monitoring:
diff --git a/infra-monitoring/templates/karma/release.yaml b/infra-monitoring/templates/karma/release.yaml
index 9250819..2f028ca 100644
--- a/infra-monitoring/templates/karma/release.yaml
+++ b/infra-monitoring/templates/karma/release.yaml
@@ -115,7 +115,7 @@ spec:
         {{- end }}
         {{- with $.Values.commons.auth }}
         {{- if and .enabled (eq .type "authentik") (not $.Values.karma.auth.anonymous.enabled) }}
-        "traefik.ingress.kubernetes.io/router.middlewares": "{{ .namespace }}-mycloud-mycloud-authentik-outpost@kubernetescrd"
+        "traefik.ingress.kubernetes.io/router.middlewares": "{{ .namespace }}-mycloud-authentik-outpost@kubernetescrd"
         {{- end }}
         {{- end }}
         {{- with .annotations }}
diff --git a/infra-monitoring/templates/kube-prometheus-stack/release.yaml b/infra-monitoring/templates/kube-prometheus-stack/release.yaml
index 0d9be1b..b28e472 100644
--- a/infra-monitoring/templates/kube-prometheus-stack/release.yaml
+++ b/infra-monitoring/templates/kube-prometheus-stack/release.yaml
@@ -82,7 +82,7 @@ spec:
           {{- end }}
           {{- with $.Values.commons.auth }}
           {{- if and .enabled (eq .type "authentik") (not $.Values.prometheus.auth.anonymous.enabled) }}
-          "traefik.ingress.kubernetes.io/router.middlewares": "{{ .namespace }}-mycloud-mycloud-authentik-outpost@kubernetescrd"
+          "traefik.ingress.kubernetes.io/router.middlewares": "{{ .namespace }}-mycloud-authentik-outpost@kubernetescrd"
           {{- end }}
           {{- end }}
           {{- with .annotations }}
@@ -127,7 +127,7 @@ spec:
           {{- end }}
           {{- with $.Values.commons.auth }}
           {{- if and .enabled (eq .type "authentik") (not $.Values.alertmanager.auth.anonymous.enabled) }}
-          "traefik.ingress.kubernetes.io/router.middlewares": "{{ .namespace }}-mycloud-mycloud-authentik-outpost@kubernetescrd"
+          "traefik.ingress.kubernetes.io/router.middlewares": "{{ .namespace }}-mycloud-authentik-outpost@kubernetescrd"
           {{- end }}
           {{- end }}
           {{- with .annotations }}