diff --git a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
index ddfcc5c12..bbf94fd4e 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/internal/AllureThreadContext.java
@@ -79,7 +79,7 @@ public void clear() {
     /**
      * Thread local context that stores information about not finished tests and steps.
      */
-    private static class Context extends InheritableThreadLocal<LinkedList<String>> {
+    private static final class Context extends InheritableThreadLocal<LinkedList<String>> {
 
         @Override
         public LinkedList<String> initialValue() {
diff --git a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
index 3d314b172..3498deb2b 100644
--- a/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
+++ b/allure-jooq/src/main/java/io/qameta/allure/jooq/AllureJooq.java
@@ -34,6 +34,7 @@
 /**
  * @author charlie (Dmitry Baev).
  */
+@SuppressWarnings("PMD.NonSerializableClass")
 public class AllureJooq implements ExecuteListener {
 
     private static final String STEP_UUID
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
index e7303595d..e48ee7713 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatform.java
@@ -730,7 +730,7 @@ private String getOrCreateTest(final TestIdentifier testIdentifier) {
         return tests.get().getOrCreate(testIdentifier);
     }
 
-    private static class Uuids {
+    private static final class Uuids {
 
         private final Map<TestIdentifier, String> storage = new ConcurrentHashMap<>();
         private final ReadWriteLock lock = new ReentrantReadWriteLock();
diff --git a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
index c90a393ab..4db9dc0fe 100644
--- a/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
+++ b/allure-spock2/src/main/java/io/qameta/allure/spock2/compiler/AllureStatementsLabelsToStepsTransformation.java
@@ -59,7 +59,7 @@ public void visit(final ASTNode[] nodes, final SourceUnit sourceUnit) {
     /**
      * Use of nested class defers linking until after groovy version check.
      */
-    private static class Impl {
+    private static final class Impl {
         private static final AstNodeCache NODE_CACHE = new AstNodeCache();
 
         private void visit(final SourceUnit sourceUnit) {
@@ -100,7 +100,7 @@ private void processSpec(final SourceUnit sourceUnit,
     /**
      * Adds Allure steps for statements with labels.
      */
-    private static class MethodVisitor implements GroovyClassVisitor {
+    private static final class MethodVisitor implements GroovyClassVisitor {
 
         private static final ClassNode ALLURE = ClassHelper.makeWithoutCaching(Allure.class);
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 913e6410f..82d806791 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -152,13 +152,13 @@ configure(libs) {
             dependency("com.github.tomakehurst:wiremock:2.27.2")
             dependency("com.google.inject:guice:5.1.0")
             dependency("com.google.testing.compile:compile-testing:0.19")
-            dependency("com.puppycrawl.tools:checkstyle:9.3")
+            dependency("com.puppycrawl.tools:checkstyle:10.13.0")
             dependency("com.squareup.retrofit2:retrofit:2.9.0")
             dependency("commons-io:commons-io:2.11.0")
             dependency("io.github.benas:random-beans:3.9.0")
             dependency("io.github.glytching:junit-extensions:2.6.0")
             dependency("javax.annotation:javax.annotation-api:1.3.2")
-            dependency("net.sourceforge.pmd:pmd-java:6.46.0")
+            dependency("net.sourceforge.pmd:pmd-java:6.55.0")
             dependency("org.apache.commons:commons-lang3:3.12.0")
             dependency("org.apache.httpcomponents:httpclient:4.5.13")
             dependency("org.apache.httpcomponents.client5:httpclient5:5.2.1")
diff --git a/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
index 3d45d9f69..7a26c293e 100644
--- a/gradle/quality-configs/pmd/pmd.xml
+++ b/gradle/quality-configs/pmd/pmd.xml
@@ -111,7 +111,7 @@
     <rule ref="category/java/errorprone.xml">
         <exclude name="AvoidAccessibilityAlteration"/> <!-- earlier j2ee group-->
         <exclude name="AvoidCatchingThrowable"/>
-        <exclude name="BeanMembersShouldSerialize"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
         <exclude name="DataflowAnomalyAnalysis"/>
         <exclude name="EmptyFinalizer"/>
         <exclude name="FinalizeDoesNotCallSuperFinalize"/>
@@ -123,6 +123,7 @@
         <exclude name="NullAssignment"/> <!-- disabled due to false positive for initialization with ternary operator -->
         <exclude name="OverrideBothEqualsAndHashcode"/> <!-- duplicated by EqualsHashCode rule in Checkstyle -->
         <exclude name="StaticEJBFieldShouldBeFinal"/> <!-- earlier j2ee group-->
+        <exclude name="TestClassWithoutTestCases"/>
         <exclude name="UseCorrectExceptionLogging"/>
         <exclude name="UseLocaleWithCaseConversions"/>
         <exclude name="UseProperClassLoader"/> <!-- earlier j2ee group-->
@@ -134,7 +135,7 @@
     </rule>
     <rule ref="category/java/errorprone.xml/CloseResource">
         <properties>
-            <property name="types" value="java.sql.Connection,java.sql.Statement,java.sql.ResultSet" />
+            <property name="types" value="java.sql.Connection,java.sql.Statement,java.sql.ResultSet"/>
         </properties>
     </rule>