diff --git a/charts/matrix-synapse/templates/deployment.yaml b/charts/matrix-synapse/templates/deployment.yaml
index f89cddc..1491796 100644
--- a/charts/matrix-synapse/templates/deployment.yaml
+++ b/charts/matrix-synapse/templates/deployment.yaml
@@ -86,7 +86,7 @@ spec:
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "matrix-synapse.postgresql.fullname" . }}
+                  name: {{ .Values.postgresql.existingSecret | default (include "matrix-synapse.postgresql.fullname" .) }}
                   key: postgresql-password
           {{- end }}
 {{- $redisPass := include "matrix-synapse.redis.password" . }}
@@ -94,7 +94,7 @@ spec:
             - name: REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "matrix-synapse.redis.fullname" . }}
+                  name: {{ .Values.redis.existingSecret | default (include "matrix-synapse.redis.fullname" .) }}
                   key: redis-password
           {{- end }}
           {{- with .Values.synapse.extraEnv }}
diff --git a/charts/matrix-synapse/templates/worker-deployment.yaml b/charts/matrix-synapse/templates/worker-deployment.yaml
index 7ea7cd9..ce30619 100644
--- a/charts/matrix-synapse/templates/worker-deployment.yaml
+++ b/charts/matrix-synapse/templates/worker-deployment.yaml
@@ -87,14 +87,14 @@ spec:
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "matrix-synapse.postgresql.fullname" $ }}
+                  name: {{ .Values.postgresql.existingSecret | default (include "matrix-synapse.postgresql.fullname" $) }}
                   key: postgresql-password
           {{- end }}
           {{- if and $.Values.redis.enabled (default $.Values.redis.usePassword true) }}
             - name: REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "matrix-synapse.redis.fullname" $ }}
+                  name: {{ .Values.redis.existingSecret | default (include "matrix-synapse.redis.fullname" $) }}
                   key: redis-password
           {{- end }}
           {{- with $config.extraEnv | default $default.extraEnv }}