diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 31dc7f4c391fed39c64186170732ff44e5984ee2..29d00e92895f9474e70d6cecf68cac6717202793 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -42,17 +42,11 @@ spec:
                 name: {{ template "app.name" . }}-config
                 key: MEDIATOR_CONTROLLER_ADMIN_API_KEY
           - name: MEDIATOR_AGENT_ADMIN_API_KEY
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "app.name" . }}-config
-                key: MEDIATOR_AGENT_ADMIN_API_KEY
+            value: {{ .Values.mediator.admin.key | quote }}
           - name: ACAPY_WALLET_KEY
             value: {{ .Values.mediator.wallet.key | quote }}
           - name: MEDIATOR_AGENT_ADMIN_MODE
-            valueFrom:
-              secretKeyRef:
-                name: {{ template "app.name" . }}-config
-                key: MEDIATOR_AGENT_ADMIN_MODE
+            value: {{ .Values.mediator.admin.mode | quote }}
           - name: MEDIATOR_CONTROLLER_WEBHOOK
             value: {{ .Values.mediator.controller.webhook | quote }}
           - name: MEDIATOR_AGENT_LABEL
@@ -75,6 +69,10 @@ spec:
             value: {{ .Values.mediator.wallet.name | quote }}
           - name: MEDIATOR_ARG_FILE
             value: {{ .Values.mediator.arg_file | quote }}
+          - name: DB_USER
+            value: {{ .Values.postgres.user }}
+          - name: DB_PASSWORD
+            value: {{ .Values.postgres.password }}
           
 {{- if .Values.extraVars }}
 {{ toYaml .Values.extraVars | indent 8 }}