diff --git a/.sops.yaml b/.sops.yaml
index beacb1b1..57a5a7f6 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -4,7 +4,8 @@ creation_rules:
     encrypted_regex: "^(data|stringData)$"
     key_groups:
       - age:
-          - "age17ary36xtm566uptguuhsj7xmuqzyz06ce54tcf6p3mge2thphqfs3gln40"
+          - "age1nkvss2a8xvmjauvr5mxzm233hyh2mk2fg4s6pt0t0kcn03dv34wqtgymg8"
+          - "age1wxwqdrmkwkzsxajp58g0cgeextgf4wq287fv82pptv9yghkfgcqql66zhj"
   - path_regex: ansible/.*\.sops\.ya?ml
     key_groups:
       - age:
diff --git a/kubernetes/main/apps/media/jellyfin/app/helmrelease.yaml b/kubernetes/main/apps/media/jellyfin/app/helmrelease.yaml
index 9a5beb2f..37537480 100644
--- a/kubernetes/main/apps/media/jellyfin/app/helmrelease.yaml
+++ b/kubernetes/main/apps/media/jellyfin/app/helmrelease.yaml
@@ -81,24 +81,7 @@ spec:
             protocol: UDP
     ingress:
       main:
-        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.${SECRET_DOMAIN}
-            paths:
-              - path: /
-                pathType: Prefix
-                service:
-                  identifier: main
-                  port: http
-        tls:
-          - hosts:
-              - *host
+        enabled: false
     persistence:
       config:
         enabled: true
diff --git a/kubernetes/main/apps/media/kustomization.yaml b/kubernetes/main/apps/media/kustomization.yaml
index ba7899ab..66a23b9e 100644
--- a/kubernetes/main/apps/media/kustomization.yaml
+++ b/kubernetes/main/apps/media/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 resources:
   - ./namespace.yaml
   - ./immich/ks.yaml
-  - ./jellyfin/ks.yaml
   - ./prowlarr/ks.yaml
   - ./qbittorrent/ks.yaml
   - ./radarr/ks.yaml
diff --git a/kubernetes/turing/media/jellyfin/app/helmrelease.yaml b/kubernetes/turing/media/jellyfin/app/helmrelease.yaml
index 8b49d140..6d780890 100644
--- a/kubernetes/turing/media/jellyfin/app/helmrelease.yaml
+++ b/kubernetes/turing/media/jellyfin/app/helmrelease.yaml
@@ -68,6 +68,8 @@ spec:
     service:
       main:
         controller: jellyfin
+        annotations:
+          io.cilium/global-service: "true"
         ports:
           http:
             port: *port
@@ -89,7 +91,7 @@ spec:
           gethomepage.dev/icon: jellyfin.png
           gethomepage.dev/name: Jellyfin
         hosts:
-          - host: &host jellyfin.turing.${SECRET_DOMAIN}
+          - host: &host jellyfin.${SECRET_DOMAIN}
             paths:
               - path: /
                 pathType: Prefix
diff --git a/scripts/kubeconform.sh b/scripts/kubeconform.sh
index a69308b1..eeb65d41 100755
--- a/scripts/kubeconform.sh
+++ b/scripts/kubeconform.sh
@@ -20,8 +20,8 @@ kubeconform_args=(
     "-verbose"
 )
 
-echo "=== Validating standalone manifests in ${KUBERNETES_DIR}/flux ==="
-find "${KUBERNETES_DIR}/flux" -maxdepth 1 -type f -name '*.yaml' -print0 | while IFS= read -r -d $'\0' file;
+echo "=== Validating standalone manifests in ${KUBERNETES_DIR}/main/flux ==="
+find "${KUBERNETES_DIR}/main/flux" -maxdepth 1 -type f -name '*.yaml' -print0 | while IFS= read -r -d $'\0' file;
   do
     kubeconform "${kubeconform_args[@]}" "${file}"
     if [[ ${PIPESTATUS[0]} != 0 ]]; then
@@ -29,8 +29,8 @@ find "${KUBERNETES_DIR}/flux" -maxdepth 1 -type f -name '*.yaml' -print0 | while
     fi
 done
 
-echo "=== Validating kustomizations in ${KUBERNETES_DIR}/flux ==="
-find "${KUBERNETES_DIR}/flux" -type f -name $kustomize_config -print0 | while IFS= read -r -d $'\0' file;
+echo "=== Validating kustomizations in ${KUBERNETES_DIR}/main/flux ==="
+find "${KUBERNETES_DIR}/main/flux" -type f -name $kustomize_config -print0 | while IFS= read -r -d $'\0' file;
   do
     echo "=== Validating kustomizations in ${file/%$kustomize_config} ==="
     kustomize build "${file/%$kustomize_config}" "${kustomize_args[@]}" | \
@@ -40,8 +40,8 @@ find "${KUBERNETES_DIR}/flux" -type f -name $kustomize_config -print0 | while IF
     fi
 done
 
-echo "=== Validating kustomizations in ${KUBERNETES_DIR}/apps ==="
-find "${KUBERNETES_DIR}/apps" -type f -name $kustomize_config -print0 | while IFS= read -r -d $'\0' file;
+echo "=== Validating kustomizations in ${KUBERNETES_DIR}/main/apps ==="
+find "${KUBERNETES_DIR}/main/apps" -type f -name $kustomize_config -print0 | while IFS= read -r -d $'\0' file;
   do
     echo "=== Validating kustomizations in ${file/%$kustomize_config} ==="
     kustomize build "${file/%$kustomize_config}" "${kustomize_args[@]}" | \