diff --git a/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json b/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json
index 6b305f7..8c2e07c 100644
--- a/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json
+++ b/devops_portal/files/grafana_dashboards/cloud_usage_dashboard.json
@@ -258,7 +258,7 @@
             "rgba(245, 54, 54, 0.9)"
           ],
           "datasource": "prometheus",
-          "format": "percent",
+          "format": "percentunit",
           "gauge": {
             "maxValue": 100,
             "minValue": 0,
@@ -304,10 +304,10 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "sum(openstack_cinder_volumes_size) /  sum(openstack_cinder_size_total_default) * 100",
+              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
               "format": "time_series",
               "intervalFactor": 2,
-              "metric": "openstack_cinder_volumes_size",
+              "metric": "openstack_cinder_pool_capacity_total",
               "refId": "A",
               "step": 600
             }
diff --git a/devops_portal/files/grafana_dashboards/csm_dashboard.json b/devops_portal/files/grafana_dashboards/csm_dashboard.json
index dde26f3..2deecc6 100644
--- a/devops_portal/files/grafana_dashboards/csm_dashboard.json
+++ b/devops_portal/files/grafana_dashboards/csm_dashboard.json
@@ -1125,7 +1125,7 @@
             "rgba(245, 54, 54, 0.9)"
           ],
           "datasource": "prometheus",
-          "format": "percent",
+          "format": "percentunit",
           "gauge": {
             "maxValue": 100,
             "minValue": 0,
@@ -1171,10 +1171,10 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "sum(openstack_cinder_volumes_size) /  sum(openstack_cinder_size_total_default) * 100",
+              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
               "format": "time_series",
               "intervalFactor": 2,
-              "metric": "openstack_cinder_volumes_size",
+              "metric": "openstack_cinder_pool_capacity_total",
               "refId": "A",
               "step": 600
             }
diff --git a/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json b/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json
index 75b3cd1..84b731a 100644
--- a/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json
+++ b/devops_portal/files/grafana_dashboards/csm_dashboard_fluentd.json
@@ -1125,7 +1125,7 @@
             "rgba(245, 54, 54, 0.9)"
           ],
           "datasource": "prometheus",
-          "format": "percent",
+          "format": "percentunit",
           "gauge": {
             "maxValue": 100,
             "minValue": 0,
@@ -1171,10 +1171,10 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "sum(openstack_cinder_volumes_size) /  sum(openstack_cinder_size_total_default) * 100",
+              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
               "format": "time_series",
               "intervalFactor": 2,
-              "metric": "openstack_cinder_volumes_size",
+              "metric": "openstack_cinder_pool_capacity_total",
               "refId": "A",
               "step": 600
             }
diff --git a/devops_portal/files/grafana_dashboards/openstack_availability.json b/devops_portal/files/grafana_dashboards/openstack_availability.json
index a298e12..828e970 100644
--- a/devops_portal/files/grafana_dashboards/openstack_availability.json
+++ b/devops_portal/files/grafana_dashboards/openstack_availability.json
@@ -1125,7 +1125,7 @@
             "rgba(245, 54, 54, 0.9)"
           ],
           "datasource": "prometheus",
-          "format": "percent",
+          "format": "percentunit",
           "gauge": {
             "maxValue": 100,
             "minValue": 0,
@@ -1171,10 +1171,10 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "sum(openstack_cinder_volumes_size) /  sum(openstack_cinder_size_total_default) * 100",
+              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
               "format": "time_series",
               "intervalFactor": 2,
-              "metric": "openstack_cinder_volumes_size",
+              "metric": "openstack_cinder_pool_capacity_total",
               "refId": "A",
               "step": 600
             }
diff --git a/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json b/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json
index 1ac7ec0..064ed73 100644
--- a/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json
+++ b/devops_portal/files/grafana_dashboards/openstack_availability_fluentd.json
@@ -1125,7 +1125,7 @@
             "rgba(245, 54, 54, 0.9)"
           ],
           "datasource": "prometheus",
-          "format": "percent",
+          "format": "percentunit",
           "gauge": {
             "maxValue": 100,
             "minValue": 0,
@@ -1171,10 +1171,10 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "sum(openstack_cinder_volumes_size) /  sum(openstack_cinder_size_total_default) * 100",
+              "expr": "1 - sum(openstack_cinder_pool_capacity_free) / sum(openstack_cinder_pool_capacity_total)",
               "format": "time_series",
               "intervalFactor": 2,
-              "metric": "openstack_cinder_volumes_size",
+              "metric": "openstack_cinder_pool_capacity_total",
               "refId": "A",
               "step": 600
             }