diff --git a/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json b/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json
index 43f28c9..05de626 100644
--- a/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json
+++ b/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json
@@ -70,7 +70,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_vcpus / (openstack_nova_total_free_vcpus + openstack_nova_total_used_vcpus) * 100",
+              "expr": "max(openstack_nova_total_used_vcpus / (openstack_nova_total_free_vcpus + openstack_nova_total_used_vcpus) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -148,7 +148,7 @@
           "tableColumn": "Value",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram) * 100",
+              "expr": "max(openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram) * 100)",
               "format": "time_series",
               "interval": "5m",
               "intervalFactor": 1,
@@ -227,7 +227,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_disk) * 100",
+              "expr": "max(openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_disk) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_nova_total_free_disk",
@@ -304,7 +304,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
+              "expr": "max(1 - sum(openstack_cinder_pool_capacity_free) by (instance) / sum(openstack_cinder_pool_capacity_total) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_cinder_pool_capacity_total",
@@ -393,7 +393,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
+              "expr": "max(count(openstack_nova_service{service=\"nova-compute\"}) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -445,7 +445,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "openstack_nova_instances{state=\"active\"}",
+              "expr": "max(openstack_nova_instances{state=\"active\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "",
@@ -534,7 +534,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "openstack_nova_aggregate_used_vcpus",
+              "expr": "max(openstack_nova_aggregate_used_vcpus) without (instance)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{aggregate}}",
@@ -624,7 +624,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "openstack_nova_aggregate_used_ram",
+              "expr": "max(openstack_nova_aggregate_used_ram) without (instance)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{aggregate}}",
@@ -714,7 +714,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "openstack_nova_aggregate_used_disk",
+              "expr": "max(openstack_nova_aggregate_used_disk) without (instance)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{aggregate}}",
diff --git a/devops_portal/files/grafana_dashboards/compute_dashboard.json b/devops_portal/files/grafana_dashboards/compute_dashboard.json
index 87c9f97..5e5d802 100644
--- a/devops_portal/files/grafana_dashboards/compute_dashboard.json
+++ b/devops_portal/files/grafana_dashboards/compute_dashboard.json
@@ -431,7 +431,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_used_ram{hostname=\"$compute\"}/(openstack_nova_used_ram{hostname=\"$compute\"} + openstack_nova_free_ram{hostname=\"$compute\"}) * 100",
+              "expr": "max(openstack_nova_used_ram{hostname=\"$compute\"}/(openstack_nova_used_ram{hostname=\"$compute\"} + openstack_nova_free_ram{hostname=\"$compute\"}) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -507,7 +507,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_used_disk{hostname=\"$compute\"}/(openstack_nova_used_disk{hostname=\"$compute\"} + openstack_nova_free_disk{hostname=\"$compute\"}) * 100",
+              "expr": "max(openstack_nova_used_disk{hostname=\"$compute\"}/(openstack_nova_used_disk{hostname=\"$compute\"} + openstack_nova_free_disk{hostname=\"$compute\"}) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -583,7 +583,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_used_vcpus{hostname=\"$compute\"}/(openstack_nova_used_vcpus{hostname=\"$compute\"} + openstack_nova_free_vcpus{hostname=\"$compute\"}) * 100",
+              "expr": "max(openstack_nova_used_vcpus{hostname=\"$compute\"}/(openstack_nova_used_vcpus{hostname=\"$compute\"} + openstack_nova_free_vcpus{hostname=\"$compute\"}) * 100)",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "Free vCPU",
@@ -828,7 +828,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_used_ram{hostname=\"$compute\"}",
+              "expr": "max(openstack_nova_used_ram{hostname=\"$compute\"})",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "Used Ram",
diff --git a/devops_portal/files/grafana_dashboards/csm_dashboard.json b/devops_portal/files/grafana_dashboards/csm_dashboard.json
index b9ff70b..689b80b 100644
--- a/devops_portal/files/grafana_dashboards/csm_dashboard.json
+++ b/devops_portal/files/grafana_dashboards/csm_dashboard.json
@@ -693,7 +693,7 @@
           ],
           "targets": [
             {
-              "expr": "openstack_api_check_status == 0",
+              "expr": "max(openstack_api_check_status) without (instance) == 0",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ service }}",
@@ -773,7 +773,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
+              "expr": "max(count(openstack_nova_service{service=\"nova-compute\"}) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -825,7 +825,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "openstack_nova_instances{state=\"active\"}",
+              "expr": "max(openstack_nova_instances{state=\"active\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "",
@@ -937,7 +937,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_vcpus / (openstack_nova_total_free_vcpus + openstack_nova_total_used_vcpus)* 100",
+              "expr": "max(openstack_nova_total_used_vcpus / (openstack_nova_total_free_vcpus + openstack_nova_total_used_vcpus) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -1015,7 +1015,7 @@
           "tableColumn": "Value",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram)  * 100",
+              "expr": "max(openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram) * 100)",
               "format": "time_series",
               "interval": "5m",
               "intervalFactor": 1,
@@ -1094,7 +1094,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_disk) * 100",
+              "expr": "max(openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_disk) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_nova_total_free_disk",
@@ -1171,7 +1171,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
+              "expr": "max(1 - sum(openstack_cinder_pool_capacity_free) by (instance) / sum(openstack_cinder_pool_capacity_total) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_cinder_pool_capacity_total",
diff --git a/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json b/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json
index c4d28e3..6026bba 100644
--- a/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json
+++ b/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json
@@ -693,7 +693,7 @@
           ],
           "targets": [
             {
-              "expr": "openstack_api_check_status == 0",
+              "expr": "max(openstack_api_check_status) without (instance) == 0",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ service }}",
@@ -773,7 +773,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
+              "expr": "max(count(openstack_nova_service{service=\"nova-compute\"}) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -825,7 +825,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "openstack_nova_instances{state=\"active\"}",
+              "expr": "max(openstack_nova_instances{state=\"active\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "",
@@ -937,7 +937,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_vcpus / (openstack_nova_total_free_vcpus + openstack_nova_total_used_vcpus)* 100",
+              "expr": "max(openstack_nova_total_used_vcpus / (openstack_nova_total_free_vcpus + openstack_nova_total_used_vcpus) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -1015,7 +1015,7 @@
           "tableColumn": "Value",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram)  * 100",
+              "expr": "max(openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram) * 100)",
               "format": "time_series",
               "interval": "5m",
               "intervalFactor": 1,
@@ -1094,7 +1094,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_disk) * 100",
+              "expr": "max(openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_disk) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_nova_total_free_disk",
@@ -1171,7 +1171,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
+              "expr": "max(1 - sum(openstack_cinder_pool_capacity_free) by (instance) / sum(openstack_cinder_pool_capacity_total) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_cinder_pool_capacity_total",
diff --git a/devops_portal/files/grafana_dashboards/openstack_availability.json b/devops_portal/files/grafana_dashboards/openstack_availability.json
index c78425a..1349156 100644
--- a/devops_portal/files/grafana_dashboards/openstack_availability.json
+++ b/devops_portal/files/grafana_dashboards/openstack_availability.json
@@ -693,7 +693,7 @@
           ],
           "targets": [
             {
-              "expr": "openstack_api_check_status == 0",
+              "expr": "max(openstack_api_check_status) without (instance) == 0",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ service }}",
@@ -773,7 +773,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
+              "expr": "max(count(openstack_nova_service{service=\"nova-compute\"}) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -825,7 +825,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "openstack_nova_instances{state=\"active\"}",
+              "expr": "max(openstack_nova_instances{state=\"active\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "",
@@ -937,7 +937,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_vcpus / (openstack_nova_total_used_vcpus + openstack_nova_total_free_vcpus) * 100",
+              "expr": "max(openstack_nova_total_used_vcpus / (openstack_nova_total_free_vcpus + openstack_nova_total_used_vcpus) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -1015,7 +1015,7 @@
           "tableColumn": "Value",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram) * 100",
+              "expr": "max(openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram) * 100)",
               "format": "time_series",
               "interval": "5m",
               "intervalFactor": 1,
@@ -1094,7 +1094,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_ram) * 100",
+              "expr": "max(openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_disk) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_nova_total_free_disk",
@@ -1171,7 +1171,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
+              "expr": "max(1 - sum(openstack_cinder_pool_capacity_free) by (instance) / sum(openstack_cinder_pool_capacity_total) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_cinder_pool_capacity_total",
diff --git a/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json b/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json
index 01c4e5e..502663d 100644
--- a/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json
+++ b/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json
@@ -693,7 +693,7 @@
           ],
           "targets": [
             {
-              "expr": "openstack_api_check_status == 0",
+              "expr": "max(openstack_api_check_status) without (instance) == 0",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{ service }}",
@@ -773,7 +773,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "count(openstack_nova_service{service=\"nova-compute\"})",
+              "expr": "max(count(openstack_nova_service{service=\"nova-compute\"}) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -825,7 +825,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "openstack_nova_instances{state=\"active\"}",
+              "expr": "max(openstack_nova_instances{state=\"active\"})",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "",
@@ -937,7 +937,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_vcpus / (openstack_nova_total_used_vcpus + openstack_nova_total_free_vcpus) * 100",
+              "expr": "max(openstack_nova_total_used_vcpus / (openstack_nova_total_free_vcpus + openstack_nova_total_used_vcpus) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "",
@@ -1015,7 +1015,7 @@
           "tableColumn": "Value",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram) * 100",
+              "expr": "max(openstack_nova_total_used_ram / (openstack_nova_total_free_ram + openstack_nova_total_used_ram) * 100)",
               "format": "time_series",
               "interval": "5m",
               "intervalFactor": 1,
@@ -1094,7 +1094,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_ram) * 100",
+              "expr": "max(openstack_nova_total_used_disk / (openstack_nova_total_free_disk + openstack_nova_total_used_disk) * 100)",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_nova_total_free_disk",
@@ -1171,7 +1171,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
+              "expr": "max(1 - sum(openstack_cinder_pool_capacity_free) by (instance) / sum(openstack_cinder_pool_capacity_total) by (instance))",
               "format": "time_series",
               "intervalFactor": 2,
               "metric": "openstack_cinder_pool_capacity_total",