diff --git a/grafana/files/dashboards/opencontrail/contrail_vrouter_prometheus.json b/grafana/files/dashboards/opencontrail/contrail_3_vrouter_prometheus.json
similarity index 99%
rename from grafana/files/dashboards/opencontrail/contrail_vrouter_prometheus.json
rename to grafana/files/dashboards/opencontrail/contrail_3_vrouter_prometheus.json
index e24ffed..fd9f661 100644
--- a/grafana/files/dashboards/opencontrail/contrail_vrouter_prometheus.json
+++ b/grafana/files/dashboards/opencontrail/contrail_3_vrouter_prometheus.json
@@ -321,7 +321,7 @@
       "id": 23,
       "panels": [],
       "repeat": null,
-      "title": "BGP, XMPP, DNS-XMPP & LLS",
+      "title": "DNS-XMPP & LLS",
       "type": "row"
     },
     {
diff --git a/grafana/files/dashboards/opencontrail/contrail_vrouter_prometheus.json b/grafana/files/dashboards/opencontrail/contrail_4_vrouter_prometheus.json
similarity index 94%
copy from grafana/files/dashboards/opencontrail/contrail_vrouter_prometheus.json
copy to grafana/files/dashboards/opencontrail/contrail_4_vrouter_prometheus.json
index e24ffed..d5dc1fe 100644
--- a/grafana/files/dashboards/opencontrail/contrail_vrouter_prometheus.json
+++ b/grafana/files/dashboards/opencontrail/contrail_4_vrouter_prometheus.json
@@ -316,12 +316,12 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 11
+        "y": 14
       },
       "id": 23,
       "panels": [],
       "repeat": null,
-      "title": "BGP, XMPP, DNS-XMPP & LLS",
+      "title": "LLS",
       "type": "row"
     },
     {
@@ -334,97 +334,9 @@
       "fill": 1,
       "gridPos": {
         "h": 7,
-        "w": 12,
+        "w": 24,
         "x": 0,
-        "y": 12
-      },
-      "id": 8,
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null as zero",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "min(contrail_vrouter_dns_xmpp{environment=\"$environment\", host=~\"$host\"}) by (host)",
-          "format": "time_series",
-          "intervalFactor": 2,
-          "legendFormat": "{{ host }}",
-          "refId": "A",
-          "step": 2
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "vRouters DNS XMPP Sessions",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "decimals": 0,
-      "fill": 1,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 12,
-        "y": 12
+        "y": 15
       },
       "id": 9,
       "legend": {
diff --git a/metadata/service/client/dashboards/all.yml b/metadata/service/client/dashboards/all.yml
index 2c7dbf3..5a4acaf 100644
--- a/metadata/service/client/dashboards/all.yml
+++ b/metadata/service/client/dashboards/all.yml
@@ -19,7 +19,8 @@
 - service.grafana.client.dashboards.opencontrail.cassandra
 - service.grafana.client.dashboards.opencontrail.contrail_3_controller
 - service.grafana.client.dashboards.opencontrail.contrail_4_controller
-- service.grafana.client.dashboards.opencontrail.vrouter
+- service.grafana.client.dashboards.opencontrail.contrail_3_vrouter
+- service.grafana.client.dashboards.opencontrail.contrail_4_vrouter
 - service.grafana.client.dashboards.opencontrail.zookeeper
 - service.grafana.client.dashboards.openstack.cinder
 - service.grafana.client.dashboards.openstack.glance
diff --git a/metadata/service/client/dashboards/opencontrail/vrouter.yml b/metadata/service/client/dashboards/opencontrail/contrail_3_vrouter.yml
similarity index 71%
rename from metadata/service/client/dashboards/opencontrail/vrouter.yml
rename to metadata/service/client/dashboards/opencontrail/contrail_3_vrouter.yml
index 615b39c..741a9a1 100644
--- a/metadata/service/client/dashboards/opencontrail/vrouter.yml
+++ b/metadata/service/client/dashboards/opencontrail/contrail_3_vrouter.yml
@@ -2,7 +2,7 @@
   grafana:
     client:
       dashboard:
-        contrail_vrouter_prometheus:
+        contrail_3_vrouter_prometheus:
           datasource: prometheus
           format: json
-          template: grafana/files/dashboards/opencontrail/contrail_vrouter_prometheus.json
+          template: grafana/files/dashboards/opencontrail/contrail_3_vrouter_prometheus.json
diff --git a/metadata/service/client/dashboards/opencontrail/vrouter.yml b/metadata/service/client/dashboards/opencontrail/contrail_4_vrouter.yml
similarity index 71%
copy from metadata/service/client/dashboards/opencontrail/vrouter.yml
copy to metadata/service/client/dashboards/opencontrail/contrail_4_vrouter.yml
index 615b39c..956bbe6 100644
--- a/metadata/service/client/dashboards/opencontrail/vrouter.yml
+++ b/metadata/service/client/dashboards/opencontrail/contrail_4_vrouter.yml
@@ -2,7 +2,7 @@
   grafana:
     client:
       dashboard:
-        contrail_vrouter_prometheus:
+        contrail_4_vrouter_prometheus:
           datasource: prometheus
           format: json
-          template: grafana/files/dashboards/opencontrail/contrail_vrouter_prometheus.json
+          template: grafana/files/dashboards/opencontrail/contrail_4_vrouter_prometheus.json