diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 46172ed4f14e4c7a06767e5c75833cf84b301162..1bbdc15d4117a56e21cb1245f965c44ea7f8ab93 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -60,10 +60,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.ssoClientName" -}}
-{{- if ( .Values.sso).keycloak_clients -}}
-{{- with (first .Values.sso.keycloak_clients) }}
-{{ printf "%s" .client_name }}
-{{- end }}
+{{- if (.Values.sso).client_name -}}
+{{ printf "%s" (.Values.sso).client_name }}
 {{- else -}}
 {{ printf "admin" }}
 {{- end -}}
diff --git a/src/test/helm/deployment_defaults_sso_test.yaml b/src/test/helm/deployment_defaults_sso_test.yaml
index 78c0ceef7562485f7ed0b7adcc2caeb397eaeb2b..d5e91d3040c5865a3e2881204e6d531f463e93fa 100644
--- a/src/test/helm/deployment_defaults_sso_test.yaml
+++ b/src/test/helm/deployment_defaults_sso_test.yaml
@@ -75,8 +75,7 @@ tests:
   - it: check different client name
     set:
       sso:
-        keycloak_clients:
-          - client_name: different-client
+        client_name: different-client
     asserts:
       - isKind:
           of: Deployment