diff --git a/cluster/apps/data/joplin-server/helm-release.yaml b/cluster/apps/data/joplin-server/helm-release.yaml
index 271933a5e..cfa10f9bc 100644
--- a/cluster/apps/data/joplin-server/helm-release.yaml
+++ b/cluster/apps/data/joplin-server/helm-release.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       # renovate: registryUrl=https://k8s-at-home.com/charts/
       chart: joplin-server
-      version: 2.4.0
+      version: 3.0.0
       sourceRef:
         kind: HelmRepository
         name: k8s-at-home-charts
@@ -30,11 +30,10 @@ spec:
     resources: {}
 
     service:
-      port:
-        port: 22300
-      annotations:
-        prometheus.io/probe: "true"
-        prometheus.io/protocol: tcp
+      main:
+        annotations:
+          prometheus.io/probe: "true"
+          prometheus.io/protocol: tcp
 
     env:
       APP_BASE_URL: https://joplin.${SECRET_CLUSTER_DOMAIN}
@@ -46,23 +45,16 @@ spec:
       POSTGRES_USER: joplin
       POSTGRES_PASSWORD: ${SECRET_JOPLIN_DB_PASSWORD}
 
-    nodeSelector: {}
-
-    tolerations: []
-
-    affinity: {}
-
-    podAnnotations: {}
-
     ingress:
-      enabled: true
-      annotations:
-        kubernetes.io/ingress.class: "nginx"
-      hosts:
-        - host: joplin.${SECRET_CLUSTER_DOMAIN}
-          paths:
-            - path: /
-              pathType: Prefix
-      tls:
-        - hosts:
-            - "joplin.${SECRET_CLUSTER_DOMAIN}"
+      main:
+        enabled: true
+        annotations:
+          kubernetes.io/ingress.class: "nginx"
+        hosts:
+          - host: joplin.${SECRET_CLUSTER_DOMAIN}
+            paths:
+              - path: /
+                pathType: Prefix
+        tls:
+          - hosts:
+              - "joplin.${SECRET_CLUSTER_DOMAIN}"