diff --git a/apps/matrix/templates/deployment.yaml b/apps/matrix/templates/deployment.yaml
index c0c099a..de55a8a 100644
--- a/apps/matrix/templates/deployment.yaml
+++ b/apps/matrix/templates/deployment.yaml
@@ -20,21 +20,18 @@ spec:
           command:
             - sh
             - -c
-            - until ls /etc/letsencrypt/live/{{ tpl .Values.fqdn . }}/fullchain.pem; do sleep 5; done
+            - until ls /etc/letsencrypt/live/{{ tpl .Values.fqdn . }}/fullchain.pem; do sleep 2; done
           volumeMounts:
             - name: etcletsencrypt
               mountPath: "/etc/letsencrypt"
         - name: generate-matrix-signing-key
-          image: matrixdotorg/synapse:v{{ .Values.synapseVersion }}
-          env:
-            - name: SYNAPSE_CONFIG_PATH
-              value: "/config/homeserver.yaml"
+          image: ungleich/ungleich-matrix-synapse:{{ .Values.synapseVersion }}
           command:
             - "python"
             - "-m"
             - "synapse.app.homeserver"
             - "--config-path"
-            - "/config"
+            - "/baseconfig"
             - "--keys-directory"
             - "/data"
             - "--generate-keys"
@@ -42,9 +39,25 @@ spec:
             - name: data
               mountPath: "/data"
             - name: matrix-config
-              mountPath: "/config"
+              mountPath: "/baseconfig"
       containers:
         # This container will only start *after* the cert has been placed
+        - name: debug
+          image: alpine:latest
+          volumeMounts:
+            - name: nginx-config
+              mountPath: "/etc/nginx/conf.d/"
+            - name: etcletsencrypt
+              mountPath: "/etc/letsencrypt"
+            - name: data
+              mountPath: "/data"
+            - name: matrix-config
+              mountPath: "/baseconfig"
+            - name: postgres-vars
+              mountPath: "/postgres"
+          args:
+            - sleep
+            - "1000000"
         - name: nginx
           image: nginx:1.21-alpine
           ports:
@@ -61,23 +74,30 @@ spec:
           envFrom:
           - secretRef:
               name: {{ tpl .Values.identifier . }}-postgres-config
-          # Use subpath to avoid lost+found error
           volumeMounts:
             - name: postgres-data
               mountPath: "/var/lib/postgresql/data"
+              # Use subpath to avoid lost+found error
               subPath: postgres
         - name: matrix
+          # SYNAPSE_CONFIG_DIR: where additional configs are placed -> postgres-db.yaml
+          # SYNAPSE_CONFIG_PATH: the initial config
+          # log.yaml -> same dir as postgres-db.yaml
+          # /data = persistent storage
           image: ungleich/ungleich-matrix-synapse:{{ .Values.synapseVersion }}
           ports:
             - containerPort: 8008
           env:
+            - name: SYNAPSE_CONFIG_PATH
+              value: "/baseconfig/homeserver.yaml"
             - name: SYNAPSE_CONFIG_DIR
               value: "/config"
+
           volumeMounts:
             - name: data
               mountPath: "/data"
             - name: matrix-config
-              mountPath: "/config"
+              mountPath: "/baseconfig"
       volumes:
         - name: etcletsencrypt
           persistentVolumeClaim:
@@ -238,7 +258,7 @@ metadata:
   name: {{ tpl .Values.identifier . }}-postgres-config
   annotations:
     secret-generator.v1.mittwald.de/autogenerate: POSTGRES_PASSWORD
-data:
+stringdata:
   POSTGRES_USER: "matrix-synapse"
   POSTGRES_DB: "matrix-synapse"
   POSTGRES_HOST: "localhost"