diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 612f18ed5c..37684aab4a 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -34,7 +34,7 @@
       <property name="tokens" value="INTERFACE_DEF, CLASS_DEF, ENUM_DEF, ANNOTATION_DEF, RECORD_DEF"/>
     </module>
     <module name="NonEmptyAtclauseDescription">
-      <property name="javadocTokens" value="PARAM_LITERAL, RETURN_LITERAL, THROWS_LITERAL, EXCEPTION_LITERAL, DEPRECATED_LITERAL"/>
+      <property name="javadocTokens" value="PARAM_BLOCK_TAG, RETURN_BLOCK_TAG, THROWS_BLOCK_TAG, EXCEPTION_BLOCK_TAG, DEPRECATED_BLOCK_TAG"/>
     </module>
     <module name="SingleLineJavadoc"/>
     <module name="AvoidStarImport"/>
diff --git a/pom.xml b/pom.xml
index 60ea9679fc..5b3a2c9a5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
         <spotless.version>3.0.0</spotless.version>
         <slf4j.version>2.0.17</slf4j.version>
         <junit.version>6.0.0</junit.version>
-        <checkstyle.version>11.1.0</checkstyle.version>
+        <checkstyle.version>12.0.1</checkstyle.version>
         <antlr2.version>2.7.7</antlr2.version>
         <antlr4.version>4.13.2</antlr4.version>
         <auto-service.version>1.1.1</auto-service.version>