diff --git a/nix/host-modules/swarm-grafana/dashboards/builds.json b/nix/host-modules/swarm-grafana/dashboards/builds.json
index d50a6ff3..ea5be8c1 100644
--- a/nix/host-modules/swarm-grafana/dashboards/builds.json
+++ b/nix/host-modules/swarm-grafana/dashboards/builds.json
@@ -149,7 +149,7 @@
                         "name": "@logsDatasourceUid@"
                       },
                       "spec": {
-                        "expr": "_SYSTEMD_UNIT:\"hive-c0re.service\" TARGET:\"nixos-container\" F_EVENT:finish | filter F_AGENT:$agent | stats count() as builds",
+                        "expr": "_SYSTEMD_UNIT:\"hive-c0re.service\" TARGET:\"nixos-container\" F_EVENT:finish | filter F_AGENT:$agent | stats count_uniq(F_BUILD_ID) as builds",
                         "queryType": "stats"
                       }
                     },
@@ -223,7 +223,7 @@
                         "name": "@logsDatasourceUid@"
                       },
                       "spec": {
-                        "expr": "_SYSTEMD_UNIT:\"hive-c0re.service\" TARGET:\"nixos-container\" F_EVENT:finish | filter F_AGENT:$agent | filter F_STATUS:fail | stats count() as failed",
+                        "expr": "_SYSTEMD_UNIT:\"hive-c0re.service\" TARGET:\"nixos-container\" F_EVENT:finish | filter F_AGENT:$agent | filter F_STATUS:fail | stats count_uniq(F_BUILD_ID) as failed",
                         "queryType": "stats"
                       }
                     },
@@ -371,7 +371,7 @@
                         "name": "@logsDatasourceUid@"
                       },
                       "spec": {
-                        "expr": "_SYSTEMD_UNIT:\"hive-c0re.service\" TARGET:\"nixos-container\" F_EVENT:finish | filter F_AGENT:$agent | stats by (F_STATUS) count() as builds",
+                        "expr": "_SYSTEMD_UNIT:\"hive-c0re.service\" TARGET:\"nixos-container\" F_EVENT:finish | filter F_AGENT:$agent | stats by (F_STATUS) count_uniq(F_BUILD_ID) as builds",
                         "queryType": "statsRange",
                         "legendFormat": "{{F_STATUS}}"
                       }