diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index e6d9c8ad3c0c651c342697ccc99a741a46791248..ffc0931f31ebe3cbb31004f345a65aaaccdaa2d2 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -60,10 +60,10 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.ssoClientName" -}}
-{{- if (.Values.sso).client_name -}}
-{{ printf "%s" (.Values.sso).client_name }}
+{{- if (.Values.sso.keycloak_clients[0]).client_name -}}
+{{ printf "%s" (.Values.sso.keycloak_clients[0]).client_name }}
 {{- else -}}
-{{ printf "administration" }}
+{{ printf "admin" }}
 {{- end -}}
 {{- end -}}
 
diff --git a/src/test/helm/deployment_defaults_sso_test.yaml b/src/test/helm/deployment_defaults_sso_test.yaml
index 70a0cac25bae20872a5556b66f68021159f391cb..003c2a53f489823af729e3f43fd43edefbc70e28 100644
--- a/src/test/helm/deployment_defaults_sso_test.yaml
+++ b/src/test/helm/deployment_defaults_sso_test.yaml
@@ -50,7 +50,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_oauth2_resource
-            value: administration
+            value: admin
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -77,7 +77,9 @@ tests:
   - it: check different client name
     set:
       sso:
-        client_name: different-client
+        keycloak_clients:
+          - client_name: different-client
+            client_roles: []
         serverUrl: https://sso.company.local
     asserts:
       - isKind: