diff --git a/charms/openstack-exporter-k8s/src/grafana_dashboards/cloud.json b/charms/openstack-exporter-k8s/src/grafana_dashboards/cloud.json
index 1ba537ab..28a6d938 100644
--- a/charms/openstack-exporter-k8s/src/grafana_dashboards/cloud.json
+++ b/charms/openstack-exporter-k8s/src/grafana_dashboards/cloud.json
@@ -759,7 +759,7 @@
               }
             ]
           },
-          "unit": "decmbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -791,7 +791,7 @@
           "datasource": {
             "uid": "${prometheusds}"
           },
-          "expr": "sum(openstack_nova_memory_used_bytes{aggregates=~\"$aggregate\"}) / 1e+06",
+          "expr": "sum(openstack_nova_memory_used_bytes{aggregates=~\"$aggregate\"})",
           "instant": true,
           "interval": "",
           "legendFormat": "",
@@ -821,7 +821,7 @@
               }
             ]
           },
-          "unit": "decmbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -853,7 +853,7 @@
           "datasource": {
             "uid": "${prometheusds}"
           },
-          "expr": "sum(openstack_nova_memory_available_bytes{aggregates=~\"$aggregate\"}) / 1e+06",
+          "expr": "sum(openstack_nova_memory_available_bytes{aggregates=~\"$aggregate\"})",
           "instant": true,
           "interval": "",
           "legendFormat": "",
@@ -1038,7 +1038,7 @@
               }
             ]
           },
-          "unit": "decgbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -1068,7 +1068,7 @@
           "datasource": {
             "uid": "${prometheusds}"
           },
-          "expr": "(sum by(aggregates) (openstack_nova_local_storage_available_bytes * on(hostname) group_left() openstack_placement_resource_allocation_ratio{resourcetype=\"DISK_GB\"} / 1e+09)) - (sum by(aggregates) (openstack_nova_local_storage_used_bytes) / 1e+09)",
+          "expr": "(sum by(aggregates) (openstack_nova_local_storage_available_bytes * on(hostname) group_left() openstack_placement_resource_allocation_ratio{resourcetype=\"DISK_GB\"})) - (sum by(aggregates) (openstack_nova_local_storage_used_bytes))",
           "intervalFactor": 2,
           "legendFormat": "{{aggregate}}",
           "refId": "A",
@@ -1372,7 +1372,7 @@
               }
             ]
           },
-          "unit": "none"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -1402,7 +1402,7 @@
           "datasource": {
             "uid": "${prometheusds}"
           },
-          "expr": "sum by(hostname) (openstack_nova_memory_available_bytes) / 1e+09 - sum by(hostname) (openstack_nova_memory_used_bytes) / 1e+09",
+          "expr": "sum by(hostname) (openstack_nova_memory_available_bytes) - sum by(hostname) (openstack_nova_memory_used_bytes)",
           "hide": false,
           "interval": "",
           "intervalFactor": 2,
@@ -1412,7 +1412,7 @@
         }
       ],
       "timeFrom": "20m",
-      "title": "Free RAM GBs per host",
+      "title": "Free RAM per host",
       "transformations": [
         {
           "id": "reduce",
@@ -1451,7 +1451,7 @@
               }
             ]
           },
-          "unit": "none"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -1480,7 +1480,7 @@
           "datasource": {
             "uid": "${prometheusds}"
           },
-          "expr": "sum by(hostname) (openstack_nova_local_storage_available_bytes) / 1e+09 - sum by(hostname) (openstack_nova_local_storage_used_bytes) / 1e+09",
+          "expr": "sum by(hostname) (openstack_nova_local_storage_available_bytes) - sum by(hostname) (openstack_nova_local_storage_used_bytes)",
           "hide": false,
           "interval": "",
           "intervalFactor": 2,
@@ -1490,7 +1490,7 @@
         }
       ],
       "timeFrom": "20m",
-      "title": "Free disk GBs per host",
+      "title": "Free disk per host",
       "transformations": [
         {
           "id": "reduce",
diff --git a/charms/openstack-exporter-k8s/src/grafana_dashboards/compute.json b/charms/openstack-exporter-k8s/src/grafana_dashboards/compute.json
index 4c0d1e8c..366fd19e 100644
--- a/charms/openstack-exporter-k8s/src/grafana_dashboards/compute.json
+++ b/charms/openstack-exporter-k8s/src/grafana_dashboards/compute.json
@@ -421,7 +421,7 @@
               }
             ]
           },
-          "unit": "mbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -450,7 +450,7 @@
       "pluginVersion": "9.2.1",
       "targets": [
         {
-          "expr": "sum(openstack_nova_memory_used_bytes{hostname=~\"$hypervisor.*\"}) / 1000000",
+          "expr": "sum(openstack_nova_memory_used_bytes{hostname=~\"$hypervisor.*\"})",
           "instant": false,
           "interval": "",
           "legendFormat": "",
@@ -478,7 +478,7 @@
               }
             ]
           },
-          "unit": "mbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -507,7 +507,7 @@
       "pluginVersion": "9.2.1",
       "targets": [
         {
-          "expr": "sum(openstack_nova_memory_available_bytes{hostname=~\"$hypervisor.*\"}) / 1000000",
+          "expr": "sum(openstack_nova_memory_available_bytes{hostname=~\"$hypervisor.*\"})",
           "instant": false,
           "interval": "",
           "legendFormat": "",
@@ -535,7 +535,7 @@
               }
             ]
           },
-          "unit": "decgbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -564,7 +564,7 @@
       "pluginVersion": "9.2.1",
       "targets": [
         {
-          "expr": "sum(openstack_nova_local_storage_used_bytes{hostname=~\"$hypervisor.*\"}) / 1000000000",
+          "expr": "sum(openstack_nova_local_storage_used_bytes{hostname=~\"$hypervisor.*\"})",
           "instant": false,
           "interval": "",
           "legendFormat": "",
@@ -592,7 +592,7 @@
               }
             ]
           },
-          "unit": "decgbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -621,7 +621,7 @@
       "pluginVersion": "9.2.1",
       "targets": [
         {
-          "expr": "sum(openstack_nova_local_storage_available_bytes{hostname=~\"$hypervisor.*\"}) / 1000000000",
+          "expr": "sum(openstack_nova_local_storage_available_bytes{hostname=~\"$hypervisor.*\"})",
           "instant": false,
           "interval": "",
           "legendFormat": "",
@@ -675,7 +675,7 @@
             "properties": [
               {
                 "id": "unit",
-                "value": "decbytes"
+                "value": "bytes"
               },
               {
                 "id": "displayName",
@@ -1124,7 +1124,7 @@
               }
             ]
           },
-          "unit": "decbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -1216,7 +1216,7 @@
               }
             ]
           },
-          "unit": "decbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -1282,7 +1282,7 @@
               }
             ]
           },
-          "unit": "decbytes"
+          "unit": "bytes"
         },
         "overrides": [
           {