diff --git a/kubernetes/apps/default/bazarr/app/externalsecret.yaml b/kubernetes/apps/default/bazarr/app/externalsecret.yaml
index f77851c18..11fac9c1d 100644
--- a/kubernetes/apps/default/bazarr/app/externalsecret.yaml
+++ b/kubernetes/apps/default/bazarr/app/externalsecret.yaml
@@ -15,6 +15,7 @@ spec:
       engineVersion: v2
       data:
         # App
+        BAZARR__API_KEY: "{{ .BAZARR__API_KEY }}"
         POSTGRES_ENABLED: "true"
         POSTGRES_DATABASE: &dbName bazarr
         POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local
diff --git a/kubernetes/apps/default/homepage/app/config/bookmarks.yaml b/kubernetes/apps/default/homepage/app/config/bookmarks.yaml
index 382f956ce..ed97d539c 100644
--- a/kubernetes/apps/default/homepage/app/config/bookmarks.yaml
+++ b/kubernetes/apps/default/homepage/app/config/bookmarks.yaml
@@ -1,27 +1 @@
-- Communitcate:
-    - Discord:
-        - icon: discord.png
-          href: 'https://discord.com/app'
-    - Mail:
-        - icon: gmail.png
-          href: 'https://www.fastmail.com/mail/inbox'
-    - GoogleCalendar:
-        - icon: google-calendar.png
-          href: 'https://www.fastmail.com/calendar'
-    - Outlook:
-        - icon: 'https://raw.githubusercontent.com/LilDrunkenSmurf/k3s-home-cluster/main/icons/outlook.png'
-          href: 'https://outlook.com'
-- Media:
-    - YouTube:
-        - icon: youtube.png
-          href: 'https://youtube.com/feed/subscriptions'
-    - Spotify:
-        - icon: spotify.png
-          href: 'http://open.spotify.com'
-- Git:
-    - kubesearch:
-        - icon: kubernetes-dashboard.png
-          href: 'https://kubesearch.dev/'
-    - k3s-home-cluster:
-        - icon: github.png
-          href: 'https://github.com/haraldkoch/kochhaus-home'
+---
diff --git a/kubernetes/apps/default/homepage/app/config/services.yaml b/kubernetes/apps/default/homepage/app/config/services.yaml
index 9d20d4b38..c6467cfb9 100644
--- a/kubernetes/apps/default/homepage/app/config/services.yaml
+++ b/kubernetes/apps/default/homepage/app/config/services.yaml
@@ -5,37 +5,51 @@
         icon: home-assistant.png
         description: Home Assistant
         widget:
-          type: homeassistant
-          url: http://home-assistant.default.svc.cluster.local.:8123
-          key: "{{HOMEPAGE_VAR_HASS_TOKEN}}"
-    - Media:
-        - Sonarr:
-            href: https://sonarr.${SECRET_EXTERNAL_DOMAIN}
-            siteMonitor: https://sonarr.${SECRET_EXTERNAL_DOMAIN}
-            icon: sonarr.png
-            description: TV Shows
-            widget:
-              type: sonarr
-              url: http://sonarr.default.svc.cluster.local.:8080
-              key: {{HOMEPAGE_VAR_SONARR_TOKEN}}
-        - Radarr:
-            href: https://radarr.${SECRET_EXTERNAL_DOMAIN}
-            siteMonitor: https://radarr.${SECRET_EXTERNAL_DOMAIN}
-            icon: radarr.png
-            description: Movies
-            widget:
-              type: radarr
-              url: http://radarr.default.svc.cluster.local.:8080
-              key: {{HOMEPAGE_VAR_RADARR_TOKEN}}
-        - Lidarr:
-            href: https://lidarr.${SECRET_EXTERNAL_DOMAIN}
-            siteMonitor: https://lidarr.${SECRET_EXTERNAL_DOMAIN}
-            icon: lidarr.png
-            description: Music
-            widget:
-              type: lidarr
-              url: http://lidarr.default.svc.cluster.local.:8080
-              key: {{HOMEPAGE_VAR_LIDARR_TOKEN}}
+            type: homeassistant
+            url: http://home-assistant.default.svc.cluster.local.:8123
+            key: {{HOMEPAGE_VAR_HASS_TOKEN}}
+- Media:
+    - Jellyfin:
+        icon: jellyfin.png
+        href: https://jellyfin.${SECRET_CLUSTER_DOMAIN}
+        description: Media Server
+        widget:
+            type: jellyfin
+            url: http://jellyfin.default.svc.cluster.local.:8096
+            key: {{HOMEPAGE_VAR_JELLYFIN_TOKEN}}
+            enableNowPlaying: true
+    - Sonarr:
+        href: https://sonarr.${SECRET_EXTERNAL_DOMAIN}
+        icon: sonarr.png
+        description: TV Shows
+        widget:
+            type: sonarr
+            url: http://sonarr.default.svc.cluster.local.:8080
+            key: {{HOMEPAGE_VAR_SONARR_TOKEN}}
+    - Radarr:
+        href: https://radarr.${SECRET_EXTERNAL_DOMAIN}
+        icon: radarr.png
+        description: Movies
+        widget:
+            type: radarr
+            url: http://radarr.default.svc.cluster.local.:8080
+            key: {{HOMEPAGE_VAR_RADARR_TOKEN}}
+    - Lidarr:
+        href: https://lidarr.${SECRET_EXTERNAL_DOMAIN}
+        icon: lidarr.png
+        description: Music
+        widget:
+            type: lidarr
+            url: http://lidarr.default.svc.cluster.local.:8080
+            key: {{HOMEPAGE_VAR_LIDARR_TOKEN}}
+    - Bazarr:
+        icon: bazarr.png
+        href: https://bazarr.${SECRET_EXTERNAL_DOMAIN}
+        description: Subtitles Management
+        widget:
+            type: bazarr
+            url: http://bazarr.default.svc.cluster.local.:6767
+            key: {{HOMEPAGE_VAR_BAZARR_TOKEN}}
 - Calendar:
     - Agenda:
         widget:
diff --git a/kubernetes/apps/default/homepage/app/config/widgets.yaml b/kubernetes/apps/default/homepage/app/config/widgets.yaml
index 4c4381066..15654ddd1 100644
--- a/kubernetes/apps/default/homepage/app/config/widgets.yaml
+++ b/kubernetes/apps/default/homepage/app/config/widgets.yaml
@@ -25,8 +25,8 @@
       showLabel: true
 - openmeteo:
     label: Home
-    latitude: ${LATITUDE}
-    longitude: ${LONGITUDE}
+    latitude: "{{HOMEPAGE_VAR_LATITUDE}}"
+    longitude: "{{HOMEPAGE_VAR_LONGITUDE}}"
     timezone: Europe/Paris
     units: metric
     cache: 5
diff --git a/kubernetes/apps/default/homepage/app/externalsecret.yaml b/kubernetes/apps/default/homepage/app/externalsecret.yaml
index ba43d11f8..224794c3a 100644
--- a/kubernetes/apps/default/homepage/app/externalsecret.yaml
+++ b/kubernetes/apps/default/homepage/app/externalsecret.yaml
@@ -22,16 +22,22 @@ spec:
         HOMEPAGE_VAR_HASS_TOKEN: "{{ .PROMETHEUS_TOKEN }}"
 
         ## Media
+        HOMEPAGE_VAR_BAZARR_TOKEN: "{{ .BAZARR__API_KEY }}"
+        HOMEPAGE_VAR_JELLYFIN_TOKEN: "{{ .JELLYFIN__HOMEPAGE_API_KEY }}"
         HOMEPAGE_VAR_LIDARR_TOKEN: "{{ .LIDARR__API_KEY }}"
         HOMEPAGE_VAR_RADARR_TOKEN: "{{ .RADARR__API_KEY }}"
         HOMEPAGE_VAR_SONARR_TOKEN: "{{ .SONARR__API_KEY }}"
   dataFrom:
+    - extract:
+        key: bazarr
     - extract:
         key: cloudnative-pg
     - extract:
         key: homepage
     - extract:
         key: home-assistant
+    - extract:
+        key: jellyfin
     - extract:
         key: lidarr
     - extract: