diff --git a/helmchart/single-sign-on/templates/job-create-admin.yaml b/helmchart/single-sign-on/templates/job-create-admin.yaml
index 36aa21a313fd83e26b2894e5bd33e9c8c9ae503e..51b509c0d09aca491fd8a617151edb15d6fc5841 100644
--- a/helmchart/single-sign-on/templates/job-create-admin.yaml
+++ b/helmchart/single-sign-on/templates/job-create-admin.yaml
@@ -33,7 +33,7 @@ spec:
         - name: PUBLIC_URL
           value: https://{{ .Values.singleSignOnHost }}/login
         - name: DATABASE_URL
-          value: postgresql://stackspin:stackspin@{{ .Release.Name }}-postgresql/stackspin
+          value: postgresql://{{ .Values.login.db.user }}:{{ .Values.login.password }}@{{ .Release.Name }}-postgresql/{{ .Values.login.db.database }}
         - name: APP_SETTINGS
           value: config.DevelopmentConfig
         - name: SETUP_USER
diff --git a/helmchart/single-sign-on/values.yaml b/helmchart/single-sign-on/values.yaml
index cdc44823bbafe59dfa7afb16d3150a25cf33cd0e..97c511c8f2aacaddfb640054654754e1019879d5 100644
--- a/helmchart/single-sign-on/values.yaml
+++ b/helmchart/single-sign-on/values.yaml
@@ -203,6 +203,10 @@ login:
     << : &IMAGE_DEFAULTS_SSO { tag: "108-embed-login-panel-in-helmchart", pullPolicy: "Always" }
     repository: "open.greenhost.net:4567/stackspin/single-sign-on/login"
   podAnnotations: {}
+  db:
+    user: stackspin
+    passowrd: stackspin
+    database: stackspin
   login: admin@example.com
   password: ThisIsNotASecurePassword