diff --git a/wikijs/Chart.lock b/wikijs/Chart.lock
index d383d6e..d130392 100644
--- a/wikijs/Chart.lock
+++ b/wikijs/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 8.10.14
-digest: sha256:db7c1e0bc9ec0ed45520521bd76bb390d04711fd0f04affaadafa1dc498ce68b
-generated: "2020-07-21T20:34:41.41180748-04:00"
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 18.2.0
+digest: sha256:48f34138747ae0dfd6001f8d411957d2610cc4b0183ee082608c0a4becd615a4
+generated: "2025-12-30T19:25:41.865919231+03:00"
diff --git a/wikijs/Chart.yaml b/wikijs/Chart.yaml
index 88b6bdd..6488372 100644
--- a/wikijs/Chart.yaml
+++ b/wikijs/Chart.yaml
@@ -2,10 +2,10 @@ apiVersion: v2
 name: wikijs
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.3.20
+version: 2.4.1
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.5.308
+appVersion: 2.5.309
 description: The most powerful and extensible open source Wiki software.
 keywords:
   - wiki
@@ -23,20 +23,15 @@ keywords:
 # a dependency of application charts to inject those utilities and functions into the rendering
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-dependencies:
-  - name: postgresql
-    version: 10.2.5
-    repository: https://charts.bitnami.com/bitnami
-    condition: postgresql.enabled
+
 home: https://wiki.js.org
 icon: https://github.com/Requarks/wiki/raw/master/client/static/favicons/android-chrome-192x192.png
 sources:
   - https://github.com/Requarks/wiki
-maintainers:
-  - name: Nicolas Giard
-    email: github@ngpixel.com
-    url: https://github.com/NGPixel
-  - name: James Greenhill
-    email: james@fuziontech.net
-    url: https://github.com/fuziontech
 engine: gotpl
+
+dependencies:
+  - name: postgresql
+    condition: postgresql.enabled
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 18.2.0
diff --git a/wikijs/charts/postgresql-10.2.5.tgz b/wikijs/charts/postgresql-10.2.5.tgz
deleted file mode 100644
index db37f76..0000000
Binary files a/wikijs/charts/postgresql-10.2.5.tgz and /dev/null differ
diff --git a/wikijs/charts/postgresql-18.2.0.tgz b/wikijs/charts/postgresql-18.2.0.tgz
new file mode 100644
index 0000000..120be6a
Binary files /dev/null and b/wikijs/charts/postgresql-18.2.0.tgz differ
diff --git a/wikijs/templates/_helpers.tpl b/wikijs/templates/_helpers.tpl
index 193ceab..79e7b3d 100644
--- a/wikijs/templates/_helpers.tpl
+++ b/wikijs/templates/_helpers.tpl
@@ -81,7 +81,7 @@ Set postgres host
 {{- if .Values.postgresql.enabled -}}
 {{- template "wiki.postgresql.fullname" . -}}
 {{- else -}}
-{{- .Values.postgresql.postgresqlHost | quote -}}
+{{- .Values.postgresql.host | quote -}}
 {{- end -}}
 {{- end -}}
 
@@ -101,8 +101,8 @@ Set postgres secretKey
 */}}
 {{- define "wiki.postgresql.secretKey" -}}
 {{- if .Values.postgresql.enabled -}}
-"postgresql-password"
+"password"
 {{- else -}}
-{{- default "postgresql-password" .Values.postgresql.existingSecretKey | quote -}}
+{{- default "password" .Values.postgresql.auth.existingSecretKey | quote -}}
 {{- end -}}
 {{- end -}}
diff --git a/wikijs/templates/deployment.yaml b/wikijs/templates/deployment.yaml
index f02598d..f0d5571 100644
--- a/wikijs/templates/deployment.yaml
+++ b/wikijs/templates/deployment.yaml
@@ -25,36 +25,36 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ default "latest" .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ default "IfNotPresent" .Values.image.imagePullPolicy }}
           env:
             - name: DB_TYPE
               value: postgres
             - name: DB_HOST
               value: {{ template "wiki.postgresql.host" . }}
-            - name: DB_SSL
-              value: "{{ default "false" .Values.postgresql.ssl }}"
             - name: DB_PORT
-              value: "{{ default "5432" .Values.postgresql.postgresqlPort }}"
+              value: {{ default "5432" .Values.postgresql.port | quote }}
+            - name: DB_SSL
+              value: {{ .Values.postgresql.tls.enabled | quote }}
             - name: DB_NAME
-              value: {{ default "wiki" .Values.postgresql.postgresqlDatabase }}
+              value: {{ default "wiki" .Values.postgresql.auth.database }}
             {{- if .Values.postgresql.enabled }}
             - name: DB_USER
-              value: {{ default "wiki" .Values.postgresql.postgresqlUsername }}
+              value: {{ default "wiki" .Values.postgresql.auth.username }}
             - name: DB_PASS
               valueFrom:
                 secretKeyRef:
-                {{- if .Values.postgresql.existingSecret }}
-                  name: {{ .Values.postgresql.existingSecret }}
+                {{- if .Values.postgresql.auth.existingSecret }}
+                  name: {{ .Values.postgresql.auth.existingSecret }}
                 {{- else }}
                   name: {{ template "wiki.postgresql.secret" . }}
                 {{- end }}
                   key: {{ template "wiki.postgresql.secretKey" . }}
             {{- else }}
             - name: DB_USER
-              value: {{ default "wiki" .Values.postgresql.postgresqlUsername }}
+              value: {{ default "wiki" .Values.postgresql.auth.username }}
             - name: DB_PASS
-              value: {{ default "wiki" .Values.postgresql.postgresqlPassword }}
+              value: {{ default "wiki" .Values.postgresql.auth.password }}
             {{- end }}
           ports:
             - name: http
diff --git a/wikijs/values.yaml b/wikijs/values.yaml
index 0c1fbc0..e5cc1fb 100644
--- a/wikijs/values.yaml
+++ b/wikijs/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: requarks/wiki
-  tag: 2.5.308
+  tag: ""
   pullPolicy: IfNotPresent
 
 imagePullSecrets: []
@@ -75,16 +75,12 @@ tolerations: []
 affinity: {}
 
 # Enabled postgres
-# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql
 postgresql:
   # Set false for external PostgreSQL
   enabled: true
-  postgresqlDatabase: wiki
-  #
-  # Set for external PostgreSQL host
-  # postgresqlHost: postgresql
-  #postgresqlUsername: postgres
-  #postgresqlPassword: wiki
-  persistence:
+  auth:
+    username: "wiki"
+    password: "wiki"
+    database: "wiki"
+  tls:
     enabled: false
-    # storageClass: ""