diff --git a/common/util/pom.xml b/common/util/pom.xml
index 18b08621ec..79d2d6a064 100644
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -89,7 +89,7 @@
             <artifactId>data</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.dblock</groupId>
+            <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
         </dependency>
     </dependencies>
diff --git a/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java b/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java
index 23fb2a6257..cd68e99ac4 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java
@@ -59,7 +59,7 @@ public class SystemUtil {
 
     public static Optional<Integer> getCpuUsage() {
         try {
-            return Optional.of((int) (HARDWARE.getProcessor().getSystemCpuLoad() * 100.0));
+            return Optional.of((int) (HARDWARE.getProcessor().getSystemCpuLoad(1000) * 100.0));
         } catch (Exception e) {
             log.debug("Failed to get cpu usage!!!", e);
         }
diff --git a/pom.xml b/pom.xml
index f78a4826bc..4fa780b3d3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
         <allure-testng.version>2.21.0</allure-testng.version>
         <allure-maven.version>2.12.0</allure-maven.version>
         <slack-api.version>1.12.1</slack-api.version>
-        <oshi.version>3.4.0</oshi.version>
+        <oshi.version>6.4.2</oshi.version>
     </properties>
 
     <modules>
@@ -2003,7 +2003,7 @@
                 <version>${exp4j.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.github.dblock</groupId>
+                <groupId>com.github.oshi</groupId>
                 <artifactId>oshi-core</artifactId>
                 <version>${oshi.version}</version>
             </dependency>