diff --git a/HomeLab/unbound-resolver-overview.json b/HomeLab/unbound-resolver-overview.json
index 7abae71..7179305 100644
--- a/HomeLab/unbound-resolver-overview.json
+++ b/HomeLab/unbound-resolver-overview.json
@@ -111,7 +111,7 @@
         "pluginVersion": "12.2.1",
         "targets": [
           {
-            "expr": "(\n  sum(increase(unbound_cache_hits_total[15m])) +\n  sum(increase(redis_keyspace_hits_total[15m]))\n)\n/\n(\n  sum(increase(unbound_cache_hits_total[15m])) +\n  sum(increase(unbound_cache_misses_total[15m])) +\n  sum(increase(redis_keyspace_hits_total[15m])) +\n  sum(increase(redis_keyspace_misses_total[15m]))\n)",
+            "expr": "(sum(rate(unbound_cache_hits_total[30m])) + sum(rate(redis_keyspace_hits_total[30m]))) / clamp_min((sum(rate(unbound_cache_hits_total[30m])) + sum(rate(unbound_cache_misses_total[30m])) + sum(rate(redis_keyspace_hits_total[30m])) + sum(rate(redis_keyspace_misses_total[30m]))), 1e-9)",
             "refId": "A"
           }
         ],
@@ -1162,7 +1162,7 @@
         "pluginVersion": "12.2.1",
         "targets": [
           {
-            "expr": "sum by (instance) (rate(unbound_cache_hits_total[5m])) /\n(\n  sum by (instance) (rate(unbound_cache_hits_total[5m])) +\n  sum by (instance) (rate(unbound_cache_misses_total[5m]))\n)",
+            "expr": "sum by (instance) (rate(unbound_cache_hits_total[30m])) / clamp_min((sum by (instance) (rate(unbound_cache_hits_total[30m])) + sum by (instance) (rate(unbound_cache_misses_total[30m]))), 1e-9)",
             "legendFormat": "{{instance}}",
             "refId": "A"
           }