diff --git a/kubernetes/main/apps/default/homepage/app/configmap.yaml b/kubernetes/main/apps/default/homepage/app/configmap.yaml
index b87345d07..f6a2ef8fb 100644
--- a/kubernetes/main/apps/default/homepage/app/configmap.yaml
+++ b/kubernetes/main/apps/default/homepage/app/configmap.yaml
@@ -47,7 +47,7 @@ data:
     background:
       image: https://static.18b.haus/img/wooden-floor.jpg
       opacity: 10
-    fiveColumns: true
+    fiveColumns: false
     headerStyle: clean
     hideErrors: true
     hideVersion: true
@@ -63,6 +63,8 @@ data:
         style: column
       Tools:
         style: column
+      Media:
+        style: column
     showStats: false
     statusStyle: dot
     target: _self
diff --git a/kubernetes/main/apps/default/jellyfin/app/helmrelease.yaml b/kubernetes/main/apps/default/jellyfin/app/helmrelease.yaml
new file mode 100644
index 000000000..cf84cff07
--- /dev/null
+++ b/kubernetes/main/apps/default/jellyfin/app/helmrelease.yaml
@@ -0,0 +1,118 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: jellyfin
+spec:
+  interval: 2h
+  chart:
+    spec:
+      chart: app-template
+      version: 3.2.1
+      sourceRef:
+        kind: HelmRepository
+        name: bjw-s-charts
+        namespace: flux-system
+  install:
+    remediation:
+      retries: 3
+  upgrade:
+    cleanupOnFail: true
+    remediation:
+      retries: 3
+  uninstall:
+    keepHistory: false
+  dependsOn:
+    - name: longhorn
+      namespace: longhorn-system
+    - name: volsync
+      namespace: volsync-system
+  values:
+    controllers:
+      jellyfin:
+        containers:
+          app:
+            image:
+              repository: ghcr.io/jellyfin/jellyfin
+              tag: 10.9.4
+            env:
+              DOTNET_SYSTEM_IO_DISABLEFILELOCKING: "true"
+              JELLYFIN_FFmpeg__probesize: 50000000
+              JELLYFIN_FFmpeg__analyzeduration: 50000000
+              JELLYFIN_PublishedServerUrl: &ip 192.168.40.247
+            probes:
+              liveness: &probe
+                enabled: true
+                custom: true
+                spec:
+                  httpGet:
+                    path: /health
+                    port: 8096
+                  initialDelaySeconds: 0
+                  periodSeconds: 10
+                  timeoutSeconds: 1
+                  failureThreshold: 3
+              readiness: *probe
+              startup:
+                enabled: true
+                custom: true
+                spec:
+                  httpGet:
+                    path: /health
+                    port: 8096
+                  initialDelaySeconds: 0
+                  periodSeconds: 10
+                  timeoutSeconds: 1
+                  failureThreshold: 30
+    defaultPodOptions:
+      securityContext:
+        runAsUser: 10000
+        runAsGroup: 10000
+        fsGroup: 10000
+        fsGroupChangePolicy: OnRootMismatch
+    service:
+      app:
+        controller: jellyfin
+        type: LoadBalancer
+        annotations:
+          io.cilium/lb-ipam-ips: *ip
+        ports:
+          http:
+            port: 8096
+    ingress:
+      app:
+        enabled: true
+        className: internal
+        annotations:
+          gethomepage.dev/enabled: "true"
+          gethomepage.dev/group: Media
+          gethomepage.dev/icon: jellyfin.png
+          gethomepage.dev/name: Jellyfin
+        hosts:
+          - host: &host jellyfin.18b.haus
+            paths:
+              - path: /
+                pathType: Prefix
+                service:
+                  identifier: app
+                  port: http
+        tls:
+          - hosts:
+              - *host
+    persistence:
+      config:
+        enabled: true
+        existingClaim: jellyfin
+        globalMounts:
+          - path: /config
+      transcode:
+        enabled: true
+        type: emptyDir
+      media:
+        enabled: true
+        type: nfs
+        server: storage.svc.18b.lan
+        path: /io/media
+        globalMounts:
+          - path: /media
diff --git a/kubernetes/main/apps/default/jellyfin/app/kustomization.yaml b/kubernetes/main/apps/default/jellyfin/app/kustomization.yaml
new file mode 100644
index 000000000..a928a5635
--- /dev/null
+++ b/kubernetes/main/apps/default/jellyfin/app/kustomization.yaml
@@ -0,0 +1,7 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./helmrelease.yaml
+  - ../../../../templates/volsync
diff --git a/kubernetes/main/apps/default/jellyfin/ks.yaml b/kubernetes/main/apps/default/jellyfin/ks.yaml
new file mode 100644
index 000000000..1a81e2a38
--- /dev/null
+++ b/kubernetes/main/apps/default/jellyfin/ks.yaml
@@ -0,0 +1,28 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.18b.haus/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app jellyfin
+  namespace: flux-system
+spec:
+  targetNamespace: default
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  path: ./kubernetes/main/apps/default/jellyfin/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: home-kubernetes
+  wait: false
+  interval: 2h
+  retryInterval: 1m
+  timeout: 5m
+  postBuild:
+    substitute:
+      APP: *app
+      VOLSYNC_ACCESSMODES: ReadWriteOnce
+      VOLSYNC_CAPACITY: 1Gi
+      VOLSYNC_SCHEDULE_B2: '45 1 * * 0'
+      VOLSYNC_SCHEDULE_MINIO: '45 1 * * *'
diff --git a/kubernetes/main/apps/default/kustomization.yaml b/kubernetes/main/apps/default/kustomization.yaml
index 78a83b422..9447194c2 100644
--- a/kubernetes/main/apps/default/kustomization.yaml
+++ b/kubernetes/main/apps/default/kustomization.yaml
@@ -9,6 +9,7 @@ resources:
   - ./github-to-gitea-mirror/ks.yaml
   - ./home-assistant/ks.yaml
   - ./homepage/ks.yaml
+  - ./jellyfin/ks.yaml
   - ./kubernetes-schemas/ks.yaml
   - ./mosquitto/ks.yaml
   - ./nextcloud/ks.yaml