diff --git a/monitoring/configmap-chemavx-homelab-overview.yaml b/monitoring/configmap-chemavx-homelab-overview.yaml
index 6e2ea40..70b3557 100644
--- a/monitoring/configmap-chemavx-homelab-overview.yaml
+++ b/monitoring/configmap-chemavx-homelab-overview.yaml
@@ -398,7 +398,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_pod_status_phase{namespace=\"n8n\",phase=\"Running\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"n8n\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"n8n\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "n8n",
               "refId": "A"
@@ -486,7 +486,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_pod_status_phase{namespace=\"vaultwarden\",phase=\"Running\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"vaultwarden\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"vaultwarden\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "vaultwarden",
               "refId": "A"
@@ -574,7 +574,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_pod_status_phase{namespace=\"monitoring\",phase=\"Running\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"monitoring\",deployment=\"kube-prometheus-stack-grafana\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"monitoring\",deployment=\"kube-prometheus-stack-grafana\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "grafana",
               "refId": "A"
@@ -662,7 +662,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_pod_status_phase{namespace=\"authentik\",phase=\"Running\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"authentik\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"authentik\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "authentik",
               "refId": "A"
@@ -750,7 +750,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_pod_status_phase{namespace=\"homarr\",phase=\"Running\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"homarr\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"homarr\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "homarr",
               "refId": "A"
@@ -838,7 +838,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_pod_status_phase{namespace=\"gitea\",phase=\"Running\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"gitea\",statefulset=\"gitea\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"gitea\",statefulset=\"gitea\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "gitea",
               "refId": "A"
@@ -926,7 +926,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_pod_status_phase{namespace=\"argocd\",phase=\"Running\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"argocd\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"argocd\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "argocd",
               "refId": "A"
@@ -1014,7 +1014,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_pod_status_phase{namespace=\"ollama\",phase=\"Running\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"ollama\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"ollama\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "ollama",
               "refId": "A"
@@ -1102,7 +1102,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_deployment_status_replicas_available{namespace=\"ghost-en\",deployment=\"ghost-en\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"ghost-en\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"ghost-en\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "ghost-en",
               "refId": "A"
@@ -1190,7 +1190,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_deployment_status_replicas_available{namespace=\"zona-exclusion\",deployment=\"zona-exclusion\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"zona-exclusion\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"zona-exclusion\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "zona-exclusion",
               "refId": "A"
@@ -1278,7 +1278,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_deployment_status_replicas_available{namespace=\"researchowl\",deployment=\"researchowl\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"researchowl\",deployment=\"researchowl\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"researchowl\",deployment=\"researchowl\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "researchowl",
               "refId": "A"
@@ -1366,7 +1366,7 @@ data:
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(kube_deployment_status_replicas_available{namespace=\"researchowl\",deployment=\"searxng\"}) or vector(0)",
+              "expr": "min((kube_deployment_status_replicas_available{namespace=\"researchowl\",deployment=\"searxng\"} >= bool 1) or (kube_statefulset_status_replicas_ready{namespace=\"researchowl\",deployment=\"searxng\"} >= bool 1)) or vector(0)",
               "instant": true,
               "legendFormat": "searxng",
               "refId": "A"
@@ -1728,6 +1728,6 @@ data:
       "timezone": "browser",
       "title": "ChemaVX Homelab Overview",
       "uid": "chemavx-homelab-v1",
-      "version": 5,
+      "version": 6,
       "weekStart": ""
     }