diff --git a/grafana-alerts.json.tmpl b/grafana-alerts.json.tmpl
index c7b8cab..8c78da2 100644
--- a/grafana-alerts.json.tmpl
+++ b/grafana-alerts.json.tmpl
@@ -68,50 +68,76 @@
           "condition": "B",
           "data": [
             {
-              "refId": "A",
-              "relativeTimeRange": { "from": 600, "to": 0 },
-              "datasourceUid": "PBFA97CFB590B2093",
-              "model": {
-                "disableTextWrap": false,
-                "editorMode": "builder",
-                "expr": "rate(backup[24h])",
-                "fullMetaSearch": false,
-                "includeNullMetadata": true,
-                "instant": true,
-                "intervalMs": 1000,
-                "legendFormat": "__auto",
-                "maxDataPoints": 43200,
-                "range": false,
                 "refId": "A",
-                "useBackend": false
-              }
+                "relativeTimeRange": {
+                    "from": 28800,
+                    "to": 0
+                },
+                "datasourceUid": "PBFA97CFB590B2093",
+                "model": {
+                    "disableTextWrap": false,
+                    "editorMode": "code",
+                    "expr": "rate(backup[25h]) == 0",
+                    "fullMetaSearch": false,
+                    "includeNullMetadata": true,
+                    "instant": true,
+                    "intervalMs": 1000,
+                    "legendFormat": "__auto",
+                    "maxDataPoints": 43200,
+                    "range": false,
+                    "refId": "A",
+                    "useBackend": false
+                }
             },
             {
-              "refId": "B",
-              "relativeTimeRange": { "from": 600, "to": 0 },
-              "datasourceUid": "__expr__",
-              "model": {
-                "conditions": [
-                  {
-                    "evaluator": { "params": [0, 0], "type": "within_range" },
-                    "operator": { "type": "and" },
-                    "query": { "params": ["C"] },
-                    "reducer": { "params": [], "type": "last" },
-                    "type": "query"
-                  }
-                ],
-                "datasource": { "type": "__expr__", "uid": "__expr__" },
-                "expression": "A",
-                "intervalMs": 1000,
-                "maxDataPoints": 43200,
                 "refId": "B",
-                "type": "threshold"
-              }
+                "relativeTimeRange": {
+                    "from": 28800,
+                    "to": 0
+                },
+                "datasourceUid": "__expr__",
+                "model": {
+                    "conditions": [
+                        {
+                            "evaluator": {
+                                "params": [
+                                    -1,
+                                    0
+                                ],
+                                "type": "gt"
+                            },
+                            "operator": {
+                                "type": "and"
+                            },
+                            "query": {
+                                "params": []
+                            },
+                            "reducer": {
+                                "params": [],
+                                "type": "avg"
+                            },
+                            "type": "query"
+                        }
+                    ],
+                    "datasource": {
+                        "name": "Expression",
+                        "type": "__expr__",
+                        "uid": "__expr__"
+                    },
+                    "expression": "A",
+                    "hide": false,
+                    "intervalMs": 1000,
+                    "maxDataPoints": 43200,
+                    "refId": "B",
+                    "type": "threshold"
+                }
             }
           ],
           "noDataState": "NoData",
           "execErrState": "Error",
           "for": "5m",
+          "annotations": {},
+          "labels": {},
           "isPaused": false
         },
         {{ end }}
@@ -188,9 +214,9 @@
             ],
             "noDataState": "NoData",
             "execErrState": "Error",
-            "for": "20m",
+            "for": "60m",
             "annotations": {
-                "summary": "Backup did not finish within 20 minutes"
+                "summary": "Backup did not finish within 60 minutes"
             },
             "labels": {},
             "isPaused": false