diff --git a/library/ix-dev/community/gitea/Chart.lock b/library/ix-dev/community/gitea/Chart.lock
index e504431b14..2fc742e818 100644
--- a/library/ix-dev/community/gitea/Chart.lock
+++ b/library/ix-dev/community/gitea/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../../../common
-  version: 1.1.1
-digest: sha256:a7dbe3e4d42dbcd4325776e5e01a1d630c7f185f79e7ebf22b1b9cc80f56eed7
-generated: "2023-09-09T13:56:41.74669531+03:00"
+  version: 1.2.1
+digest: sha256:d695592ea5213fe64453171205ca326015d02df3888a7858becc0c733b0de4c7
+generated: "2023-11-06T19:43:10.763796701+02:00"
diff --git a/library/ix-dev/community/gitea/Chart.yaml b/library/ix-dev/community/gitea/Chart.yaml
index c424581a72..4dc5ad8195 100644
--- a/library/ix-dev/community/gitea/Chart.yaml
+++ b/library/ix-dev/community/gitea/Chart.yaml
@@ -3,7 +3,7 @@ description: Gitea - Git with a cup of tea
 annotations:
   title: Gitea
 type: application
-version: 1.0.21
+version: 1.0.22
 apiVersion: v2
 appVersion: 1.20.5
 kubeVersion: '>=1.16.0-0'
@@ -14,7 +14,7 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../../../common
-    version: 1.1.1
+    version: 1.2.1
 home: https://gitea.io/en-us
 icon: https://media.sys.truenas.net/apps/gitea/icons/icon.svg
 sources:
diff --git a/library/ix-dev/community/gitea/charts/common-1.1.1.tgz b/library/ix-dev/community/gitea/charts/common-1.1.1.tgz
deleted file mode 100644
index 9495db8e3c..0000000000
Binary files a/library/ix-dev/community/gitea/charts/common-1.1.1.tgz and /dev/null differ
diff --git a/library/ix-dev/community/gitea/charts/common-1.2.1.tgz b/library/ix-dev/community/gitea/charts/common-1.2.1.tgz
new file mode 100644
index 0000000000..690f6b0dda
Binary files /dev/null and b/library/ix-dev/community/gitea/charts/common-1.2.1.tgz differ
diff --git a/library/ix-dev/community/gitea/templates/_postgres.tpl b/library/ix-dev/community/gitea/templates/_postgres.tpl
index 572de99d99..1daf9c93f0 100644
--- a/library/ix-dev/community/gitea/templates/_postgres.tpl
+++ b/library/ix-dev/community/gitea/templates/_postgres.tpl
@@ -4,47 +4,13 @@ workload:
                                               "resources" .Values.resources
                                               "ixChartContext" .Values.ixChartContext) | nindent 2 }}
 
-{{/* Service */}}
 service:
-  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 }}
 
 {{/* Persistence */}}
 persistence:
-  postgresdata:
-    enabled: true
-    type: {{ .Values.giteaStorage.pgData.type }}
-    datasetName: {{ .Values.giteaStorage.pgData.datasetName | default "" }}
-    hostPath: {{ .Values.giteaStorage.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.giteaStorage.pgBackup.type }}
-    datasetName: {{ .Values.giteaStorage.pgBackup.datasetName | default "" }}
-    hostPath: {{ .Values.giteaStorage.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.giteaStorage.pgData
+            "pgBackup" .Values.giteaStorage.pgBackup
+      ) | nindent 2 }}
 {{- end -}}