diff --git a/library/ix-dev/community/joplin/Chart.lock b/library/ix-dev/community/joplin/Chart.lock
index d7f0378026..8f05d2ec3a 100644
--- a/library/ix-dev/community/joplin/Chart.lock
+++ b/library/ix-dev/community/joplin/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../../../common
-  version: 1.2.0
-digest: sha256:a87a6988cedfc3f8a90eb308dffaaeaa1cbd0cad31c20e15b1147084360b9ec1
-generated: "2023-11-02T12:20:39.027755478+02:00"
+  version: 1.2.1
+digest: sha256:d695592ea5213fe64453171205ca326015d02df3888a7858becc0c733b0de4c7
+generated: "2023-11-06T19:46:30.510415405+02:00"
diff --git a/library/ix-dev/community/joplin/Chart.yaml b/library/ix-dev/community/joplin/Chart.yaml
index d819346f4f..9e9052c13e 100644
--- a/library/ix-dev/community/joplin/Chart.yaml
+++ b/library/ix-dev/community/joplin/Chart.yaml
@@ -15,7 +15,7 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../../../common
-    version: 1.2.0
+    version: 1.2.1
 home: https://joplinapp.org/
 icon: https://media.sys.truenas.net/apps/joplin/icons/icon.png
 sources:
diff --git a/library/ix-dev/community/joplin/charts/common-1.2.0.tgz b/library/ix-dev/community/joplin/charts/common-1.2.0.tgz
deleted file mode 100644
index f7037485a1..0000000000
Binary files a/library/ix-dev/community/joplin/charts/common-1.2.0.tgz and /dev/null differ
diff --git a/library/ix-dev/community/joplin/charts/common-1.2.1.tgz b/library/ix-dev/community/joplin/charts/common-1.2.1.tgz
new file mode 100644
index 0000000000..015c493de3
Binary files /dev/null and b/library/ix-dev/community/joplin/charts/common-1.2.1.tgz differ
diff --git a/library/ix-dev/community/joplin/templates/_persistence.tpl b/library/ix-dev/community/joplin/templates/_persistence.tpl
index 280a05a7ff..af5369ee6e 100644
--- a/library/ix-dev/community/joplin/templates/_persistence.tpl
+++ b/library/ix-dev/community/joplin/templates/_persistence.tpl
@@ -1,31 +1,7 @@
 {{- define "joplin.persistence" -}}
 persistence:
-  postgresdata:
-    enabled: true
-    type: {{ .Values.joplinStorage.pgData.type }}
-    datasetName: {{ .Values.joplinStorage.pgData.datasetName | default "" }}
-    hostPath: {{ .Values.joplinStorage.pgData.hostPath | default "" }}
-    targetSelector:
-      # Postgres pod
-      postgres:
-        # Postgres container
-        postgres:
-          mountPath: /var/lib/postgresql/data
-        # Postgres - Permissions container
-        permissions:
-          mountPath: /mnt/directories/postgres_data
-  postgresbackup:
-    enabled: true
-    type: {{ .Values.joplinStorage.pgBackup.type }}
-    datasetName: {{ .Values.joplinStorage.pgBackup.datasetName | default "" }}
-    hostPath: {{ .Values.joplinStorage.pgBackup.hostPath | default "" }}
-    targetSelector:
-      # Postgres backup pod
-      postgresbackup:
-        # Postgres backup container
-        postgresbackup:
-          mountPath: /postgres_backup
-        # Postgres - Permissions container
-        permissions:
-          mountPath: /mnt/directories/postgres_backup
+  {{- include "ix.v1.common.app.postgresPersistence"
+      (dict "pgData" .Values.joplinStorage.pgData
+            "pgBackup" .Values.joplinStorage.pgBackup
+      ) | nindent 2 }}
 {{- end -}}
diff --git a/library/ix-dev/community/joplin/templates/_service.tpl b/library/ix-dev/community/joplin/templates/_service.tpl
index 2ddc561a33..279e894e74 100644
--- a/library/ix-dev/community/joplin/templates/_service.tpl
+++ b/library/ix-dev/community/joplin/templates/_service.tpl
@@ -12,15 +12,6 @@ service:
         port: {{ .Values.joplinNetwork.webPort }}
         nodePort: {{ .Values.joplinNetwork.webPort }}
         targetSelector: joplin
-  postgres:
-    enabled: true
-    type: ClusterIP
-    targetSelector: postgres
-    ports:
-      postgres:
-        enabled: true
-        primary: true
-        port: 5432
-        targetPort: 5432
-        targetSelector: postgres
+  {{- include "ix.v1.common.app.postgresService" $ | nindent 2 }}
+
 {{- end -}}