diff --git a/charts/matrix-synapse/templates/secrets.yaml b/charts/matrix-synapse/templates/secrets.yaml
index 4a758fe..05090db 100644
--- a/charts/matrix-synapse/templates/secrets.yaml
+++ b/charts/matrix-synapse/templates/secrets.yaml
@@ -62,7 +62,7 @@ stringData:
     redis:
       enabled: true
       host: {{ $redisHost | quote }}
-{{- if or .Values.redis.password .Values.externalRedis.password }}
+{{- if or .Values.redis.usePassword .Values.redis.password .Values.externalRedis.password }}
   {{- if $redisPass }}
       password: {{ $redisPass | quote }}
   {{- else }}
diff --git a/charts/matrix-synapse/templates/well-known.yaml b/charts/matrix-synapse/templates/well-known.yaml
index ee662c7..4b3ff1f 100644
--- a/charts/matrix-synapse/templates/well-known.yaml
+++ b/charts/matrix-synapse/templates/well-known.yaml
@@ -10,6 +10,7 @@ metadata:
     component: well-known
 data:
   lighttpd.conf: |
+    server.port = 8080
     server.modules = (
       "mod_rewrite",
       "mod_status",
@@ -79,7 +80,7 @@ spec:
           securityContext:
             {{- toYaml .Values.wellknown.securityContext | nindent 12 }}
           ports:
-            - containerPort: 80
+            - containerPort: 8080
               name: http
               protocol: TCP
           readinessProbe:
@@ -96,12 +97,16 @@ spec:
             - mountPath: {{ .Values.wellknown.htdocsPath }}/server.json
               name: files
               subPath: server.json
+            - mountPath: /run
+              name: run
           resources:
             {{- toYaml .Values.wellknown.resources | nindent 12 }}
       volumes:
         - name: files
           configMap:
             name: {{ $wkName }}
+        - name: run
+          emptyDir: {}
     {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/matrix-synapse/values.yaml b/charts/matrix-synapse/values.yaml
index b6ae0c3..94f7e23 100644
--- a/charts/matrix-synapse/values.yaml
+++ b/charts/matrix-synapse/values.yaml
@@ -80,6 +80,8 @@ config:
   # enableRegistration: false
   ## Note; this value will default to a random string if not specified.
   # registrationSharedSecret: ''
+  ## Note; Strongly recommended to set this to a secure value.
+  # macaroonSecretKey: ''
   # allowGuests: false
 
   ## Should the Synapse instance report stats.