diff --git a/monitoring/grafana-aether/Chart.yaml b/monitoring/grafana-aether/Chart.yaml
index 5a06687..b36e148 100644
--- a/monitoring/grafana-aether/Chart.yaml
+++ b/monitoring/grafana-aether/Chart.yaml
@@ -5,6 +5,6 @@
 name: grafana-aether
 description: A Helm chart for deploying Grafana with Aether dashboards
 
-version: 0.2.5
+version: 0.2.6
 
 appVersion: 0.1.0
diff --git a/monitoring/grafana-aether/dashboards/global-edge-status.json b/monitoring/grafana-aether/dashboards/global-edge-status.json
index f6724ed..6d23fdd 100644
--- a/monitoring/grafana-aether/dashboards/global-edge-status.json
+++ b/monitoring/grafana-aether/dashboards/global-edge-status.json
@@ -16,7 +16,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1601940913118,
+  "iteration": 1602017151964,
   "links": [],
   "panels": [
     {
@@ -203,7 +203,11 @@
             "filters": [
               "metric.label.gateway_name",
               "=",
-              "menlo-gcp1"
+              "menlo-gcp1",
+              "AND",
+              "metric.label.tunnel_name",
+              "!=",
+              "aether-gcp-argela"
             ],
             "groupBys": [],
             "metricKind": "GAUGE",
@@ -474,7 +478,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 4,
       "scopedVars": {
         "edge": {
@@ -615,7 +619,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 4,
       "scopedVars": {
         "edge": {
@@ -756,7 +760,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 4,
       "scopedVars": {
         "edge": {
@@ -897,7 +901,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 4,
       "scopedVars": {
         "edge": {
@@ -1054,7 +1058,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 5,
       "scopedVars": {
         "edge": {
@@ -1134,7 +1138,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 5,
       "scopedVars": {
         "edge": {
@@ -1214,7 +1218,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 5,
       "scopedVars": {
         "edge": {
@@ -1294,7 +1298,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 5,
       "scopedVars": {
         "edge": {
@@ -1510,7 +1514,7 @@
       "renderer": "flot",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 23,
       "scopedVars": {
         "edge": {
@@ -1640,7 +1644,7 @@
       "renderer": "flot",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 23,
       "scopedVars": {
         "edge": {
@@ -1770,7 +1774,7 @@
       "renderer": "flot",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 23,
       "scopedVars": {
         "edge": {
@@ -1900,7 +1904,7 @@
       "renderer": "flot",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 23,
       "scopedVars": {
         "edge": {
@@ -2083,7 +2087,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 13,
       "scopedVars": {
         "edge": {
@@ -2151,7 +2155,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 13,
       "scopedVars": {
         "edge": {
@@ -2219,7 +2223,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 13,
       "scopedVars": {
         "edge": {
@@ -2287,7 +2291,7 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1601940913118,
+      "repeatIteration": 1602017151964,
       "repeatPanelId": 13,
       "scopedVars": {
         "edge": {
@@ -2434,7 +2438,7 @@
         "options": [],
         "query": "aetheredge_status_control_plane",
         "refresh": 1,
-        "regex": "/.*,name=\"(?!ace-menlo-dongle)(ace-.*)\",namespace.*/",
+        "regex": "/.*,name=\"(?!ace-menlo-dongle)(?!ace-argela)(ace-.*)\",namespace.*/",
         "skipUrlSync": false,
         "sort": 1,
         "tagValuesQuery": "",
@@ -2446,7 +2450,7 @@
     ]
   },
   "time": {
-    "from": "now-3h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {
@@ -2466,4 +2470,4 @@
   "title": "Aether Connected Edge",
   "uid": "AIKTPZVMk",
   "version": 1
-}
+}
\ No newline at end of file
diff --git a/monitoring/grafana-aether/templates/dashboard-configmap.yaml b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
index 22cf549..a9e6d98 100644
--- a/monitoring/grafana-aether/templates/dashboard-configmap.yaml
+++ b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
@@ -24,3 +24,8 @@
 {{ (.Files.Glob $path).AsConfig | indent 2 }}
 {{- end }}
 {{- end }}
+{{- if .Values.sdCoreDashboard }}
+{{- if .Values.sdCoreDatasourceURL }}
+{{ (.Files.Glob "dashboards/sdcore*.json").AsConfig | indent 2 }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/monitoring/grafana-aether/values.yaml b/monitoring/grafana-aether/values.yaml
index 9d8ad47..2a280ff 100644
--- a/monitoring/grafana-aether/values.yaml
+++ b/monitoring/grafana-aether/values.yaml
@@ -9,7 +9,8 @@
 fullnameOverride: ""
 
 globalDashboard: true
-multiSiteDashboard: true
+multiSiteDashboard: false
+sdCoreDashboard: false
 
 # Specify an enterprise to deploy its dashboard, i.e., "telefonica"
 enterpriseDashboard: ""
@@ -17,6 +18,9 @@
 # URL of Prometheus that collects E2E test results from edge monitoring server
 edgeServerDatasourceURL: ""
 
+# URL of Prometheus that collects SD-CORE metrics
+sdCoreDatasourceURL: ""
+
 # List of cluster Prometheus datasources.
 clusterDatasources: []
 # - cluster: production-edge-onf-menlo