diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 46af0a151e0f6c014989a5cbb0dfa57a3410bbfa..20467d77d23f6c87c2f1fd193d195f662cd6a568 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -3,6 +3,10 @@
 {{- printf "%s-%s.%s" (.Values.ozgcloud).bezeichner (.Values.ozgcloud).adminDomainSuffix .Values.baseUrl }}
 {{- end -}}
 
+{{/* Namespace */}}
+{{- define "app.namespace" -}}
+{{- default .Release.Namespace | toString | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 
 {{/* Default Labels: Helm recommended best-practice labels https://helm.sh/docs/chart_best_practices/labels/ */}}
 {{- define "app.defaultLabels" }}
diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml
index 50f908ff7b56cd0a94eb1456f3125aab0338ce5e..aeb4ddf983026b54cc45b38b9f135e5a69eb8bfc 100644
--- a/src/main/helm/templates/keycloak-client-crd.yaml
+++ b/src/main/helm/templates/keycloak-client-crd.yaml
@@ -5,7 +5,7 @@ apiVersion: operator.ozgcloud.de/v1
 kind: OzgCloudKeycloakClient
 metadata:
   name: administration-keycloak-client
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "app.namespace" $ }}
 spec:
   keep_after_delete: {{ (.Values.sso).keep_after_delete | default false }}
   client_name: {{ $client.client_name }}