diff --git a/cluster/apps/data/joplin-server/helm-release.yaml b/cluster/apps/data/joplin/helm-release.yaml
similarity index 70%
rename from cluster/apps/data/joplin-server/helm-release.yaml
rename to cluster/apps/data/joplin/helm-release.yaml
index 5df9fd0fb..cf10d2790 100644
--- a/cluster/apps/data/joplin-server/helm-release.yaml
+++ b/cluster/apps/data/joplin/helm-release.yaml
@@ -2,25 +2,33 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: joplin-server
+  name: &app joplin
   namespace: data
 spec:
-  interval: 5m
+  interval: 15m
   chart:
     spec:
-      # renovate: registryUrl=https://k8s-at-home.com/charts/
-      chart: joplin-server
-      version: 5.2.0
+      chart: kah-common-chart
+      version: 1.1.2
       sourceRef:
         kind: HelmRepository
         name: k8s-at-home-charts
         namespace: flux-system
-      interval: 5m
+      interval: 15m
+  install:
+    createNamespace: true
+    remediation:
+      retries: 5
+  upgrade:
+    remediation:
+      retries: 5
   values:
+    global:
+      nameOverride: *app
+
     image:
       repository: joplin/server
       tag: 2.7.4-beta
-      pullPolicy: IfNotPresent
 
     env:
       APP_BASE_URL: https://joplin.${SECRET_CLUSTER_DOMAIN}
@@ -34,9 +42,9 @@ spec:
 
     service:
       main:
-        annotations:
-          prometheus.io/probe: "true"
-          prometheus.io/protocol: tcp
+        ports:
+          http:
+            port: 22300
 
     ingress:
       main:
@@ -46,10 +54,10 @@ spec:
           external-dns.alpha.kubernetes.io/target: "services.${SECRET_DOMAIN}."
           external-dns/is-public: "true"
         hosts:
-          - host: "joplin.${SECRET_CLUSTER_DOMAIN}"
+          - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}"
             paths:
               - path: /
                 pathType: Prefix
         tls:
           - hosts:
-              - "joplin.${SECRET_CLUSTER_DOMAIN}"
+              - *host
diff --git a/cluster/apps/data/joplin-server/kustomization.yaml b/cluster/apps/data/joplin/kustomization.yaml
similarity index 100%
rename from cluster/apps/data/joplin-server/kustomization.yaml
rename to cluster/apps/data/joplin/kustomization.yaml
diff --git a/cluster/apps/data/kustomization.yaml b/cluster/apps/data/kustomization.yaml
index 854cf9427..0678f8b8a 100644
--- a/cluster/apps/data/kustomization.yaml
+++ b/cluster/apps/data/kustomization.yaml
@@ -8,7 +8,7 @@ resources:
   - freshrss
   - homer
   - jobs
-  - joplin-server
+  - joplin
   - mariadb
   - pgadmin
   - pgbackups