diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index fb98ef0d4df71..7f4f27eeb8c47 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -125,7 +125,7 @@
     </module>
     <module name="ClassDataAbstractionCoupling">
       <!-- default is 7 -->
-      <property name="max" value="25"/>
+      <property name="max" value="28"/>
       <property name="excludeClassesRegexps" value="AtomicInteger"/>
     </module>
     <module name="BooleanExpressionComplexity">
@@ -135,7 +135,7 @@
 
     <module name="ClassFanOutComplexity">
       <!-- default is 20 -->
-      <property name="max" value="52"/>
+      <property name="max" value="55"/>
     </module>
     <module name="CyclomaticComplexity">
       <!-- default is 10-->
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index 1bf8431f11a79..52fcfeaa81c83 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -373,4 +373,8 @@
 
      <!-- Add the new suppression rule for JaasTestUtils.java -->
     <suppress checks="ImportControl" files="(JaasTestUtils).java" />
+
+    <suppress checks="FinalLocalVariable" files="."/>
+    <suppress checks="FinalParameters" files="."/>
+
 </suppressions>
diff --git a/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java
index 3724c4ccc0920..8d9f4d8f39cf1 100644
--- a/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java
+++ b/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java
@@ -96,7 +96,7 @@ public Builder(final TxnOffsetCommitRequestData data) {
         public TxnOffsetCommitRequest build(short version) {
             if (version < 3 && groupMetadataSet()) {
                 throw new UnsupportedVersionException("Broker doesn't support group metadata commit API on version " + version
-                + ", minimum supported request version is 3 which requires brokers to be on version 2.5 or above.");
+                    + ", minimum supported request version is 3 which requires brokers to be on version 2.5 or above.");
             }
             if (!isTransactionV2Enabled) {
                 version = (short) Math.min(version, LAST_STABLE_VERSION_BEFORE_TRANSACTION_V2);
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index b74cd29683c9e..6664cc775c3a8 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -56,7 +56,7 @@ versions += [
   bcpkix: "1.80",
   caffeine: "3.2.0",
   bndlib: "7.1.0",
-  checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "10.20.2",
+  checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "12.1.2",
   commonsLang: "3.18.0",
   commonsValidator: "1.10.0",
   classgraph: "4.8.179",
diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
index 2817eba179872..2ab4fdb853f07 100644
--- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
+++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
@@ -2463,11 +2463,11 @@ private OffsetFetchResponseData.OffsetFetchResponseGroup handleOffsetFetchExcept
                     // NOT_ENOUGH_REPLICAS and REQUEST_TIMED_OUT to COORDINATOR_NOT_AVAILABLE,
                     // COORDINATOR_NOT_AVAILABLE is also not handled by consumers on versions prior to
                     // 3.9.
-                    OffsetFetchResponse.groupError(
+                OffsetFetchResponse.groupError(
                             request,
                             Errors.NOT_COORDINATOR,
                             context.requestVersion()
-                    );
+                );
             default -> handleOperationException(
                     operationName,
                     request,
diff --git a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java
index 050313d156f74..4f9436637f072 100644
--- a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java
+++ b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java
@@ -100,11 +100,11 @@ DelegationTokenControlManager build() {
             if (logContext == null) logContext = new LogContext();
             if (tokenCache == null) tokenCache = new DelegationTokenCache(Set.of());
             return new DelegationTokenControlManager(
-              logContext,
-              tokenCache,
-              tokenSecretKeyString,
-              tokenDefaultMaxLifetimeMs,
-              tokenDefaultRenewLifetimeMs);
+                logContext,
+                tokenCache,
+                tokenSecretKeyString,
+                tokenDefaultMaxLifetimeMs,
+                tokenDefaultRenewLifetimeMs);
         }
     }