diff --git a/blocked-edges/4.14.0-ec.0-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-ec.0-AzureRegistryImagePreservation.yaml
index ea28e37cd..2c1d84a8f 100644
--- a/blocked-edges/4.14.0-ec.0-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-ec.0-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-ec.1-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-ec.1-AzureRegistryImagePreservation.yaml
index 43e0d4545..a6547c4f2 100644
--- a/blocked-edges/4.14.0-ec.1-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-ec.1-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-ec.2-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-ec.2-AzureRegistryImagePreservation.yaml
index afc6e249b..5b84f5dc6 100644
--- a/blocked-edges/4.14.0-ec.2-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-ec.2-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-ec.3-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-ec.3-AzureRegistryImagePreservation.yaml
index 3c18dbff5..cdfadffea 100644
--- a/blocked-edges/4.14.0-ec.3-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-ec.3-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-ec.4-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-ec.4-AzureRegistryImagePreservation.yaml
index 34ef8e70b..6d38dcf86 100644
--- a/blocked-edges/4.14.0-ec.4-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-ec.4-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-rc.0-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-rc.0-AzureRegistryImagePreservation.yaml
index 7da731678..deeb7cca1 100644
--- a/blocked-edges/4.14.0-rc.0-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-rc.0-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-rc.1-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-rc.1-AzureRegistryImagePreservation.yaml
index 18b3f9e71..6ceda1e29 100644
--- a/blocked-edges/4.14.0-rc.1-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-rc.1-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-rc.2-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-rc.2-AzureRegistryImagePreservation.yaml
index f07d9051a..bed478640 100644
--- a/blocked-edges/4.14.0-rc.2-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-rc.2-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-rc.3-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-rc.3-AzureRegistryImagePreservation.yaml
index 20eee7376..9d5d2f113 100644
--- a/blocked-edges/4.14.0-rc.3-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-rc.3-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-rc.4-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-rc.4-AzureRegistryImagePreservation.yaml
index 2100c1139..6389b8331 100644
--- a/blocked-edges/4.14.0-rc.4-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-rc.4-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-rc.5-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-rc.5-AzureRegistryImagePreservation.yaml
index c8a5171b5..f3541e47f 100644
--- a/blocked-edges/4.14.0-rc.5-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-rc.5-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-rc.6-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-rc.6-AzureRegistryImagePreservation.yaml
index 709cecfd6..b437ec623 100644
--- a/blocked-edges/4.14.0-rc.6-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-rc.6-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.0-rc.7-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.0-rc.7-AzureRegistryImagePreservation.yaml
index 816598fdf..db9de6f3c 100644
--- a/blocked-edges/4.14.0-rc.7-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.0-rc.7-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.1-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.1-AzureRegistryImagePreservation.yaml
index 6e70a93b8..3e870fa79 100644
--- a/blocked-edges/4.14.1-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.1-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.10-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.10-AzureRegistryImagePreservation.yaml
index 90d4bab4b..db8ccab98 100644
--- a/blocked-edges/4.14.10-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.10-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.11-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.11-AzureRegistryImagePreservation.yaml
index b720d1ca8..d19ecdd5f 100644
--- a/blocked-edges/4.14.11-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.11-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.12-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.12-AzureRegistryImagePreservation.yaml
index 6d09ff1f1..f989ccfe7 100644
--- a/blocked-edges/4.14.12-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.12-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.2-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.2-AzureRegistryImagePreservation.yaml
index 212ec9171..5612df04f 100644
--- a/blocked-edges/4.14.2-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.2-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.3-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.3-AzureRegistryImagePreservation.yaml
index d42f548e7..8137d9305 100644
--- a/blocked-edges/4.14.3-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.3-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.4-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.4-AzureRegistryImagePreservation.yaml
index a7c603326..6bfc560ac 100644
--- a/blocked-edges/4.14.4-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.4-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.5-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.5-AzureRegistryImagePreservation.yaml
index 7b2a608ab..76bc207c6 100644
--- a/blocked-edges/4.14.5-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.5-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.6-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.6-AzureRegistryImagePreservation.yaml
index 5fb800eaa..d7ef85df9 100644
--- a/blocked-edges/4.14.6-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.6-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.7-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.7-AzureRegistryImagePreservation.yaml
index 7cba0aa8e..ffb64b84b 100644
--- a/blocked-edges/4.14.7-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.7-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.8-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.8-AzureRegistryImagePreservation.yaml
index e67fd088c..0f7269b18 100644
--- a/blocked-edges/4.14.8-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.8-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )
diff --git a/blocked-edges/4.14.9-AzureRegistryImagePreservation.yaml b/blocked-edges/4.14.9-AzureRegistryImagePreservation.yaml
index 40a9c9a04..aa5b632f2 100644
--- a/blocked-edges/4.14.9-AzureRegistryImagePreservation.yaml
+++ b/blocked-edges/4.14.9-AzureRegistryImagePreservation.yaml
@@ -8,7 +8,15 @@ matchingRules:
   promql:
     promql: |
       topk(1,
-        cluster_infrastructure_provider{_id="",type="Azure"}
+        group by (type) (cluster_infrastructure_provider{_id="",type="Azure"})
         or
-        0 * cluster_infrastructure_provider{_id=""}
+        0 * group by (type) (cluster_infrastructure_provider{_id=""})
+      )
+      * on () group_left (name, operation, method)
+      topk(1,
+        group by (name) (cluster_operator_conditions{_id="",name="aro"})
+        or
+        group by (operation) (max by (operation) (max_over_time(imageregistry_request_duration_seconds_count{_id=""}[1h])))
+        or
+        0 * group by (method) (max by (method) (imageregistry_http_request_duration_seconds_count{_id=""}))
       )