diff --git a/build.gradle b/build.gradle
index 4f6562941c..e9c24b9a28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,7 @@ apply plugin: 'opensearch.rest-test'
 
 
 checkstyle {
-    toolVersion = '8.24'
+    toolVersion = '9.3'
     configFile file("checkstyle/checkstyle.xml")
 }
 
@@ -124,7 +124,7 @@ dependencies {
     compile "org.opensearch:opensearch:${opensearch_version}"
     compileOnly "org.opensearch.plugin:opensearch-scripting-painless-spi:${versions.opensearch}"
     compile group: 'com.google.guava', name: 'failureaccess', version:'1.0.1'
-    compile group: 'com.google.guava', name: 'guava', version:'29.0-jre'
+    compile group: 'com.google.guava', name: 'guava', version:'30.0-jre'
     compile group: 'commons-lang', name: 'commons-lang', version: '2.6'
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
     configurations.all {
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 6ba252f8d0..7772d74beb 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -239,13 +239,9 @@
                       value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
         <module name="JavadocMethod">
-            <property name="scope" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>