diff --git a/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml b/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml
index f310e6fc0..de6e078bb 100644
--- a/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml
+++ b/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml
@@ -236,15 +236,8 @@ data:
             namespace: gitea
             app: gitea
             podSelector: >-
-                app.kubernetes.io/name in (
-                    gitea,
-                    cloudflared,
-                    gitea-actions-act-runner,
-                    meilisearch,
-                    gitea-postgresql-18,
-                    redis-replication-gitea,
-                    redis-replication-renovate,
-                    gitea-shared-storage-backup
+                app.kubernetes.io/instance in (
+                    gitea
                 )
         - Code (Local):
             icon: sh-gitea.webp
@@ -267,10 +260,8 @@ data:
             namespace: codeserver
             app: codeserver
             podSelector: >-
-                app.kubernetes.io/name in (
+                app.kubernetes.io/instance in (
                     code-server,
-                    cloudflared,
-                    code-server-config-backup
                 )
         - IDE (Home Assistant):
             icon: sh-visual-studio-code.webp
@@ -287,14 +278,6 @@ data:
             namespace: argocd
             app: argocd
             podSelector: >-
-                app.kubernetes.io/name in (
-                    argocd-applicationset-controller,
-                    argocd-dex-server,
-                    argocd-notifications-controller,
-                    argocd-repo-server,
-                    argocd-server,
-                    argocd-application-controller
-                );
                 app.kubernetes.io/instance in (
                     argocd
                 )
@@ -307,9 +290,8 @@ data:
             namespace: komodo
             app: komodo
             podSelector: >-
-                app.kubernetes.io/name in (
-                    komodo,
-                    komodo-postgresql-17-fdb
+                app.kubernetes.io/instance in (
+                    komodo
                 )
     - Automation:
         - Deployment Workflows:
@@ -318,18 +300,36 @@ data:
             href: https://argo-workflows.alexlebens.net
             siteMonitor: http://argo-workflows-server.argo-workflows:2746
             statusStyle: dot
+            namespace: argo-workflows
+            app: argo-workflows
+            podSelector: >-
+                app.kubernetes.io/instance in (
+                    argo-workflows
+                )
         - Uptime:
             icon: sh-gatus.webp
             description: Gatus
             href: https://gatus.alexlebens.net
             siteMonitor: http://gatus.gatus:80
             statusStyle: dot
+            namespace: gatus
+            app: gatus
+            podSelector: >-
+                app.kubernetes.io/instance in (
+                    gatus
+                )
         - Tools:
             icon: sh-omnitools.webp
             description: OmniTools
             href: https://omni-tools.alexlebens.net
             siteMonitor: http://omni-tools.omni-tools:80
             statusStyle: dot
+            namespace: omni-tools
+            app: omni-tools
+            podSelector: >-
+                app.kubernetes.io/instance in (
+                    omni-tools
+                )
     - Monitoring:
         - Kubernetes:
             icon: sh-headlamp.webp
@@ -337,24 +337,51 @@ data:
             href: https://headlamp.alexlebens.net
             siteMonitor: http://headlamp.headlamp:80
             statusStyle: dot
+            namespace: headlamp
+            app: headlamp
+            podSelector: >-
+                app.kubernetes.io/instance in (
+                    headlamp
+                )
         - Network Monitoring:
             icon: sh-cilium.webp
             description: Hubble for Cilium
             href: https://hubble.alexlebens.net
             siteMonitor: http://hubble-ui.kube-system:80
             statusStyle: dot
+            namespace: kube-system
+            app: cilium-operator
+            podSelector: >-
+                app.kubernetes.io/part-of in (
+                    cilium
+                )
         - Dashboard:
             icon: sh-grafana.webp
             description: Grafana
             href: https://grafana.alexlebens.net
             siteMonitor: http://grafana-main-service.grafana-operator:3000/api/health
             statusStyle: dot
+            namespace: grafana-operator
+            app: grafana-operator
+            podSelector: >-
+                app.kubernetes.io/instance in (
+                    grafana-operator
+                ),
+                app in (
+                    grafana-main
+                )
         - Metrics:
             icon: sh-prometheus.webp
             description: Prometheus
             href: https://prometheus.alexlebens.net
             siteMonitor: http://kube-prometheus-stack-prometheus.kube-prometheus-stack:9090
             statusStyle: dot
+            namespace: kube-prometheus-stack
+            app: prometheus
+            podSelector: >-
+                app.kubernetes.io/instance in (
+                    kube-prometheus-stack
+                )
             widget:
               type: prometheus
               url: http://kube-prometheus-stack-prometheus.kube-prometheus-stack:9090
@@ -381,6 +408,12 @@ data:
             href: https://jellystat.alexlebens.net
             siteMonitor: http://jellystat.jellystat:80
             statusStyle: dot
+            namespace: jellystat
+            app: jellystat
+            podSelector: >-
+                app.kubernetes.io/instance in (
+                    jellystat
+                )
     - Services:
         - Auth (Public):
             icon: sh-authentik.webp
diff --git a/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml b/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml
index b5621695c..6ce259307 100644
--- a/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml
+++ b/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml
@@ -24,7 +24,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/configMaps: 1257140f3ccc7baaa059ddfbe5434873a08cf5664b9d636604a2afe38980a66a
+        checksum/configMaps: 9271dc1d2c971321eeb17a50330be1481565e91088a7d79c06c1394c15eb4f92
         checksum/secrets: d3ba83f111cd32f92c909268c55ad8bbd4f9e299b74b35b33c1a011180d8b378
       labels:
         app.kubernetes.io/controller: main