diff --git a/build.gradle b/build.gradle
index 111f44a590..669294a7ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -137,7 +137,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = '6.4.1'
+        toolVersion = '8.25'
         sourceSets = [sourceSets.main]
         configFile = file("${rootDir}/checkstyle/checkstyle.xml")
         configProperties = [ "suppressionFile" : file("${rootDir}/checkstyle/suppressions.xml")]
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 449e5ab7d9..26695b1d2d 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -28,8 +28,8 @@
 	"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
 	"https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="Checker">
-	<module name="SuppressionCommentFilter"/>
 	<module name="TreeWalker">
+		<module name="SuppressionCommentFilter"/>
 		<module name="LeftCurly">
 			<property name="option" value="nl"/>
 		</module>
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java
index 9b56c36b6c..479feb7c2e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java
@@ -189,7 +189,8 @@ public class GauntletPlugin extends Plugin
 		if (client.getGameState() != GameState.STARTING && client.getGameState() != GameState.UNKNOWN)
 		{
 			completeStartup = false;
-			clientThread.invoke(() -> {
+			clientThread.invoke(() ->
+			{
 				timer.initStates();
 				completeStartup = true;
 			});
diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
index 1dc821434f..c593e7d9e5 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
@@ -331,7 +331,8 @@ public class SwingUtil
 		button.setOpaque(true);
 
 		// Selecting the button option requires us to determine which parent element is the JOptionPane
-		button.addActionListener(e -> {
+		button.addActionListener(e ->
+		{
 			JComponent component = (JComponent) e.getSource();
 			while (component != null)
 			{
@@ -401,7 +402,8 @@ public class SwingUtil
 		dialog.setIconImage(ImageUtil.getResourceStreamFromClass(SwingUtil.class, "/runeliteplus_transparent.png"));
 
 		// Listen for value changes and close dialog when necessary
-		pane.addPropertyChangeListener(e -> {
+		pane.addPropertyChangeListener(e ->
+		{
 			String prop = e.getPropertyName();
 
 			if (dialog.isVisible()