diff --git a/clusters/cl01tl/applications/homepage/values.yaml b/clusters/cl01tl/applications/homepage/values.yaml
index 5390acf09..4c1418a28 100644
--- a/clusters/cl01tl/applications/homepage/values.yaml
+++ b/clusters/cl01tl/applications/homepage/values.yaml
@@ -40,14 +40,17 @@ homepage:
           theme: dark
           disableCollapse: true
           layout:
+            - External:
+                tab: External
+                icon: mdi-application-#ffffff
+            - Lebens Home:
+                tab: External
+                icon: mdi-application-#ffffff
             - Media:
-                tab: Apps
+                tab: Local
                 icon: mdi-multimedia-#ffffff
             - Applications:
-                tab: Apps
-                icon: mdi-application-#ffffff
-            - Applications (External):
-                tab: Apps
+                tab: Local
                 icon: mdi-application-#ffffff
             - Code:
                 tab: Tools
@@ -107,6 +110,98 @@ homepage:
               units: metric
               cache: 5
         services.yaml: |
+          - External:
+              - Auth:
+                  icon: authentik.png
+                  description: Authentik
+                  href: https://auth.alexlebens.dev
+                  siteMonitor: https://auth.alexlebens.dev
+                  statusStyle: dot
+              - Blog:
+                  icon: ghost.png
+                  description: Ghost
+                  href: https://blog.alexlebens.dev
+                  siteMonitor: https://blog.alexlebens.dev
+                  statusStyle: dot
+              - Chat:
+                  icon: element.svg
+                  description: Matrix
+                  href: https://chat.alexlebens.dev
+                  siteMonitor: https://chat.alexlebens.dev
+                  statusStyle: dot
+              - Wiki:
+                  icon: outline.png
+                  description: Outline
+                  href: https://wiki.alexlebens.dev
+                  siteMonitor: https://wiki.alexlebens.dev
+                  statusStyle: dot
+              - RSS:
+                  icon: freshrss.svg
+                  description: FreshRSS
+                  href: https://rss.alexlebens.dev
+                  siteMonitor: https://rss.alexlebens.dev
+                  statusStyle: dot
+              - Tasks:
+                  icon: vikunja.png
+                  description: Vikunja
+                  href: https://vikunja.alexlebens.dev
+                  siteMonitor: https://vikunja.alexlebens.dev
+                  statusStyle: dot
+              - Books:
+                  icon: calibre.svg
+                  description: Calibre Content Server
+                  href: https://books.alexlebens.dev
+                  siteMonitor: https://books.alexlebens.dev
+                  statusStyle: dot
+              - Code:
+                  icon: gitea.png
+                  description: Gitea
+                  href: https://gitea.alexlebens.dev
+                  siteMonitor: https://gitea.alexlebens.dev
+                  statusStyle: dot
+              - IDE:
+                  icon: code-server.png
+                  description: VS Code
+                  href: https://codeserver.alexlebens.dev
+                  siteMonitor: https://codeserver.alexlebens.dev
+                  statusStyle: dot
+          - Lebens Home:
+              - Code:
+                  icon: gitea.png
+                  description: Code repository (ps10rp)
+                  href: https://gitea.lebens-home.net
+                  siteMonitor: https://gitea.lebens-home.net
+                  statusStyle: dot
+              - 3D Printer:
+                  icon: mainsail.png
+                  description: K1C Mainsail
+                  href: http://printer.lebens-home.net
+                  siteMonitor: http://printer.lebens-home.net
+                  statusStyle: dot
+              - DNS Ad Blocker:
+                  icon: pi-hole.png
+                  description: Pihole
+                  href: https://pihole.lebens-home.net/admin
+                  siteMonitor: https://pihole.lebens-home.net/admin
+                  statusStyle: dot
+              - Reverse Proxy:
+                  icon: traefik.png
+                  description: Traefik
+                  href: https://traefik-ps10rp.lebens-home.net/dashboard/#/
+                  siteMonitor: https://traefik-ps10rp.lebens-home.net/dashboard/#/
+                  statusStyle: dot
+              - Host Management:
+                  icon: cockpit.png
+                  description: Cockpit
+                  href: https://cockpit-ps10rp.lebens-home.net:9090
+                  siteMonitor: https://cockpit-ps10rp.lebens-home.net:9090
+                  statusStyle: dot
+              - Network Management:
+                  icon: unifi.png
+                  description: Unifi
+                  href: https://unifi.lebens-home.net
+                  siteMonitor: https://unifi.lebens-home.net
+                  statusStyle: dot
           - Media:
               - Plex:
                   icon: plex.png
@@ -181,61 +276,6 @@ homepage:
                   href: https://calibre-server.alexlebens.net
                   siteMonitor: http://calibre-server-web.calibre-server:8080
                   statusStyle: dot
-          - Applications (External):
-              - Auth:
-                  icon: authentik.png
-                  description: Authentik
-                  href: https://auth.alexlebens.dev
-                  siteMonitor: https://auth.alexlebens.dev
-                  statusStyle: dot
-              - Gitea:
-                  icon: gitea.png
-                  description: Code repository
-                  href: https://gitea.alexlebens.dev
-                  siteMonitor: https://gitea.alexlebens.dev
-                  statusStyle: dot
-              - Blog:
-                  icon: ghost.png
-                  description: Ghost
-                  href: https://blog.alexlebens.dev
-                  siteMonitor: https://blog.alexlebens.dev
-                  statusStyle: dot
-              - Chat:
-                  icon: element.svg
-                  description: Matrix
-                  href: https://chat.alexlebens.dev
-                  siteMonitor: https://chat.alexlebens.dev
-                  statusStyle: dot
-              - Wiki:
-                  icon: outline.png
-                  description: Outline
-                  href: https://wiki.alexlebens.dev
-                  siteMonitor: https://wiki.alexlebens.dev
-                  statusStyle: dot
-              - RSS:
-                  icon: freshrss.svg
-                  description: FreshRSS
-                  href: https://rss.alexlebens.dev
-                  siteMonitor: https://rss.alexlebens.dev
-                  statusStyle: dot
-              - Tasks:
-                  icon: vikunja.png
-                  description: Vikunja
-                  href: https://vikunja.alexlebens.dev
-                  siteMonitor: https://vikunja.alexlebens.dev
-                  statusStyle: dot
-              - Code:
-                  icon: code-server.png
-                  description: VS Code
-                  href: https://codeserver.alexlebens.dev
-                  siteMonitor: https://codeserver.alexlebens.dev
-                  statusStyle: dot
-              - Books:
-                  icon: calibre.svg
-                  description: Calibre Content Server
-                  href: https://books.alexlebens.dev
-                  siteMonitor: https://books.alexlebens.dev
-                  statusStyle: dot
           - Code:
               - Code Server - Home Assistant:
                   icon: code-server.png