diff --git a/charts/greenhouse/Chart.lock b/charts/greenhouse/Chart.lock
index 6bef20253..f70280f80 100644
--- a/charts/greenhouse/Chart.lock
+++ b/charts/greenhouse/Chart.lock
@@ -7,7 +7,7 @@ dependencies:
   version: 0.7.1
 - name: manager
   repository: file://../manager
-  version: 0.10.1
+  version: 0.10.2
 - name: dashboard
   repository: file://../dashboard
   version: 0.3.0
@@ -20,5 +20,5 @@ dependencies:
 - name: authz
   repository: file://../authz
   version: 0.3.3
-digest: sha256:d568466c96ab07d4186689b398407c18f85acb2ba5b9581e6b6d2591a3c62986
-generated: "2026-04-23T15:05:34.306499+02:00"
+digest: sha256:b01ec3487ee5498363ceaa43ecc028bdb52c8afb8aabe28d7eac25559e1ff0fb
+generated: "2026-05-11T13:39:20.288203+02:00"
diff --git a/charts/greenhouse/Chart.yaml b/charts/greenhouse/Chart.yaml
index 479220f7f..55c7b404c 100644
--- a/charts/greenhouse/Chart.yaml
+++ b/charts/greenhouse/Chart.yaml
@@ -5,7 +5,7 @@ apiVersion: v2
 name: greenhouse
 description: A Helm chart for deploying greenhouse
 type: application
-version: 0.17.3
+version: 0.17.4
 appVersion: "v0.11.1"
 
 dependencies:
@@ -18,7 +18,7 @@ dependencies:
     repository: "file://../cors-proxy"
     version: 0.7.1
   - name: manager
-    version: 0.10.1
+    version: 0.10.2
     repository: "file://../manager"
   - condition: dashboard.enabled
     name: dashboard
diff --git a/charts/manager/Chart.yaml b/charts/manager/Chart.yaml
index 031bafc6e..fd484d7a2 100644
--- a/charts/manager/Chart.yaml
+++ b/charts/manager/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.10.1
+version: 0.10.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/charts/manager/alerts/cluster.alerts b/charts/manager/alerts/cluster.alerts
index 27f0d2bd7..71c3d0d9f 100644
--- a/charts/manager/alerts/cluster.alerts
+++ b/charts/manager/alerts/cluster.alerts
@@ -5,7 +5,7 @@ groups:
       annotations:
         summary: "Cluster not ready"
         description: "Cluster {{ $labels.clusterName }} in namespace {{ $labels.namespace }} has not been ready for more than 15 minutes."
-      expr: sum by (namespace, clusterName, owned_by) (greenhouse_cluster_ready) == 0
+      expr: max by (namespace, clusterName, owned_by) (last_over_time(greenhouse_cluster_ready[15m])) == 0
       for: 15m
       labels:
         severity: warning
@@ -18,7 +18,7 @@ groups:
       annotations:
         description: The kubeconfig token for {{ $labels.clusterName }} in {{ $labels.namespace }} will expire less than 20 hours.
         summary: The kubeconfig token is not refreshed.
-      expr: min by (namespace, clusterName, owned_by) (greenhouse_cluster_kubeconfig_validity_seconds) < 3600 * 20
+      expr: max by (namespace, clusterName, owned_by) (last_over_time(greenhouse_cluster_kubeconfig_validity_seconds[15m])) < 3600 * 20
       for: 30m
       labels:
         severity: warning
@@ -31,7 +31,7 @@ groups:
       annotations:
         summary: "Kubernetes version out of maintenance"
         description: "Cluster {{ $labels.clusterName }} in namespace {{ $labels.namespace }} is running Kubernetes version {{ $labels.version }} which is out of maintenance."
-      expr: sum by (namespace, clusterName, version, owned_by) (greenhouse_cluster_k8s_versions_total{version=~"v1\\.(1[0-9]|2[0-9])\\..*"}) == 1
+      expr: max by (namespace, clusterName, version, owned_by) (last_over_time(greenhouse_cluster_k8s_versions_total{version=~"v1\\.(1[0-9]|2[0-9])\\..*"}[15m])) == 1
       labels:
         severity: warning
         service: greenhouse
diff --git a/charts/manager/alerts/organization.alerts b/charts/manager/alerts/organization.alerts
index dc2f9608c..26edaac51 100644
--- a/charts/manager/alerts/organization.alerts
+++ b/charts/manager/alerts/organization.alerts
@@ -2,7 +2,7 @@ groups:
 - name: organization.alerts
   rules:
   - alert: GreenhouseOrganizationNotReady
-    expr: sum by (organization) (greenhouse_organization_ready) == 0
+    expr: max by (organization) (last_over_time(greenhouse_organization_ready[15m])) == 0
     for: 15m
     labels:
         severity: warning
@@ -14,7 +14,7 @@ groups:
         summary: "Greenhouse Organization is not ready"
         description: "The Greenhouse Organization {{ $labels.organization }} has not been ready for more than 15 minutes."
   - alert: GreenhouseSCIMAccessNotReady
-    expr: sum by (organization) (greenhouse_scim_access_ready) == 0
+    expr: max by (organization) (last_over_time(greenhouse_scim_access_ready[15m])) == 0
     for: 15m
     labels:
         severity: warning
diff --git a/charts/manager/alerts/plugin.alerts b/charts/manager/alerts/plugin.alerts
index dee023a14..786f5374e 100644
--- a/charts/manager/alerts/plugin.alerts
+++ b/charts/manager/alerts/plugin.alerts
@@ -2,7 +2,7 @@ groups:
   - name: greenhouse-plugin.rules
     rules:
     - alert: GreenhousePluginNotReady
-      expr: sum by (namespace, clusterName, plugin, owned_by) (greenhouse_plugin_ready) == 0
+      expr: max by (namespace, clusterName, plugin, owned_by) (last_over_time(greenhouse_plugin_ready[15m])) == 0
       for: 15m
       labels:
         severity: warning
diff --git a/charts/manager/alerts/resource.alerts b/charts/manager/alerts/resource.alerts
index b72f5c890..dd8a0ed9d 100644
--- a/charts/manager/alerts/resource.alerts
+++ b/charts/manager/alerts/resource.alerts
@@ -5,7 +5,7 @@ groups:
       annotations:
         summary: "The greenhouse.sap/owned-by label is missing on resource"
         description: "{{ $labels.resource_kind }} {{ $labels.resource_name }} in organization {{ $labels.organization }} is missing the greenhouse.sap/owned-by label"
-      expr: sum by (organization, resource_kind, resource_name) (greenhouse_owned_by_label_missing) > 0
+      expr:   max by (resource_kind, resource_name, organization) (last_over_time(greenhouse_owned_by_label_missing[15m])) > 0
       for: 15m
       labels:
         severity: warning