diff --git a/dashboard/src/components/CpuUsage.vue b/dashboard/src/components/CpuUsage.vue
index 845ac1037..25b375e1d 100644
--- a/dashboard/src/components/CpuUsage.vue
+++ b/dashboard/src/components/CpuUsage.vue
@@ -16,7 +16,7 @@ async function refresh() {
   if (error) return console.error(error);
 
   const labels = result.cpu.map(v => {
-    return moment(v[1]*1000).format('hh:mm:ss');
+    return moment(v[1]*1000).format('hh:mm');
   });
 
   const data = result.cpu.map(v => {
diff --git a/dashboard/src/components/MemoryUsage.vue b/dashboard/src/components/MemoryUsage.vue
index f5262ff94..80ca16221 100644
--- a/dashboard/src/components/MemoryUsage.vue
+++ b/dashboard/src/components/MemoryUsage.vue
@@ -17,7 +17,7 @@ async function refresh() {
   if (error) return console.error(error);
 
   const labels = result.memory.map(v => {
-    return moment(v[1]*1000).format('hh:mm:ss');
+    return moment(v[1]*1000).format('hh:mm');
   });
 
   const data = result.memory.map(v => {
@@ -48,13 +48,15 @@ async function refresh() {
         ticks: { autoSkipPadding: 50, maxRotation: 0 }
       },
       y: {
-        ticks: { maxTicksLimit: 6 },
+        ticks: {
+          callback: (value) => {
+            return `${value} GiB`;
+          },
+          maxTicksLimit: 6
+        },
         min: 0,
         max: roundedMemoryGiB,
         beginAtZero: true,
-        callback: (value) => {
-          return (value/1024).toLocaleString('en-US', { maximumFractionDigits: 6 }) + ' GiB';
-        }
       }
     },
     interaction: {
diff --git a/src/collectd.js b/src/collectd.js
index 6cc45ebb4..b70da859c 100755
--- a/src/collectd.js
+++ b/src/collectd.js
@@ -105,10 +105,12 @@ async function getMemoryMetrics() {
 async function getCpuMetrics() {
     const cpus = os.cpus();
     const userMillis = cpus.map(c => c.times.user).reduce((p, c) => p+c);
-    const systemMillis = cpus.map(c => c.times.sys).reduce((p, c) => p+c);
+    const sysMillis = cpus.map(c => c.times.sys).reduce((p, c) => p+c);
 
+    // this value is time spent since system start
     return [
-        { path: `cloudron.system.cpu-used`, value: systemMillis + userMillis  },
+        { path: `cloudron.system.cpu-user`, value: userMillis  },
+        { path: `cloudron.system.cpu-sys`, value: sysMillis  },
     ];
 }