diff --git a/charts/dbgate/templates/deployment.yaml b/charts/dbgate/templates/deployment.yaml
index 1f834130..75047dcf 100644
--- a/charts/dbgate/templates/deployment.yaml
+++ b/charts/dbgate/templates/deployment.yaml
@@ -82,7 +82,6 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if not .Values.authzproxy.enabled }}
           env:
             - name: CONNECTIONS
               value: "PRIMARY"
@@ -99,11 +98,15 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.app.authSecret.name }}
                   key: username
+          {{- if .Values.authzproxy.enabled }}
             - name: PASSWORD_PRIMARY
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.app.authSecret.name }}
                   key: password
+          {{- else }}
+            - name: PASSWORD_MODE_PRIMARY
+              value: askPassword
           {{- end }}
           ports:
             - name: http
diff --git a/charts/mongo-ui/templates/deployment.yaml b/charts/mongo-ui/templates/deployment.yaml
index 6e5be44b..c7108682 100644
--- a/charts/mongo-ui/templates/deployment.yaml
+++ b/charts/mongo-ui/templates/deployment.yaml
@@ -34,10 +34,20 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if not .Values.authzproxy.enabled }}
           env:
             - name: MONGO_URL
               value: {{ .Values.app.url }}
+          {{- if not .Values.authzproxy.enabled }}
+            - name: MONGOGUI_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.app.authSecret.name }}
+                  key: username
+            - name: MONGOGUI_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.app.authSecret.name }}
+                  key: password
           {{- end }}
           ports:
             - name: http