diff --git a/library/ix-dev/community/firefly-iii/Chart.yaml b/library/ix-dev/community/firefly-iii/Chart.yaml
index 7e2cf6ae3f..866417d7b1 100644
--- a/library/ix-dev/community/firefly-iii/Chart.yaml
+++ b/library/ix-dev/community/firefly-iii/Chart.yaml
@@ -3,7 +3,7 @@ description: Firefly III is a personal finances manager
 annotations:
   title: Firefly III
 type: application
-version: 1.0.10
+version: 1.0.11
 apiVersion: v2
 appVersion: 6.0.30
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/community/firefly-iii/templates/_persistence.tpl b/library/ix-dev/community/firefly-iii/templates/_persistence.tpl
index 54ab538217..12b227887e 100644
--- a/library/ix-dev/community/firefly-iii/templates/_persistence.tpl
+++ b/library/ix-dev/community/firefly-iii/templates/_persistence.tpl
@@ -20,33 +20,8 @@ persistence:
         firefly-importer:
           mountPath: /tmp
 
-  # Postgres
-  postgresdata:
-    enabled: true
-    type: {{ .Values.fireflyStorage.pgData.type }}
-    datasetName: {{ .Values.fireflyStorage.pgData.datasetName | default "" }}
-    hostPath: {{ .Values.fireflyStorage.pgData.hostPath | default "" }}
-    targetSelector:
-      # Postgres pod
-      postgres:
-        # Postgres container
-        postgres:
-          mountPath: /var/lib/postgresql/data
-        # Permissions container
-        permissions:
-          mountPath: /mnt/directories/postgres_data
-  postgresbackup:
-    enabled: true
-    type: {{ .Values.fireflyStorage.pgBackup.type }}
-    datasetName: {{ .Values.fireflyStorage.pgBackup.datasetName | default "" }}
-    hostPath: {{ .Values.fireflyStorage.pgBackup.hostPath | default "" }}
-    targetSelector:
-      # Postgres backup pod
-      postgresbackup:
-        # Postgres backup container
-        postgresbackup:
-          mountPath: /postgres_backup
-        # Permissions container
-        permissions:
-          mountPath: /mnt/directories/postgres_backup
+  {{- include "ix.v1.common.app.postgresPersistence"
+      (dict "pgData" .Values.fireflyStorage.pgData
+            "pgBackup" .Values.fireflyStorage.pgBackup
+      ) | nindent 2 }}
 {{- end -}}
diff --git a/library/ix-dev/community/firefly-iii/templates/_service.tpl b/library/ix-dev/community/firefly-iii/templates/_service.tpl
index 3fa9e9f8bc..f40b209aa8 100644
--- a/library/ix-dev/community/firefly-iii/templates/_service.tpl
+++ b/library/ix-dev/community/firefly-iii/templates/_service.tpl
@@ -36,15 +36,6 @@ service:
         port: 6379
         targetPort: 6379
         targetSelector: redis
-  # Postgres
-  postgres:
-    enabled: true
-    type: ClusterIP
-    targetSelector: postgres
-    ports:
-      postgres:
-        enabled: true
-        primary: true
-        port: 5432
-        targetSelector: postgres
+  {{- include "ix.v1.common.app.postgresService" $ | nindent 2 }}
+
 {{- end -}}