diff --git a/charts/airbyte/templates/server/deployment.yaml b/charts/airbyte/templates/server/deployment.yaml
index 4e7cc99b0b49..c95d87612673 100644
--- a/charts/airbyte/templates/server/deployment.yaml
+++ b/charts/airbyte/templates/server/deployment.yaml
@@ -43,11 +43,19 @@ spec:
             configMapKeyRef:
               name: airbyte-env
               key: CONFIG_ROOT
+        {{- if .Values.postgresql.enabled }}
         - name: DATABASE_PASSWORD
           valueFrom:
             configMapKeyRef:
               name: airbyte-env
               key: DATABASE_PASSWORD
+        {{- else }}
+        - name: DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.externalDatabase.existingSecret }}
+              key: {{ .Values.externalDatabase.existingSecretPasswordKey }}
+        {{- end }}
         - name: DATABASE_URL
           valueFrom:
             configMapKeyRef: