diff --git a/cmd/tools/grafana/dashboard_test.go b/cmd/tools/grafana/dashboard_test.go
index 46c3844b1..a7a1f418f 100644
--- a/cmd/tools/grafana/dashboard_test.go
+++ b/cmd/tools/grafana/dashboard_test.go
@@ -21,6 +21,11 @@ var dashboards = []string{
 	"../../../grafana/dashboards/storagegrid",
 }
 
+var cDotDashboards = []string{
+	"../../../grafana/dashboards/cmode",
+	"../../../grafana/dashboards/cmode-details",
+}
+
 var throughputPattern = regexp.MustCompile(`(throughput|read_data|write_data|total_data)`)
 var aggregationThroughputPattern = regexp.MustCompile(`(?i)(\w+)\(`)
 
@@ -1631,13 +1636,19 @@ func checkDescription(t *testing.T, path string, data []byte, count *int) {
 }
 
 func TestFSxFriendlyVariables(t *testing.T) {
-	VisitDashboards(dashboards,
+	VisitDashboards(cDotDashboards,
 		func(path string, data []byte) {
 			checkVariablesAreFSxFriendly(t, path, data)
 		})
 }
 
 func checkVariablesAreFSxFriendly(t *testing.T, path string, data []byte) {
+
+	exceptionValues := map[string]bool{
+		"cmode/metadata.json":                true,
+		"cmode/snapmirror_destinations.json": true,
+	}
+
 	gjson.GetBytes(data, "templating.list").ForEach(func(key, value gjson.Result) bool {
 		// Only consider query variables
 		if value.Get("type").String() != "query" {
@@ -1648,18 +1659,21 @@ func checkVariablesAreFSxFriendly(t *testing.T, path string, data []byte) {
 		definition := value.Get("definition").String()
 		varName := value.Get("name").String()
 
-		if varName != "Cluster" && varName != "Datacenter" {
+		sPath := ShortPath(path)
+		isExceptionPath := exceptionValues[sPath]
+
+		if isExceptionPath || (varName != "Cluster" && varName != "Datacenter") {
 			return true
 		}
 
-		if strings.Contains(query, "node_labels") {
-			t.Errorf(`dashboard=%s path=templating.list[%s] variable="%s" has "node_labels" in query. Use "cluster_new_status" instead.`,
-				ShortPath(path), key.String(), varName)
+		if !strings.Contains(query, "cluster_new_status") {
+			t.Errorf(`dashboard=%s path=templating.list[%s] variable="%s" does not have "cluster_new_status" in query. Found "%s" instead.`,
+				sPath, key.String(), varName, definition)
 		}
 
-		if strings.Contains(definition, "node_labels") {
-			t.Errorf(`dashboard=%s path=templating.list[%s] variable="%s" has "node_labels" in definition. Use "cluster_new_status" instead.`,
-				ShortPath(path), key.String(), varName)
+		if !strings.Contains(definition, "cluster_new_status") {
+			t.Errorf(`dashboard=%s path=templating.list[%s] variable="%s" does not have "cluster_new_status" in definition. Found "%s" instead.`,
+				sPath, key.String(), varName, definition)
 		}
 		return true
 	})
diff --git a/grafana/dashboards/cmode-details/volumeBySVM.json b/grafana/dashboards/cmode-details/volumeBySVM.json
index d1fd5d19a..88c84851b 100644
--- a/grafana/dashboards/cmode-details/volumeBySVM.json
+++ b/grafana/dashboards/cmode-details/volumeBySVM.json
@@ -446,7 +446,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -456,7 +456,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -469,7 +469,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -479,7 +479,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode-details/volumeDeepDive.json b/grafana/dashboards/cmode-details/volumeDeepDive.json
index b3821b2f0..36d4fa128 100644
--- a/grafana/dashboards/cmode-details/volumeDeepDive.json
+++ b/grafana/dashboards/cmode-details/volumeDeepDive.json
@@ -3687,7 +3687,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -3697,7 +3697,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -3713,7 +3713,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -3723,7 +3723,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/aggregate.json b/grafana/dashboards/cmode/aggregate.json
index ecc0a2f50..b5d7c9c5e 100644
--- a/grafana/dashboards/cmode/aggregate.json
+++ b/grafana/dashboards/cmode/aggregate.json
@@ -6601,7 +6601,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(aggr_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -6611,7 +6611,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(aggr_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/data_protection_snapshot.json b/grafana/dashboards/cmode/data_protection_snapshot.json
index 70930d053..b05b5c6e3 100644
--- a/grafana/dashboards/cmode/data_protection_snapshot.json
+++ b/grafana/dashboards/cmode/data_protection_snapshot.json
@@ -1603,7 +1603,7 @@
           "value": "DC-01"
         },
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"},datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"},datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1613,7 +1613,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"},datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"},datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1629,7 +1629,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1639,7 +1639,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/disk.json b/grafana/dashboards/cmode/disk.json
index 3442fe93a..b1673ade9 100644
--- a/grafana/dashboards/cmode/disk.json
+++ b/grafana/dashboards/cmode/disk.json
@@ -3012,7 +3012,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(disk_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -3022,7 +3022,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(disk_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
           "refId": "Prometheus-Cluster-Variable-Query"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/external_service_op.json b/grafana/dashboards/cmode/external_service_op.json
index 76714920c..84ec56821 100644
--- a/grafana/dashboards/cmode/external_service_op.json
+++ b/grafana/dashboards/cmode/external_service_op.json
@@ -823,7 +823,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(external_service_op_request_latency{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -833,7 +833,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(external_service_op_request_latency{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -849,7 +849,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(external_service_op_request_latency{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -859,7 +859,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(external_service_op_request_latency{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/flexgroup.json b/grafana/dashboards/cmode/flexgroup.json
index b7e02855b..6b24d1240 100644
--- a/grafana/dashboards/cmode/flexgroup.json
+++ b/grafana/dashboards/cmode/flexgroup.json
@@ -2871,7 +2871,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -2881,7 +2881,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -2897,7 +2897,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -2907,7 +2907,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/fsa.json b/grafana/dashboards/cmode/fsa.json
index 0870fc7d3..b90ef1de5 100644
--- a/grafana/dashboards/cmode/fsa.json
+++ b/grafana/dashboards/cmode/fsa.json
@@ -1523,7 +1523,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1533,7 +1533,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1549,7 +1549,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1559,7 +1559,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/headroom.json b/grafana/dashboards/cmode/headroom.json
index cd51ccebb..3a2c35127 100644
--- a/grafana/dashboards/cmode/headroom.json
+++ b/grafana/dashboards/cmode/headroom.json
@@ -2460,7 +2460,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -2470,7 +2470,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -2483,7 +2483,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -2493,7 +2493,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/lun.json b/grafana/dashboards/cmode/lun.json
index 6d06149d3..53f0fae4e 100644
--- a/grafana/dashboards/cmode/lun.json
+++ b/grafana/dashboards/cmode/lun.json
@@ -5111,7 +5111,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(lun_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -5121,7 +5121,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(lun_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/mcc_cluster.json b/grafana/dashboards/cmode/mcc_cluster.json
index 56718d1a5..35eac2043 100644
--- a/grafana/dashboards/cmode/mcc_cluster.json
+++ b/grafana/dashboards/cmode/mcc_cluster.json
@@ -4152,7 +4152,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(aggr_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -4163,7 +4163,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(aggr_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/nfsTroubleshooting.json b/grafana/dashboards/cmode/nfsTroubleshooting.json
index 6c55065b0..e31655b6c 100644
--- a/grafana/dashboards/cmode/nfsTroubleshooting.json
+++ b/grafana/dashboards/cmode/nfsTroubleshooting.json
@@ -1702,7 +1702,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1712,7 +1712,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1725,7 +1725,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1735,7 +1735,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/nfs_clients.json b/grafana/dashboards/cmode/nfs_clients.json
index 1a049007d..216a148de 100644
--- a/grafana/dashboards/cmode/nfs_clients.json
+++ b/grafana/dashboards/cmode/nfs_clients.json
@@ -564,7 +564,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -574,7 +574,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -590,7 +590,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -600,7 +600,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/qtree.json b/grafana/dashboards/cmode/qtree.json
index f40e30e05..690f8aeb0 100644
--- a/grafana/dashboards/cmode/qtree.json
+++ b/grafana/dashboards/cmode/qtree.json
@@ -767,7 +767,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -777,7 +777,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -794,7 +794,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -805,7 +805,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/quotaReport.json b/grafana/dashboards/cmode/quotaReport.json
index 584fa2581..98b2d93e1 100644
--- a/grafana/dashboards/cmode/quotaReport.json
+++ b/grafana/dashboards/cmode/quotaReport.json
@@ -838,7 +838,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -848,7 +848,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -865,7 +865,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -876,7 +876,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/s3ObjectStorage.json b/grafana/dashboards/cmode/s3ObjectStorage.json
index 3e1f61e35..ba7073f93 100644
--- a/grafana/dashboards/cmode/s3ObjectStorage.json
+++ b/grafana/dashboards/cmode/s3ObjectStorage.json
@@ -1686,7 +1686,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(ontaps3_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1696,7 +1696,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(ontaps3_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1713,7 +1713,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(ontaps3_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1724,7 +1724,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(ontaps3_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/security.json b/grafana/dashboards/cmode/security.json
index f4cfa719f..9b6028d26 100644
--- a/grafana/dashboards/cmode/security.json
+++ b/grafana/dashboards/cmode/security.json
@@ -5065,7 +5065,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(svm_labels{system_type!=\"7mode\"},datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"},datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -5075,7 +5075,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(svm_labels{system_type!=\"7mode\"},datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"},datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -5091,7 +5091,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(svm_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -5101,7 +5101,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(svm_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"},cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/shelf.json b/grafana/dashboards/cmode/shelf.json
index 25eb996d1..dab574e51 100644
--- a/grafana/dashboards/cmode/shelf.json
+++ b/grafana/dashboards/cmode/shelf.json
@@ -1936,7 +1936,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(shelf_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1946,7 +1946,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(shelf_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1962,7 +1962,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(shelf_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1972,7 +1972,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(shelf_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/smb.json b/grafana/dashboards/cmode/smb.json
index 28de4c687..072207419 100644
--- a/grafana/dashboards/cmode/smb.json
+++ b/grafana/dashboards/cmode/smb.json
@@ -1741,7 +1741,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1751,7 +1751,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1767,7 +1767,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1777,7 +1777,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/svm.json b/grafana/dashboards/cmode/svm.json
index 9dbf3ce8f..7c95537c0 100644
--- a/grafana/dashboards/cmode/svm.json
+++ b/grafana/dashboards/cmode/svm.json
@@ -16425,7 +16425,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(svm_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -16435,7 +16435,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(svm_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -16451,7 +16451,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(svm_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -16461,7 +16461,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(svm_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/volume.json b/grafana/dashboards/cmode/volume.json
index 51a7a47c9..1f2ee2b61 100644
--- a/grafana/dashboards/cmode/volume.json
+++ b/grafana/dashboards/cmode/volume.json
@@ -8981,7 +8981,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -8991,7 +8991,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -9007,7 +9007,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -9017,7 +9017,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/vscan.json b/grafana/dashboards/cmode/vscan.json
index 6844c7813..3041c75da 100644
--- a/grafana/dashboards/cmode/vscan.json
+++ b/grafana/dashboards/cmode/vscan.json
@@ -1124,7 +1124,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(svm_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1134,7 +1134,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(svm_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1150,7 +1150,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(svm_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -1160,7 +1160,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(svm_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
diff --git a/grafana/dashboards/cmode/workload.json b/grafana/dashboards/cmode/workload.json
index 93f35eac5..32ff538c1 100644
--- a/grafana/dashboards/cmode/workload.json
+++ b/grafana/dashboards/cmode/workload.json
@@ -6110,7 +6110,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -6120,7 +6120,7 @@
         "name": "Datacenter",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\"}, datacenter)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\"}, datacenter)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -6136,7 +6136,7 @@
         "allValue": ".*",
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+        "definition": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -6146,7 +6146,7 @@
         "name": "Cluster",
         "options": [],
         "query": {
-          "query": "label_values(volume_labels{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
+          "query": "label_values(cluster_new_status{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,