diff --git a/monitoring/grafana-dashboards/main/propagated-vm.json b/monitoring/grafana-dashboards/main/propagated-vm.json
index 572b6754b8..321dbf6d58 100644
--- a/monitoring/grafana-dashboards/main/propagated-vm.json
+++ b/monitoring/grafana-dashboards/main/propagated-vm.json
@@ -365,7 +365,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_cpu_usage_milliseconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000 \n/\n(\n    sum by (namespace,name) (d8_virtualization_virtualmachine_cpu_cores{namespace=\"$namespace\", name=\"$name\"}) / 100\n)",
+          "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000 \n/\n(\n    sum by (namespace,name) (d8_virtualization_virtualmachine_cpu_cores{namespace=\"$namespace\", name=\"$name\"}) / 100\n)",
           "hide": false,
           "instant": true,
           "legendFormat": "OS Usage",
@@ -1106,7 +1106,7 @@
             "uid": "${ds_prometheus}"
           },
           "editorMode": "code",
-          "expr": "sum by (namespace,name) (\n    rate(\n        d8_virtualization_virtualmachine_cpu_usage_milliseconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval]\n    )\n) / 1000 \n/\n(\n    avg by (namespace,name) (\n        sum by (namespace,name,pod) (d8_virtualization_virtualmachine_cpu_cores{namespace=\"$namespace\", name=\"$name\"}) / 100\n    )\n)",
+          "expr": "sum by (namespace,name) (\n    rate(\n        d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval]\n    )\n) / 1000 \n/\n(\n    avg by (namespace,name) (\n        sum by (namespace,name,pod) (d8_virtualization_virtualmachine_cpu_cores{namespace=\"$namespace\", name=\"$name\"}) / 100\n    )\n)",
           "hide": false,
           "instant": false,
           "legendFormat": "OS Usage",
@@ -1119,7 +1119,7 @@
             "uid": "${ds_prometheus}"
           },
           "editorMode": "code",
-          "expr": "(\n    sum by (namespace,name) (\n        rate(\n            d8_virtualization_virtualmachine_hypervisor_cpu_usage_milliseconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval]\n        )\n    ) / 1000 \n)\n/\n(\n    avg by (namespace,name) (\n        sum by (namespace,name,pod) (\n            d8_virtualization_virtualmachine_cpu_cores{namespace=\"$namespace\", name=\"$name\"}\n        ) / 100\n    )\n)\n",
+          "expr": "(\n    sum by (namespace,name) (\n        rate(\n            d8_virtualization_virtualmachine_hypervisor_cpu_usage_seconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval]\n        )\n    ) / 1000 \n)\n/\n(\n    avg by (namespace,name) (\n        sum by (namespace,name,pod) (\n            d8_virtualization_virtualmachine_cpu_cores{namespace=\"$namespace\", name=\"$name\"}\n        ) / 100\n    )\n)\n",
           "hide": false,
           "instant": false,
           "legendFormat": "Hypervisor overhead",
@@ -2084,7 +2084,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_cpu_usage_milliseconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000",
+              "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000",
               "hide": false,
               "instant": false,
               "legendFormat": "OS Usage",
@@ -2097,7 +2097,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_hypervisor_cpu_usage_milliseconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000\n",
+              "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_hypervisor_cpu_usage_seconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000\n",
               "hide": false,
               "instant": false,
               "legendFormat": "Hypervisor overhead",
@@ -2136,7 +2136,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_cpu_steal_milliseconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000",
+              "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_cpu_steal_seconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000",
               "hide": false,
               "instant": false,
               "legendFormat": "Steal cores",
@@ -2466,7 +2466,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum by (namespace,name,core) (rate(d8_virtualization_virtualmachine_cpu_usage_milliseconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000",
+              "expr": "sum by (namespace,name,core) (rate(d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000",
               "hide": false,
               "instant": false,
               "legendFormat": "OS Usage core {{ core }}",
@@ -2479,7 +2479,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_hypervisor_cpu_usage_milliseconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000\n",
+              "expr": "sum by (namespace,name) (rate(d8_virtualization_virtualmachine_hypervisor_cpu_usage_seconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000\n",
               "hide": false,
               "instant": false,
               "legendFormat": "Hypervisor overhead",
@@ -2518,7 +2518,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum by (namespace,name,core) (rate(d8_virtualization_virtualmachine_cpu_steal_milliseconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000",
+              "expr": "sum by (namespace,name,core) (rate(d8_virtualization_virtualmachine_cpu_steal_seconds_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) / 1000",
               "hide": false,
               "instant": false,
               "legendFormat": "Steal core {{ core }}",
diff --git a/monitoring/grafana-dashboards/main/propagated-vms.json b/monitoring/grafana-dashboards/main/propagated-vms.json
index 3dc562b5c0..7495ef421f 100644
--- a/monitoring/grafana-dashboards/main/propagated-vms.json
+++ b/monitoring/grafana-dashboards/main/propagated-vms.json
@@ -820,7 +820,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (namespace) (rate(d8_virtualization_virtualmachine_cpu_usage_milliseconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
+          "expr": "sum by (namespace) (rate(d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
           "format": "time_series",
           "hide": false,
           "instant": true,
@@ -1429,7 +1429,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "avg by (namespace, name) (rate(d8_virtualization_virtualmachine_cpu_usage_milliseconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
+          "expr": "avg by (namespace, name) (rate(d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -1475,7 +1475,7 @@
             "uid": "${ds_prometheus}"
           },
           "editorMode": "code",
-          "expr": "avg by (namespace, name) (rate(d8_virtualization_virtualmachine_hypervisor_cpu_usage_milliseconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
+          "expr": "avg by (namespace, name) (rate(d8_virtualization_virtualmachine_hypervisor_cpu_usage_seconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
           "format": "table",
           "hide": true,
           "instant": true,
@@ -2054,7 +2054,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum by (name) (rate(d8_virtualization_virtualmachine_cpu_usage_milliseconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
+              "expr": "sum by (name) (rate(d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
               "hide": false,
               "instant": false,
               "legendFormat": "OS Usage / {{ name }} ",
@@ -2067,7 +2067,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum (rate(d8_virtualization_virtualmachine_hypervisor_cpu_usage_milliseconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000\n",
+              "expr": "sum (rate(d8_virtualization_virtualmachine_hypervisor_cpu_usage_seconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000\n",
               "hide": false,
               "instant": false,
               "legendFormat": "Hypervisor overhead",
@@ -2106,7 +2106,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum (rate(d8_virtualization_virtualmachine_cpu_steal_milliseconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
+              "expr": "sum (rate(d8_virtualization_virtualmachine_cpu_steal_seconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
               "hide": false,
               "instant": false,
               "legendFormat": "Steal cores",
@@ -2132,7 +2132,7 @@
                 "uid": "${ds_prometheus}"
               },
               "editorMode": "code",
-              "expr": "sum (rate(d8_virtualization_virtualmachine_cpu_usage_milliseconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
+              "expr": "sum (rate(d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=~\"$namespace\"}[$__rate_interval])) / 1000",
               "hide": false,
               "instant": false,
               "legendFormat": "Total",
diff --git a/templates/kubevirt/service-monitor.yaml b/templates/kubevirt/service-monitor.yaml
index 285edfd585..25172bc9b6 100644
--- a/templates/kubevirt/service-monitor.yaml
+++ b/templates/kubevirt/service-monitor.yaml
@@ -98,32 +98,32 @@ spec:
         # hypervisor metrics ------------------------------------------------------------------------------
         - action: replace
           regex: kubevirt_vmi_cpu_system_usage_seconds_total
-          replacement: d8_virtualization_virtualmachine_hypervisor_cpu_system_usage_milliseconds_total
+          replacement: d8_virtualization_virtualmachine_hypervisor_cpu_system_usage_seconds_total
           sourceLabels:
             - __name__
           targetLabel: __name__
         - action: replace
           regex: kubevirt_vmi_cpu_user_usage_seconds_total
-          replacement: d8_virtualization_virtualmachine_hypervisor_cpu_user_usage_milliseconds_total
+          replacement: d8_virtualization_virtualmachine_hypervisor_cpu_user_usage_seconds_total
           sourceLabels:
             - __name__
           targetLabel: __name__
         - action: replace
           regex: kubevirt_vmi_cpu_usage_seconds_total
-          replacement: d8_virtualization_virtualmachine_hypervisor_cpu_usage_milliseconds_total
+          replacement: d8_virtualization_virtualmachine_hypervisor_cpu_usage_seconds_total
           sourceLabels:
             - __name__
           targetLabel: __name__
         # OS metrics -----------------------------------------------------------------------------
         - action: replace
           regex: kubevirt_vmi_vcpu_delay_seconds_total
-          replacement: d8_virtualization_virtualmachine_cpu_steal_milliseconds_total
+          replacement: d8_virtualization_virtualmachine_cpu_steal_seconds_total
           sourceLabels:
             - __name__
           targetLabel: __name__
         - action: replace
           regex: kubevirt_vmi_vcpu_seconds_total
-          replacement: d8_virtualization_virtualmachine_cpu_usage_milliseconds_total
+          replacement: d8_virtualization_virtualmachine_cpu_usage_seconds_total
           sourceLabels:
             - __name__
           targetLabel: __name__