diff --git a/build.gradle b/build.gradle
index 1f62fd3c..5f083c16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,8 +60,8 @@ apply plugin: 'opensearch.rest-test'
 
 
 checkstyle {
-    toolVersion = '8.29'
-    configFile file("checkstyle/checkstyle.xml")
+    toolVersion "10.3.3"
+    configDirectory.set(rootProject.file("checkstyle/"))
 }
 
 def usingRemoteCluster = System.properties.containsKey('tests.rest.cluster') || System.properties.containsKey('tests.cluster')
@@ -99,7 +99,8 @@ dependencies {
     compile "org.opensearch:common-utils:${common_utils_version}"
     configurations.all {
         resolutionStrategy {
-            force "com.puppycrawl.tools:checkstyle:${project.checkstyle.toolVersion}"
+            force "com.google.guava:guava:32.0.1-jre"
+            force "com.puppycrawl.tools:checkstyle:10.12.1"
         }
     }
 }