diff --git a/infrastructure/grafana/dashboards/service-health.json b/infrastructure/grafana/dashboards/service-health.json
index c5df940..8461f75 100644
--- a/infrastructure/grafana/dashboards/service-health.json
+++ b/infrastructure/grafana/dashboards/service-health.json
@@ -517,7 +517,7 @@
             "type": "postgres",
             "uid": "postgres"
           },
-          "rawSql": "SELECT name, state, createdon, completedon, output::text AS error FROM pgboss.job WHERE state = 'failed' AND completedon > now() - interval '24 hours' ORDER BY completedon DESC LIMIT 20",
+          "rawSql": "SELECT name, state, created_on, completed_on, output::text AS error FROM pgboss.job WHERE state = 'failed' AND completed_on > now() - interval '24 hours' ORDER BY completed_on DESC LIMIT 20",
           "format": "table"
         }
       ]
@@ -538,7 +538,7 @@
             "type": "postgres",
             "uid": "postgres"
           },
-          "rawSql": "SELECT date_trunc('hour', completedon) AS time, name, count(*) AS completed FROM pgboss.job WHERE state = 'completed' AND completedon > now() - interval '24 hours' GROUP BY 1, 2 ORDER BY 1",
+          "rawSql": "SELECT date_trunc('hour', completed_on) AS time, name, count(*) AS completed FROM pgboss.job WHERE state = 'completed' AND completed_on > now() - interval '24 hours' GROUP BY 1, 2 ORDER BY 1",
           "format": "time_series"
         }
       ]
diff --git a/infrastructure/grafana/provisioning/alerting/alerts.yml b/infrastructure/grafana/provisioning/alerting/alerts.yml
index 1724562..2cc7c9a 100644
--- a/infrastructure/grafana/provisioning/alerting/alerts.yml
+++ b/infrastructure/grafana/provisioning/alerting/alerts.yml
@@ -161,7 +161,7 @@ groups:
             relativeTimeRange: { from: 3600, to: 0 }
             datasourceUid: postgres
             model:
-              rawSql: "SELECT count(*) AS failed FROM pgboss.job WHERE state = 'failed' AND completedon > now() - interval '1 hour'"
+              rawSql: "SELECT count(*) AS failed FROM pgboss.job WHERE state = 'failed' AND completed_on > now() - interval '1 hour'"
               format: table
           - refId: B
             datasourceUid: __expr__