diff --git a/definitions/ext-router/golden_metrics.yml b/definitions/ext-router/golden_metrics.yml
index 335156329..8e5962ad4 100644
--- a/definitions/ext-router/golden_metrics.yml
+++ b/definitions/ext-router/golden_metrics.yml
@@ -1,9 +1,10 @@
 cpuUtilization:
   title: CPU Utilization (%)
   queries:
-    kentik-router:
+    kentik:
       select: average(kentik.snmp.CPU)
       from: Metric
+      where: "provider = 'kentik-router'"
     mikrotik-router:
       select: average(mikrotik.system.cpu.load)
       from: Metric
@@ -11,9 +12,10 @@ cpuUtilization:
 memoryUtilization:
   title: Memory Utilization (%)
   queries:
-    kentik-router:
+    kentik:
       select: average(kentik.snmp.MemoryUtilization)
       from: Metric
+      where: "provider = 'kentik-router'"
     mikrotik-router:
       select: average(mikrotik.system.memory.used)
       from: Metric
@@ -21,9 +23,10 @@ memoryUtilization:
 receiveErrors:
   title: Aggregate Receive Errors (count)
   queries:
-    kentik-router:
+    kentik:
       select: sum(kentik.snmp.ifInErrors)
       from: Metric
+      where: "provider = 'kentik-router'"
     mikrotik-router:
       select: sum(mikrotik.interface.ether1.rxerrorsps)
       from: Metric
@@ -31,9 +34,10 @@ receiveErrors:
 transmitErrors:
   title: Aggregate Transmit Errors (count)
   queries:
-    kentik-router:
+    kentik:
       select: sum(kentik.snmp.ifOutErrors)
       from: Metric
+      where: "provider = 'kentik-router'"
     mikrotik-router:
       select: sum(mikrotik.interface.ether1.txerrorsps)
       from: Metric