diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index ab4b9aeaca8dcad044b41108f8ace58b9073bf90..f00148595b7c6ba5ce1b5fe40187e8e360bf31d6 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -36,35 +36,16 @@ spec:
         image: "{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ default .Chart.AppVersion .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         env:
-          - name: MEDIATOR_CONTROLLER_WEBHOOK
-            value: {{ .Values.mediator.controller.webhook | quote }}
-          - name: MEDIATOR_AGENT_LABEL
-            value: {{ .Values.mediator.agent.label | quote }}
-          - name: MEDIATOR_AGENT_HTTP_IN_PORT
-            value: {{ .Values.mediator.agent.http_in_port | quote }}
-          - name: MEDIATOR_AGENT_WS_IN_PORT
-            value: {{ .Values.mediator.agent.ws_in_port | quote }}
-          - name: MEDIATOR_AGENT_HTTP_ADMIN_PORT
-            value: {{ .Values.mediator.agent.http_admin_port | quote }}
-          - name: MEDIATOR_ALIAS
-            value: {{ .Values.mediator.alias | quote }}
-          - name: LOG_LEVEL
-            value: {{ .Values.mediator.log.level | quote }}
-          - name: MEDIATOR_ENDPOINT_URL
-            value: {{ .Values.mediator.endpoint.url | quote }}
-          - name: ENV
-            value: {{ .Values.mediator.env | quote }}
-          - name: ACAPY_WALLET_NAME
-            value: {{ .Values.mediator.wallet.name | quote }}
-          - name: MEDIATOR_ARG_FILE
-            value: {{ .Values.mediator.arg_file | quote }}
-            - name: POSTGRESQL_PORT
-            value: {{ .Values.mediator.postgre.port | quote }}
           - name: MEDIATOR_CONTROLLER_ADMIN_API_KEY
             valueFrom:
               secretKeyRef:
                 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
           - name: POSTGRESQL_HOST
             valueFrom:
               secretKeyRef:
@@ -90,6 +71,31 @@ spec:
               secretKeyRef:
                 name: {{ template "app.name" . }}-config
                 key: MEDIATOR_AGENT_ADMIN_MODE
+          - name: MEDIATOR_CONTROLLER_WEBHOOK
+            value: {{ .Values.mediator.controller.webhook | quote }}
+          - name: MEDIATOR_AGENT_LABEL
+            value: {{ .Values.mediator.agent.label | quote }}
+          - name: MEDIATOR_AGENT_HTTP_IN_PORT
+            value: {{ .Values.mediator.agent.http_in_port | quote }}
+          - name: MEDIATOR_AGENT_WS_IN_PORT
+            value: {{ .Values.mediator.agent.ws_in_port | quote }}
+          - name: MEDIATOR_AGENT_HTTP_ADMIN_PORT
+            value: {{ .Values.mediator.agent.http_admin_port | quote }}
+          - name: MEDIATOR_ALIAS
+            value: {{ .Values.mediator.alias | quote }}
+          - name: LOG_LEVEL
+            value: {{ .Values.mediator.log.level | quote }}
+          - name: MEDIATOR_ENDPOINT_URL
+            value: {{ .Values.mediator.endpoint.url | quote }}
+          - name: ENV
+            value: {{ .Values.mediator.env | quote }}
+          - name: ACAPY_WALLET_NAME
+            value: {{ .Values.mediator.wallet.name | quote }}
+          - name: MEDIATOR_ARG_FILE
+            value: {{ .Values.mediator.arg_file | quote }}
+            - name: POSTGRESQL_PORT
+            value: {{ .Values.mediator.postgre.port | quote }}
+          
 {{- if .Values.extraVars }}
 {{ toYaml .Values.extraVars | indent 8 }}
 {{- end }}