diff --git a/monitoring/dashboards/overview.jsonnet b/monitoring/dashboards/overview.jsonnet
index 59b18e6..e4ba8e8 100644
--- a/monitoring/dashboards/overview.jsonnet
+++ b/monitoring/dashboards/overview.jsonnet
@@ -32,7 +32,7 @@ local service_status_table = {
   type: "table",
   targets: [
     {
-      expr: 'sum(up{job="%s", role=~"%s"}) by (instance)' % [services[i], roles_for_service[services[i]]],
+      expr: 'sum(up{service="%s", role=~"%s"}) by (instance)' % [services[i], roles_for_service[services[i]]],
       intervalFactor: 1,
       format: "table",
       refId: refId(i),
diff --git a/monitoring/prometheus.jsonnet b/monitoring/prometheus.jsonnet
index 157a0c9..9792147 100644
--- a/monitoring/prometheus.jsonnet
+++ b/monitoring/prometheus.jsonnet
@@ -42,6 +42,7 @@ local services = [
             labels: {
               instance: host,
               role: hosts[host][1],
+              service: service,
             },
           } for host in std.objectFields(hosts)
         ],