diff --git a/apps/matrix/templates/deployment.yaml b/apps/matrix/templates/deployment.yaml
index 0aa4838..7bd1699 100644
--- a/apps/matrix/templates/deployment.yaml
+++ b/apps/matrix/templates/deployment.yaml
@@ -48,12 +48,12 @@ spec:
               mountPath: "/var/lib/postgresql/data"
               subPath: postgres
         - name: matrix
-          image: matrixdotorg/synapse:v{{ .Values.synapseVersion }}
+          image: ungleich/ungleich-matrix-synapse:{{ .Values.synapseVersion }}
           ports:
             - containerPort: 8008
           env:
-            - name: SYNAPSE_CONFIG_PATH
-              value: "/config/homeserver.yaml"
+            - name: SYNAPSE_CONFIG_DIR
+              value: "/config"
           volumeMounts:
             - name: data
               mountPath: "/data"
@@ -75,6 +75,11 @@ spec:
         - name: matrix-config
           configMap:
             name: {{ tpl .Values.identifier . }}-matrix-config
+            items:
+              - key: homeserver.yaml
+                path: homeserver.yaml
+              - key: log.yaml
+                path: log.yaml
 
 ---
 apiVersion: v1
@@ -196,8 +201,9 @@ kind: ConfigMap
 metadata:
   name: {{ tpl .Values.identifier . }}-postgres-config
 data:
-  POSTGRES_USER: matrix-synapse
-  POSTGRES_DB: matrix-synapse
+  POSTGRES_USER: "matrix-synapse"
+  POSTGRES_DB: "matrix-synapse"
+  POSTGRES_HOST: "localhost"
 ---
 apiVersion: v1
 kind: ConfigMap