diff --git a/smardigo/templates/connect/secret.yml b/smardigo/templates/connect/secret.yml
index a0f7f8d..4a57d74 100644
--- a/smardigo/templates/connect/secret.yml
+++ b/smardigo/templates/connect/secret.yml
@@ -16,11 +16,11 @@ data:
   {{- if or (not $previous) (not $previous.data) }}
   # if not set, then generate a new password
   JWT_SECRET: "{{ .Values.connect.jwt.secret | b64enc }}"
-  ADMIN_PASSWORD: "{{ .Values.connect.database.password | b64enc }}"
+  ADMIN_PASSWORD: "{{ .Values.connect.admin.password | b64enc }}"
   DATASOURCE_USERNAME: "{{ .Values.connect.database.username | b64enc }}"
   DATASOURCE_PASSWORD: "{{ .Values.connect.database.password | b64enc }}"
-  ELASTIC_USERNAME: "{{ .Values.connect.database.username | b64enc }}"
-  ELASTIC_PASSWORD: "{{ .Values.connect.database.password | b64enc }}"
+  ELASTIC_USERNAME: "{{ .Values.connect.elastic.username | b64enc }}"
+  ELASTIC_PASSWORD: "{{ .Values.connect.elastic.password | b64enc }}"
   OIDC_CLIENT_SECRET: "{{ .Values.connect.oidc.client_secret | b64enc }}"
   MAIL_USER: "{{ .Values.connect.mail.username | b64enc }}"
   MAIL_PASSWORD: "{{ .Values.connect.mail.password | b64enc }}"