diff --git a/entity-types/ext-sd_wan/cloudgenix-dashboard.json b/entity-types/ext-sd_wan/cloudgenix-dashboard.json
index 4d223a99a9..f64cfa958f 100644
--- a/entity-types/ext-sd_wan/cloudgenix-dashboard.json
+++ b/entity-types/ext-sd_wan/cloudgenix-dashboard.json
@@ -62,7 +62,7 @@
             "nrqlQueries": [
               {
                 "accountId": 0,
-                "query": "FROM Metric SELECT latest(kentik.snmp.CPU) AS 'Current CPU Utilization %'"
+                "query": "SELECT ((rate(latest(kentik.snmp.ssCpuRawUser), 1 second) + rate(latest(kentik.snmp.ssCpuRawSystem), 1 second) + rate(latest(kentik.snmp.ssCpuRawWait), 1 second)) / (rate(latest(kentik.snmp.ssCpuRawUser), 1 second) + rate(latest(kentik.snmp.ssCpuRawSystem), 1 second) + rate(latest(kentik.snmp.ssCpuRawIdle), 1 second) + rate(latest(kentik.snmp.ssCpuRawWait), 1 second))) * 100 AS 'Current CPU Utilization %' FROM Metric"
               }
             ],
             "platformOptions": {
@@ -143,7 +143,7 @@
             "nrqlQueries": [
               {
                 "accountId": 0,
-                "query": "FROM Metric SELECT min(kentik.snmp.CPU) AS 'Min CPU', max(kentik.snmp.CPU) AS 'Max CPU', average(kentik.snmp.CPU) AS 'Average CPU' TIMESERIES 5 MINUTES"
+                "query": "SELECT ((rate(latest(kentik.snmp.ssCpuRawUser), 1 second) + rate(latest(kentik.snmp.ssCpuRawSystem), 1 second) + rate(latest(kentik.snmp.ssCpuRawWait), 1 second)) / (rate(latest(kentik.snmp.ssCpuRawUser), 1 second) + rate(latest(kentik.snmp.ssCpuRawSystem), 1 second) + rate(latest(kentik.snmp.ssCpuRawIdle), 1 second) + rate(latest(kentik.snmp.ssCpuRawWait), 1 second))) * 100 AS 'Active CPU %' FROM Metric TIMESERIES 5 MINUTES"
               }
             ],
             "platformOptions": {
diff --git a/entity-types/ext-sd_wan/golden_metrics.yml b/entity-types/ext-sd_wan/golden_metrics.yml
new file mode 100644
index 0000000000..3305c50a3c
--- /dev/null
+++ b/entity-types/ext-sd_wan/golden_metrics.yml
@@ -0,0 +1,21 @@
+cpuUtilization:
+  title: CPU Utilization (%)
+  unit: PERCENTAGE
+  queries:
+    # Cloudgenix SD-WAN
+    kentik/cloudgenix:
+      select: ((rate(latest(kentik.snmp.ssCpuRawUser), 1 second) + rate(latest(kentik.snmp.ssCpuRawSystem), 1 second) + rate(latest(kentik.snmp.ssCpuRawWait), 1 second)) / (rate(latest(kentik.snmp.ssCpuRawUser), 1 second) + rate(latest(kentik.snmp.ssCpuRawSystem), 1 second) + rate(latest(kentik.snmp.ssCpuRawIdle), 1 second) + rate(latest(kentik.snmp.ssCpuRawWait), 1 second))) * 100
+      from: Metric
+      eventId: entity.guid
+      
+
+memoryUtilization:
+  title: Memory Utilization (%)
+  unit: PERCENTAGE
+  queries:
+     # Cloudgenix SD-WAN
+    kentik/cloudgenix:
+      select: latest(kentik.snmp.MemoryUtilization)
+      from: Metric
+      eventId: entity.guid
+      
\ No newline at end of file
diff --git a/entity-types/ext-sd_wan/summary_metrics.yml b/entity-types/ext-sd_wan/summary_metrics.yml
index 8946486cfb..64a99f7d85 100644
--- a/entity-types/ext-sd_wan/summary_metrics.yml
+++ b/entity-types/ext-sd_wan/summary_metrics.yml
@@ -2,4 +2,13 @@ ipAddress:
   title: IP address
   unit: STRING
   tag:
-    key: src_addr
+    key: device_ip
+
+cpuUtilization:
+  goldenMetric: cpuUtilization
+  title: CPU
+  unit: PERCENTAGE
+memoryUtilization:
+  goldenMetric: memoryUtilization
+  title: Memory
+  unit: PERCENTAGE