diff --git a/build.gradle b/build.gradle
index 94f5c76a..23ac3564 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,7 @@ allprojects {
 
     // checkstyle
     checkstyle {
-        configFile = "${project.rootDir}/config/checkstyle.xml" as File
-        toolVersion = '8.10'
+        toolVersion = '8.18'
     }
 
     group 'org.pgpainless'
diff --git a/config/checkstyle.xml b/config/checkstyle/checkstyle.xml
similarity index 97%
rename from config/checkstyle.xml
rename to config/checkstyle/checkstyle.xml
index 14e2cbc6..a951157b 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -6,12 +6,12 @@
 
     <!-- Suppressions -->
     <module name="SuppressionFilter">
-        <property name="file" value="config/suppressions.xml"/>
+        <property name="file" value="${config_loc}/suppressions.xml"/>
     </module>
 
     <!-- License Header -->
     <module name="Header">
-        <property name="headerFile" value="config/checkstyleLicenseHeader.txt"/>
+        <property name="headerFile" value="${config_loc}/checkstyleLicenseHeader.txt"/>
         <property name="ignoreLines" value="2"/>
         <property name="fileExtensions" value="java"/>
     </module>
@@ -117,7 +117,7 @@
         <module name="JavadocMethod">
             <!-- TODO stricten those checks -->
             <property name="scope" value="public"/>
-            <property name="allowUndeclaredRTE" value="true"/>
+            <!--<property name="allowUndeclaredRTE" value="true"/>-->
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingThrowsTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
diff --git a/config/checkstyleLicenseHeader.txt b/config/checkstyle/checkstyleLicenseHeader.txt
similarity index 100%
rename from config/checkstyleLicenseHeader.txt
rename to config/checkstyle/checkstyleLicenseHeader.txt
diff --git a/config/suppressions.xml b/config/checkstyle/suppressions.xml
similarity index 100%
rename from config/suppressions.xml
rename to config/checkstyle/suppressions.xml