diff --git a/build.gradle b/build.gradle
index 07b31d0a53..edb76497f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -372,11 +372,9 @@ checkstyle {
 }
 
 tasks.withType(Checkstyle) {
+    showViolations true
     reports {
-        showViolations false
-        ignoreFailures = true
-        xml.required = true
-        html.required = true
+        ignoreFailures = false
     }
 }
 
diff --git a/config/checkstyle/sun_checks.xml b/config/checkstyle/sun_checks.xml
index a5ef00d580..be1008ff85 100644
--- a/config/checkstyle/sun_checks.xml
+++ b/config/checkstyle/sun_checks.xml
@@ -27,7 +27,7 @@
       https://checkstyle.org/config.html#Checker
       <property name="basedir" value="${basedir}"/>
   -->
-  <property name="severity" value="error"/>
+  <property name="severity" value="ignore"/>
 
   <property name="fileExtensions" value="java, properties, xml"/>
 
@@ -183,4 +183,18 @@
 
   </module>
 
+  <module name="RegexpSingleline">
+    <property name="format" value="whitelist"/>
+    <property name="ignoreCase" value="true"/>
+    <property name="message" value="Usage should be switched to an allow* based pattern" />
+    <property name="severity" value="warning"/>
+  </module>
+
+  <module name="RegexpSingleline">
+    <property name="format" value="master"/>
+    <property name="ignoreCase" value="true"/>
+    <property name="message" value="Usage should be switched to cluster manager" />
+    <property name="severity" value="warning"/>
+  </module>
+
 </module>