diff --git a/charts/incubator/joplin-server/Chart.yaml b/charts/incubator/joplin-server/Chart.yaml
index 5ceba75e741..d9728ac4acf 100644
--- a/charts/incubator/joplin-server/Chart.yaml
+++ b/charts/incubator/joplin-server/Chart.yaml
@@ -3,11 +3,7 @@ appVersion: "2.10.10"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
-  - condition: postgresql.enabled
-    name: postgresql
-    repository: https://deps.truecharts.org/
-    version: 11.0.31
+    version: 13.2.0
 deprecated: false
 description: Allows you to sync any Joplin client.
 home: https://truecharts.org/charts/incubator/joplin-server
@@ -26,9 +22,8 @@ sources:
   - https://github.com/laurent22/joplin/tree/dev/packages/server
   - https://github.com/laurent22/joplin
 type: application
-version: 12.0.0
+version: 13.0.0
 annotations:
   truecharts.org/catagories: |
     - media
   truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U
diff --git a/charts/incubator/joplin-server/ci/test-values.yaml b/charts/incubator/joplin-server/ci/test-values.yaml
new file mode 100644
index 00000000000..dd8528f5366
--- /dev/null
+++ b/charts/incubator/joplin-server/ci/test-values.yaml
@@ -0,0 +1,7 @@
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          env:
+            APP_BASE_URL: "http://localhost:{{ .Values.service.main.ports.main.port }}"
diff --git a/charts/incubator/joplin-server/templates/NOTES.txt b/charts/incubator/joplin-server/templates/NOTES.txt
new file mode 100644
index 00000000000..72e715a3bc5
--- /dev/null
+++ b/charts/incubator/joplin-server/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/joplin-server/templates/common.yaml b/charts/incubator/joplin-server/templates/common.yaml
index c1a366e1cf0..9d95f161711 100644
--- a/charts/incubator/joplin-server/templates/common.yaml
+++ b/charts/incubator/joplin-server/templates/common.yaml
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/incubator/joplin-server/values.yaml b/charts/incubator/joplin-server/values.yaml
index 929e3f77c31..6013e6a36cb 100644
--- a/charts/incubator/joplin-server/values.yaml
+++ b/charts/incubator/joplin-server/values.yaml
@@ -4,62 +4,72 @@ image:
   pullPolicy: IfNotPresent
 
 securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
 
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-env:
-  APP_BASE_URL: http://localhost:22300
-  APP_PORT: 22300
-  DB_CLIENT: "pg"
-  POSTGRES_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}"
-  POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}"
-  POSTGRES_PORT: "5432"
-  POSTGRES_PASSWORD:
-    secretKeyRef:
-      name: dbcreds
-      key: postgresql-password
-  POSTGRES_HOST:
-    secretKeyRef:
-      name: dbcreds
-      key: plainhost
-  MAILER_ENABLED: 0
-  MAILER_HOST: ""
-  MAILER_PORT: 465
-  MAILER_SECURE: true
-  MAILER_AUTH_USER: ""
-  MAILER_AUTH_PASSWORD: ""
-  MAILER_NOREPLY_NAME: ""
-  MAILER_NOREPLY_EMAIL: ""
-
-probes:
-  liveness:
-    path: "/api/ping"
-  readiness:
-    path: "/api/ping"
-  startup:
-    path: "/api/ping"
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              path: "/api/ping"
+              port: "{{ .Values.service.main.ports.main.port }}"
+              httpHeaders:
+                Host: '{{ tpl .Values.workload.main.podSpec.containers.main.env.APP_BASE_URL $ | replace "https://" "" | replace "http://" "" }}'
+            readiness:
+              path: "/api/ping"
+              port: "{{ .Values.service.main.ports.main.port }}"
+              httpHeaders:
+                Host: '{{ tpl .Values.workload.main.podSpec.containers.main.env.APP_BASE_URL $ | replace "https://" "" | replace "http://" "" }}'
+            startup:
+              type: tcp
+              port: "{{ .Values.service.main.ports.main.port }}"
+          env:
+            APP_BASE_URL: ""
+            APP_PORT: "{{ .Values.service.main.ports.main.port }}"
+            DB_CLIENT: "pg"
+            POSTGRES_DATABASE: "{{ .Values.cnpg.main.database }}"
+            POSTGRES_USER: "{{ .Values.cnpg.main.user }}"
+            POSTGRES_PORT: "5432"
+            POSTGRES_PASSWORD:
+              secretKeyRef:
+                name: cnpg-main-user
+                key: password
+            POSTGRES_HOST:
+              secretKeyRef:
+                name: cnpg-main-urls
+                key: host
+            MAILER_ENABLED: 0
+            MAILER_HOST: ""
+            MAILER_PORT: 465
+            MAILER_SECURE: true
+            MAILER_AUTH_USER: ""
+            MAILER_AUTH_PASSWORD: ""
+            MAILER_NOREPLY_NAME: ""
+            MAILER_NOREPLY_EMAIL: ""
 
 service:
   main:
     ports:
       main:
         port: 22300
-        targetPort: 22300
 
 persistence:
   config:
     enabled: true
     mountPath: "/config"
 
-postgresql:
-  enabled: true
-  existingSecret: "dbcreds"
-  postgresqlUsername: joplin
-  postgresqlDatabase: joplin
+cnpg:
+  main:
+    enabled: true
+    user: joplin
+    database: joplin
 
 portal:
-  enabled: true
+  open:
+    enabled: true