diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index c4487d2f1..fc4662148 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -19,12 +19,6 @@
 
     <dependencies>
 
-        <!--<dependency>-->
-        <!--<groupId>com.github.oshi</groupId>-->
-        <!--<artifactId>oshi-core</artifactId>-->
-        <!--<version>3.5.0</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index b11ffcc61..3e70a3486 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -251,8 +251,8 @@
 
             <dependency>
                 <groupId>com.github.oshi</groupId>
-                <artifactId>oshi-core</artifactId>
-                <version>5.2.2</version>
+                <artifactId>oshi-core-java11</artifactId>
+                <version>6.1.5</version>
             </dependency>
 
             <dependency>
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 4935ebbfc..4ace0beea 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>com.github.oshi</groupId>
-            <artifactId>oshi-core</artifactId>
+            <artifactId>oshi-core-java11</artifactId>
         </dependency>
 
         <dependency>