diff --git a/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml b/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml
index c2025029..35cd6c2f 100644
--- a/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml
+++ b/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml
@@ -59,26 +59,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -135,26 +135,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -202,7 +202,7 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
-          - refId: condition
+           - refId: condition
             relativeTimeRange:
               from: 600
               to: 0
@@ -211,26 +211,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -278,7 +278,7 @@ groups:
               legendFormat: __auto
               range: false
               refId: latest_external
-          - refId: condition
+           - refId: condition
             relativeTimeRange:
               from: 600
               to: 0
@@ -287,26 +287,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -363,26 +363,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -439,26 +439,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -515,26 +515,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -591,26 +591,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -669,26 +669,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -745,26 +745,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
@@ -823,26 +823,26 @@ groups:
               conditions:
                 - evaluator:
                     params:
-                      - 0
+                      - 15
                       - 0
                     type: gt
                   operator:
-                    type: and
+                    type: when
                   query:
-                    params: []
+                    params:
+                      - diff
                   reducer:
                     params: []
-                    type: avg
+                    type: last
                   type: query
               datasource:
                 name: Expression
                 type: __expr__
                 uid: __expr__
-              expression: ${diff} >= 16
-              intervalMs: 1000
-              maxDataPoints: 43200
+              expression: ""
+              hide: false
               refId: condition
-              type: math
+              type: classic_conditions
         noDataState: Alerting
         execErrState: Alerting
         for: 15m