diff --git a/apps/matrix/templates/pvc.yaml b/apps/matrix/templates/pvc.yaml
index 76a5dbe..b73b397 100644
--- a/apps/matrix/templates/pvc.yaml
+++ b/apps/matrix/templates/pvc.yaml
@@ -7,8 +7,8 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 50Mi
-  storageClassName: rook-cephfs
+      storage: {{ .Values.storage.letsencrypt.size }}
+  storageClassName: {{ .Values.storage.letsencrypt.storageClass }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -19,8 +19,8 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 50Mi
-  storageClassName: rook-cephfs
+      storage: {{ .Values.storage.letsencrypt.size }}
+  storageClassName: {{ .Values.storage.letsencrypt.storageClass }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -31,8 +31,8 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 1Gi
-  storageClassName: rook-cephfs
+      storage: {{ .Values.storage.data.size }}
+  storageClassName: {{ .Values.storage.data.storageClass }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -43,5 +43,5 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 500Mi
-  storageClassName: rook-ceph-block
+      storage: {{ .Values.storage.db.size }}
+  storageClassName: {{ .Values.storage.db.storageClass }}
diff --git a/apps/matrix/templates/synapse.yaml b/apps/matrix/templates/synapse.yaml
index 3a98b8c..f260d31 100644
--- a/apps/matrix/templates/synapse.yaml
+++ b/apps/matrix/templates/synapse.yaml
@@ -24,7 +24,7 @@ spec:
             - "-m"
             - "synapse.app.homeserver"
             - "--config-path"
-            - "/conf"
+            - "/config-ro"
             - "--keys-directory"
             - "/data"
             - "--generate-keys"
@@ -32,7 +32,7 @@ spec:
             - name: data
               mountPath: "/data"
             - name: synapse-conf
-              mountPath: "/conf"
+              mountPath: "/config-ro"
       containers:
         - name: nginx
           image: ungleich/ungleich-certbot:1.1.1
diff --git a/apps/matrix/values.yaml b/apps/matrix/values.yaml
index 65368fc..dc04271 100644
--- a/apps/matrix/values.yaml
+++ b/apps/matrix/values.yaml
@@ -16,3 +16,14 @@ homeServerFQDN: "{{ .Release.Name }}.{{ .Release.Namespace }}.svc.{{ .Values.clu
 
 postgresUser: "matrix-synapse"
 postgresDBName: "matrix-synapse"
+
+storage:
+  data:
+    size: 20Gi
+    storageClass: rook-ceph-block-hdd
+  db:
+    size: 20Gi
+    storageClass: rook-ceph-block-ssd
+  letsencrypt:
+    size: 50Mi
+    storageClass: rook-ceph-block-hdd