diff --git a/checkstyle-style.xml b/checkstyle-style.xml
index dcd92c51fd..50c5d205b6 100644
--- a/checkstyle-style.xml
+++ b/checkstyle-style.xml
@@ -8,13 +8,31 @@
 
     <property name="severity" value="warning" />
 
+
+    <module name="SuppressWithPlainTextCommentFilter">
+        <property name="offCommentFormat" value="    // CHECKSTYLE:OFF"/>
+        <property name="onCommentFormat" value="    // CHECKSTYLE:ON"/>
+    </module>
+
+    <module name="LineLength">
+        <property name="severity" value="error" />
+        <property name="ignorePattern" value="^import.*$" />
+        <property name="max" value="120" />
+        <property name="tabWidth" value="4" />
+        <property name="fileExtensions" value="java" />
+        <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity"
+                  value="inherit" />
+        <metadata name="net.sf.eclipsecs.core.comment"
+                  value="Line length of 120 characters except for import lines." />
+    </module>
+
     <module name="TreeWalker">
         <module name="RedundantModifier">
             <property name="severity" value="error" />
         </module>
 
 	<!-- Make the @SuppressWarnings annotations available to Checkstyle -->
-	<module name="SuppressWarningsHolder" />
+	    <module name="SuppressWarningsHolder" />
 
         <module name="ConstantName">
             <property name="severity" value="error" />
@@ -178,13 +196,8 @@
         <module name="JavadocMethod">
             <property name="severity" value="error" />
             <property name="scope" value="private" />
-            <property name="allowUndeclaredRTE" value="true" />
-            <property name="allowThrowsTagsForSubclasses" value="true" />
             <property name="allowMissingParamTags" value="false" />
-            <property name="allowMissingThrowsTags" value="false" />
-            <property name="allowMissingJavadoc" value="false" />
-            <property name="allowMissingPropertyJavadoc" value="true" />
-            <property name="validateThrows" value="true" />
+            <property name="validateThrows" value="false" />
             <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit" />
             <metadata name="net.sf.eclipsecs.core.comment" value="Checks the Javadoc of a method or constructor." />
         </module>
@@ -196,17 +209,6 @@
             <metadata name="net.sf.eclipsecs.core.comment" value="Checks that variables have Javadoc comments." />
         </module>
 
-        <module name="LineLength">
-            <property name="severity" value="error" />
-            <property name="ignorePattern" value="^import.*$" />
-            <property name="max" value="120" />
-            <property name="tabWidth" value="4" />
-            <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity"
-                value="inherit" />
-            <metadata name="net.sf.eclipsecs.core.comment"
-                value="Line length of 120 characters except for import lines." />
-        </module>
-
         <module name="EqualsHashCode">
             <property name="severity" value="error" />
             <metadata name="net.sf.eclipsecs.core.comment"
diff --git a/fili-core/src/test/java/com/yahoo/bard/webservice/data/config/dimension/TestLookupDimensionConfig.java b/fili-core/src/test/java/com/yahoo/bard/webservice/data/config/dimension/TestLookupDimensionConfig.java
index e1ea477b97..ee549ab3fa 100644
--- a/fili-core/src/test/java/com/yahoo/bard/webservice/data/config/dimension/TestLookupDimensionConfig.java
+++ b/fili-core/src/test/java/com/yahoo/bard/webservice/data/config/dimension/TestLookupDimensionConfig.java
@@ -66,7 +66,7 @@ public List<String> getNamespaces() {
         return this.namespaces;
     }
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     @Override
     public TestLookupDimensionConfig withApiName(TestApiDimensionName apiName) {
         return new TestLookupDimensionConfig(apiName, getPhysicalName(), getKeyValueStore(), getSearchProvider(), getFields(), getDefaultDimensionFields(), namespaces);
@@ -100,5 +100,5 @@ public TestLookupDimensionConfig withDefaultFields(LinkedHashSet<DimensionField>
     public TestLookupDimensionConfig withNamespaces(List<String> namespaces) {
         return new TestLookupDimensionConfig(getApiNameEnum(), getPhysicalName(), getKeyValueStore(), getSearchProvider(), getFields(), getDefaultDimensionFields(), namespaces);
     }
-    //CHECKSTYLE:ON
+    // CHECKSTYLE:ON
 }
diff --git a/fili-system-config/src/main/java/com/yahoo/bard/webservice/config/ConfigMessageFormat.java b/fili-system-config/src/main/java/com/yahoo/bard/webservice/config/ConfigMessageFormat.java
index fc5169cc2c..24a3d040ce 100644
--- a/fili-system-config/src/main/java/com/yahoo/bard/webservice/config/ConfigMessageFormat.java
+++ b/fili-system-config/src/main/java/com/yahoo/bard/webservice/config/ConfigMessageFormat.java
@@ -9,7 +9,7 @@
  */
 public enum ConfigMessageFormat implements MessageFormatter {
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     MODULE_IO_EXCEPTION (
             "IoException while loading modules: %s"
     ),
diff --git a/pom.xml b/pom.xml
index 0d3e62171d..f030c9d8d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
         <checkstyle.skip>false</checkstyle.skip>
         <checkstyle.config.location>checkstyle-style.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>checkstyle-suppressions.xml</checkstyle.suppressions.location>
-        <checkstyle.version>8.18</checkstyle.version>
+        <checkstyle.version>8.29</checkstyle.version>
         <checkstyle.resourceIncludes>**/*.properties*</checkstyle.resourceIncludes>
 
         <dependency.locations.enabled>false</dependency.locations.enabled>
@@ -147,7 +147,7 @@
         <maven-source-plugin-version>3.0.1</maven-source-plugin-version>
         <maven-surefire-plugin-version>3.0.0-M3</maven-surefire-plugin-version>
         <maven-site-plugin-version>3.7.1</maven-site-plugin-version>
-        <maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
+        <maven-checkstyle-plugin-version>3.1.0</maven-checkstyle-plugin-version>
         <maven-project-info-reports-plugin-version>3.0.0</maven-project-info-reports-plugin-version>
         <maven-surefire-report-plugin-version>${maven-surefire-plugin-version}</maven-surefire-report-plugin-version>