diff --git a/charts/mautrix-signal/templates/deployment.yaml b/charts/mautrix-signal/templates/deployment.yaml
index fbc066f..f3d8b97 100644
--- a/charts/mautrix-signal/templates/deployment.yaml
+++ b/charts/mautrix-signal/templates/deployment.yaml
@@ -80,6 +80,13 @@ spec:
       volumes:
         - name: mainconfig
           secret:
-            secretName: {{ include "mautrix-facebook.fullname" . }}
+            secretName: {{ include "mautrix-signal.fullname" . }}
         - name: signald-socket
           emptyDir: {}
+        - name: signald-data
+          persistentVolumeClaim:
+            {{- if not .Values.signald.pvc.existingClaim }}
+            claimName: {{ include "mautrix-signal.fullname" . }}-storage
+            {{- else }}
+            claimName: {{ .Values.signald.pvc.existingClaim }}
+            {{- end }}
diff --git a/charts/mautrix-signal/templates/pvc.yaml b/charts/mautrix-signal/templates/pvc.yaml
new file mode 100644
index 0000000..4b5d8ff
--- /dev/null
+++ b/charts/mautrix-signal/templates/pvc.yaml
@@ -0,0 +1,15 @@
+{{- if not .Values.signald.pvc.existingClaim -}}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "mautrix-signal.fullname" . }}-signald-data
+  labels:
+    {{- include "mautrix-signal.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: {{ .Values.signald.pvc.storageClassName | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.signald.pvc.storage | quote }}
+{{- end }}
diff --git a/charts/mautrix-signal/values.yaml b/charts/mautrix-signal/values.yaml
index dd59cfd..0726c2a 100644
--- a/charts/mautrix-signal/values.yaml
+++ b/charts/mautrix-signal/values.yaml
@@ -64,3 +64,7 @@ signald:
     tag: "0.23.2"
   config: {}
 #    database: ""
+  pvc:
+    storageClassName: ""
+    existingClaim: false
+    storage: 5Gi