diff --git a/charts/matrix-synapse/templates/deployment.yaml b/charts/matrix-synapse/templates/deployment.yaml
index 14f2f2a..ffbce2e 100644
--- a/charts/matrix-synapse/templates/deployment.yaml
+++ b/charts/matrix-synapse/templates/deployment.yaml
@@ -81,15 +81,13 @@ spec:
                           -c /synapse/config/homeserver.yaml \
                           -c /synapse/config/conf.d/
           env:
-{{- $postgresPass := include "matrix-synapse.postgresql.password" . }}
-          {{- if and .Values.postgresql.enabled }}
+          {{- if .Values.postgresql.enabled }}
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.postgresql.existingSecret | default (include "matrix-synapse.postgresql.fullname" .) }}
                   key: postgresql-password
           {{- end }}
-{{- $redisPass := include "matrix-synapse.redis.password" . }}
           {{- if and .Values.redis.enabled (default .Values.redis.usePassword true) }}
             - name: REDIS_PASSWORD
               valueFrom: