diff --git a/cisco_sdwan/assets/monitors/device_reboot.json b/cisco_sdwan/assets/monitors/device_reboot.json
index 11fe86e0a333d..41c7e88a44d47 100644
--- a/cisco_sdwan/assets/monitors/device_reboot.json
+++ b/cisco_sdwan/assets/monitors/device_reboot.json
@@ -8,10 +8,10 @@
   ],
   "description": "Repeated reboots are an indication of potential issues like software-related glitches, low memory conditions, corrupt software images, hardware faults, or software bugs. By identifying these concerns, this monitor ensures network stability and optimized performance.",
   "definition": {
-	"name": "[Cisco SD-WAN] Device {{hostname.name}} ({{system_ip.name}}) rebooted more than 3 times in the last 10 minutes",
+	"name": "[Cisco SD-WAN] Device {{device_hostname.name}} ({{device_ip.name}}) rebooted more than 3 times in the last 10 minutes",
 	"type": "query alert",
-	"query": "sum(last_10m):sum:cisco_sdwan.reboot.count{*} by {device_namespace,hostname,system_ip} > 3",
-	"message": "{{#is_alert}}\nSD-WAN Device {{hostname.name}} ({{system_ip.name}}) rebooted more than 3 times in the last 10 minutes.\n{{/is_alert}}\n\nTo know more about the status of your device, you can have more information from the [NDM page for the device {{device_namespace.name}}:{{system_ip.name}}](/infrastructure/devices/graph?inspectedDevice={{device_namespace.name}}%3A{{system_ip.name}}).",
+	"query": "sum(last_10m):sum:cisco_sdwan.reboot.count{*} by {device_namespace,device_hostname,device_ip,device_id} > 3",
+	"message": "{{#is_alert}}\nSD-WAN Device {{device_hostname.name}} ({{device_ip.name}}) rebooted more than 3 times in the last 10 minutes.\n{{/is_alert}}\n\nTo know more about the status of your device, you can have more information from the [NDM page for the device {{device_namespace.name}}:{{device_ip.name}}](/infrastructure/devices/graph?inspectedDevice={{device_namespace.name}}%3A{{device_ip.name}}).",
 	"tags": [],
 	"options": {
 		"thresholds": {
diff --git a/cisco_sdwan/assets/monitors/device_unreachable.json b/cisco_sdwan/assets/monitors/device_unreachable.json
index 6dbad34b8b167..0355c7270ebed 100644
--- a/cisco_sdwan/assets/monitors/device_unreachable.json
+++ b/cisco_sdwan/assets/monitors/device_unreachable.json
@@ -8,10 +8,10 @@
   ],
   "description": "This monitor checks the reachability of Cisco SD-WAN devices within a specified namespace. It triggers an alert if a device becomes unreachable, indicating potential network connectivity issues.",
   "definition": {
-	"name": "[Cisco SD-WAN] Device unreachable alert on {{hostname.name}} in namespace {{device_namespace.name}}",
+	"name": "[Cisco SD-WAN] Device unreachable alert on {{device_hostname.name}} in namespace {{device_namespace.name}}",
 	"type": "query alert",
-	"query": "avg(last_5m):max:cisco_sdwan.device.reachable{*} by {hostname,system_ip,device_namespace} < 0.8",
-	"message": "{{#is_alert}}\nA network device {{hostname.name}} with IP {{system_ip.name}} in namespace {{device_namespace.name}} is unreachable.\n{{/is_alert}}\n{{#is_alert_recovery}}\nA network device {{hostname.name}} with IP {{system_ip.name}} in namespace {{device_namespace.name}} is reachable again.\n{{/is_alert_recovery}}\n\nTo know more about the status of your device, you can have more information from the [NDM page for the device {{device_namespace.name}}:{{system_ip.name}}](/infrastructure/devices/graph?inspectedDevice={{device_namespace.name}}%3A{{system_ip.name}}).",
+	"query": "avg(last_5m):max:cisco_sdwan.device.reachable{*} by {device_hostname,device_ip,device_namespace,device_id} < 0.8",
+	"message": "{{#is_alert}}\nA network device {{device_hostname.name}} with IP {{device_ip.name}} in namespace {{device_namespace.name}} is unreachable.\n{{/is_alert}}\n{{#is_alert_recovery}}\nA network device {{device_hostname.name}} with IP {{device_ip.name}} in namespace {{device_namespace.name}} is reachable again.\n{{/is_alert_recovery}}\n\nTo know more about the status of your device, you can have more information from the [NDM page for the device {{device_namespace.name}}:{{device_ip.name}}](/infrastructure/devices/graph?inspectedDevice={{device_namespace.name}}%3A{{device_ip.name}}).",
 	"tags": [],
 	"options": {
 		"thresholds": {
diff --git a/cisco_sdwan/assets/monitors/tunnel_down.json b/cisco_sdwan/assets/monitors/tunnel_down.json
index 632eeac94d337..488e7cfb947b2 100644
--- a/cisco_sdwan/assets/monitors/tunnel_down.json
+++ b/cisco_sdwan/assets/monitors/tunnel_down.json
@@ -8,10 +8,10 @@
 	],
 	"description": "This monitor detects when a Cisco SD-WAN tunnel becomes unavailable between two devices. It tracks the status of tunnels within a specified namespace and triggers an alert if a tunnel goes down, indicating potential connectivity issues.",
 	"definition": {
-		"name": "[Cisco SD-WAN] Tunnel is down between {{local_color.name}} {{hostname.name}} ({{system_ip.name}}) to {{remote_color.name}} {{remote_hostname.name}} ({{remote_system_ip.name}})",
+		"name": "[Cisco SD-WAN] Tunnel is down between {{local_color.name}} {{hostname.name}} ({{device_ip.name}}) to {{remote_color.name}} {{remote_hostname.name}} ({{remote_device_ip.name}})",
 		"type": "query alert",
-		"query": "min(last_15m):min:cisco_sdwan.tunnel.status{*} by {device_namespace,system_ip,hostname,local_color,remote_system_ip,remote_hostname,remote_color} < 1",
-		"message": "{{#is_alert}}\nSD-WAN Tunnel is down between device {{hostname.name}} ({{system_ip.name}}), color {{local_color.name}} to device {{remote_hostname.name}} ({{remote_system_ip.name}}), color {{remote_color.name}}.\n{{/is_alert}}\n\n{{#is_alert_recovery}}\nSD-WAN Tunnel is back up between device {{hostname.name}} ({{system_ip.name}}), color {{local_color.name}} to device {{remote_hostname.name}} ({{remote_system_ip.name}}), color {{remote_color.name}}.\n{{/is_alert_recovery}}\n\nTo know more about the status of your device, you can have more information from the [NDM page for the device {{device_namespace.name}}:{{system_ip.name}}](/infrastructure/devices/graph?inspectedDevice={{device_namespace.name}}%3A{{system_ip.name}}).",
+		"query": "min(last_15m):min:cisco_sdwan.tunnel.status{*} by {device_id,device_namespace,device_ip,device_hostname,local_color,remote_device_ip,remote_device_hostname,remote_color} < 1",
+		"message": "{{#is_alert}}\nSD-WAN Tunnel is down between device {{device_hostname.name}} ({{device_ip.name}}), color {{local_color.name}} to device {{remote_device_hostname.name}} ({{remote_device_ip.name}}), color {{remote_color.name}}.\n{{/is_alert}}\n\n{{#is_alert_recovery}}\nSD-WAN Tunnel is back up between device {{device_hostname.name}} ({{device_ip.name}}), color {{local_color.name}} to device {{remote_device_hostname.name}} ({{remote_device_ip.name}}), color {{remote_color.name}}.\n{{/is_alert_recovery}}\n\nTo know more about the status of your device, you can have more information from the [NDM page for the device {{device_namespace.name}}:{{device_ip.name}}](/infrastructure/devices/graph?inspectedDevice={{device_namespace.name}}%3A{{device_ip.name}}).",
 		"tags": [],
 		"options": {
 			"thresholds": {