diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml
index 131bf0e3f095bb24e21e625e8c22ef4f6fa125f3..031db6e518635ed64b4e9023c31efb2889e46530 100644
--- a/src/main/helm/templates/keycloak-client-crd.yaml
+++ b/src/main/helm/templates/keycloak-client-crd.yaml
@@ -1,4 +1,6 @@
 {{- if not (.Values.sso).disableOzgOperator -}}
+{{ range $client := (.Values.sso).keycloak_clients }}
+---
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgCloudKeycloakClient
 metadata:
@@ -6,15 +8,15 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   keep_after_delete: {{ (.Values.sso).keep_after_delete | default false }}
-  client_name: admin
+  client_name: {{ $client.client_name }}
   client_base_url: https://{{ include "app.baseDomain" $ }}
   client_web_origins:
     - https://{{ include "app.baseDomain" $ }}
   client_redirect_uris:
     - https://{{ include "app.baseDomain" $ }}
     - https://{{ include "app.baseDomain" $ }}/*
-  {{- if ((.Values.sso).keycloak_clients).additional_redirect_uris }}
-    {{- with ((.Values.sso).keycloak_clients).additional_redirect_uris }}
+  {{- if $client.additional_redirect_uris }}
+    {{- with $client.additional_redirect_uris }}
 {{ toYaml . | indent 4 }}
     {{- end }}
   {{- end }}