diff --git a/charts/stable/joplin-server/Chart.yaml b/charts/stable/joplin-server/Chart.yaml
index 11df6bf1573..18c51a19284 100644
--- a/charts/stable/joplin-server/Chart.yaml
+++ b/charts/stable/joplin-server/Chart.yaml
@@ -9,7 +9,7 @@ annotations:
   trueforge.org/min_helm_version: "3.14"
   trueforge.org/train: stable
 apiVersion: v2
-appVersion: 3.5.2
+appVersion: 3.6.1
 dependencies:
   - name: common
     version: 29.1.0
@@ -37,5 +37,5 @@ sources:
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/joplin-server
   - https://hub.docker.com/r/joplin/server
 type: application
-version: 22.1.0
+version: 22.2.0
 
diff --git a/charts/stable/joplin-server/values.yaml b/charts/stable/joplin-server/values.yaml
index 8005c506de9..2d35efbcd1c 100644
--- a/charts/stable/joplin-server/values.yaml
+++ b/charts/stable/joplin-server/values.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=./values.schema.json
 image:
   repository: docker.io/joplin/server
-  tag: 3.5.2@sha256:5d9e7f9d31b436cb1b99d1a6a65d8c5bf760829094617e8ad1e956fd925de888
+  tag: 3.6.1@sha256:95c1badac330e53918ff3a756fccc67d1d7f65d00a4f806c6a5f79925e7f18ca
   pullPolicy: IfNotPresent
 securityContext:
   container: