diff --git a/contrib/grafana/dashboard.json b/contrib/grafana/dashboard.json
index 3cb73e0..18772c8 100644
--- a/contrib/grafana/dashboard.json
+++ b/contrib/grafana/dashboard.json
@@ -66,7 +66,7 @@
             "maxDataPoints": 100,
             "options": {
                 "colorMode": "value",
-                "graphMode": "area",
+                "graphMode": "none",
                 "justifyMode": "auto",
                 "orientation": "horizontal",
                 "reduceOptions": {
@@ -129,7 +129,7 @@
             "links": [],
             "options": {
                 "colorMode": "value",
-                "graphMode": "area",
+                "graphMode": "none",
                 "justifyMode": "auto",
                 "orientation": "auto",
                 "reduceOptions": {
@@ -145,6 +145,7 @@
             "pluginVersion": "7.5.1",
             "targets": [
                 {
+                    "exemplar": true,
                     "expr": "ontvacstat_previous_day_doses_administered",
                     "format": "time_series",
                     "interval": "",
@@ -158,6 +159,101 @@
             "title": "Doses Administered Yesterday",
             "type": "stat"
         },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": null,
+            "fieldConfig": {
+                "defaults": {},
+                "overrides": []
+            },
+            "fill": 1,
+            "fillGradient": 0,
+            "gridPos": {
+                "h": 8,
+                "w": 11,
+                "x": 0,
+                "y": 6
+            },
+            "hiddenSeries": false,
+            "id": 10,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "nullPointMode": "null",
+            "options": {
+                "alertThreshold": true
+            },
+            "percentage": false,
+            "pluginVersion": "7.5.1",
+            "pointradius": 2,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "exemplar": true,
+                    "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d:1d])",
+                    "interval": "",
+                    "intervalFactor": 1,
+                    "legendFormat": "",
+                    "refId": "A"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Vacination Rate (3d:1d Average)",
+            "tooltip": {
+                "shared": true,
+                "sort": 0,
+                "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "yaxes": [
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
         {
             "datasource": null,
             "description": "% of Ontario Population partially or Fully Vaccinated.",
@@ -189,7 +285,7 @@
                 "h": 8,
                 "w": 11,
                 "x": 0,
-                "y": 6
+                "y": 14
             },
             "id": 2,
             "links": [],
@@ -241,7 +337,7 @@
         "list": []
     },
     "time": {
-        "from": "now-1h",
+        "from": "now-7d",
         "to": "now"
     },
     "timepicker": {
@@ -267,5 +363,5 @@
     "timezone": "",
     "title": "Ontario Vaccination Stats",
     "uid": "vhnVv3lMk",
-    "version": 17
+    "version": 19
 }
\ No newline at end of file
diff --git a/contrib/update_dashboard/ontvacstats-snapshot.json b/contrib/update_dashboard/ontvacstats-snapshot.json
index dacfb21..d55f0fe 100644
--- a/contrib/update_dashboard/ontvacstats-snapshot.json
+++ b/contrib/update_dashboard/ontvacstats-snapshot.json
@@ -1,6 +1,19 @@
 {
     "dashboard": {
-        "editable": false,
+        "annotations": {
+            "list": [
+                {
+                    "builtIn": 1,
+                    "datasource": "-- Grafana --",
+                    "enable": true,
+                    "hide": true,
+                    "iconColor": "rgba(0, 211, 255, 1)",
+                    "name": "Annotations & Alerts",
+                    "type": "dashboard"
+                }
+            ]
+        },
+        "editable": true,
         "gnetId": null,
         "graphTooltip": 0,
         "id": 25,
@@ -9,7 +22,7 @@
             {
                 "cacheTimeout": null,
                 "datasource": null,
-                "description": "Days left until everyone 18+ Is partially vaccinated.\n\nThis divides the remaining population without any vaccination by theaverage doses administered over the past 3 days.",
+                "description": "Days left until everyone 18+ Is partially vaccinated.\n\nThis divides the remaining population without any vaccination by the average doses administered over the past 3 days.",
                 "fieldConfig": {
                     "defaults": {
                         "mappings": [
@@ -54,7 +67,7 @@
                 "maxDataPoints": 100,
                 "options": {
                     "colorMode": "value",
-                    "graphMode": "area",
+                    "graphMode": "none",
                     "justifyMode": "auto",
                     "orientation": "horizontal",
                     "reduceOptions": {
@@ -117,7 +130,7 @@
                 "links": [],
                 "options": {
                     "colorMode": "value",
-                    "graphMode": "area",
+                    "graphMode": "none",
                     "justifyMode": "auto",
                     "orientation": "auto",
                     "reduceOptions": {
@@ -133,6 +146,7 @@
                 "pluginVersion": "7.5.1",
                 "targets": [
                     {
+                        "exemplar": true,
                         "expr": "ontvacstat_previous_day_doses_administered",
                         "format": "time_series",
                         "interval": "",
@@ -146,6 +160,101 @@
                 "title": "Doses Administered Yesterday",
                 "type": "stat"
             },
+            {
+                "aliasColors": {},
+                "bars": false,
+                "dashLength": 10,
+                "dashes": false,
+                "datasource": null,
+                "fieldConfig": {
+                    "defaults": {},
+                    "overrides": []
+                },
+                "fill": 1,
+                "fillGradient": 0,
+                "gridPos": {
+                    "h": 8,
+                    "w": 11,
+                    "x": 0,
+                    "y": 6
+                },
+                "hiddenSeries": false,
+                "id": 10,
+                "legend": {
+                    "avg": false,
+                    "current": false,
+                    "max": false,
+                    "min": false,
+                    "show": true,
+                    "total": false,
+                    "values": false
+                },
+                "lines": true,
+                "linewidth": 1,
+                "nullPointMode": "null",
+                "options": {
+                    "alertThreshold": true
+                },
+                "percentage": false,
+                "pluginVersion": "7.5.1",
+                "pointradius": 2,
+                "points": false,
+                "renderer": "flot",
+                "seriesOverrides": [],
+                "spaceLength": 10,
+                "stack": false,
+                "steppedLine": false,
+                "targets": [
+                    {
+                        "exemplar": true,
+                        "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d:1d])",
+                        "interval": "",
+                        "intervalFactor": 1,
+                        "legendFormat": "",
+                        "refId": "A"
+                    }
+                ],
+                "thresholds": [],
+                "timeFrom": null,
+                "timeRegions": [],
+                "timeShift": null,
+                "title": "Vacination Rate (3d:1d Average)",
+                "tooltip": {
+                    "shared": true,
+                    "sort": 0,
+                    "value_type": "individual"
+                },
+                "type": "graph",
+                "xaxis": {
+                    "buckets": null,
+                    "mode": "time",
+                    "name": null,
+                    "show": true,
+                    "values": []
+                },
+                "yaxes": [
+                    {
+                        "format": "short",
+                        "label": null,
+                        "logBase": 1,
+                        "max": null,
+                        "min": null,
+                        "show": true
+                    },
+                    {
+                        "format": "short",
+                        "label": null,
+                        "logBase": 1,
+                        "max": null,
+                        "min": null,
+                        "show": true
+                    }
+                ],
+                "yaxis": {
+                    "align": false,
+                    "alignLevel": null
+                }
+            },
             {
                 "datasource": null,
                 "description": "% of Ontario Population partially or Fully Vaccinated.",
@@ -177,7 +286,7 @@
                     "h": 8,
                     "w": 11,
                     "x": 0,
-                    "y": 6
+                    "y": 14
                 },
                 "id": 2,
                 "links": [],
@@ -255,7 +364,7 @@
         "timezone": "",
         "title": "Ontario Vaccination Stats",
         "uid": "vhnVv3lMk",
-        "version": 17
+        "version": 19
     },
     "expires": 86400,
     "key": "ontvacstats"