diff --git a/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java b/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java
index 4ce9ece..1e5d59e 100644
--- a/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java
+++ b/src/main/java/org/apache/sling/clam/http/internal/ClamEventsServlet.java
@@ -70,7 +70,7 @@
     ocd = ClamEventsServletConfiguration.class
 )
 @SuppressWarnings("java:S1948")
-public class ClamEventsServlet extends HttpServlet implements JcrPropertyScanResultHandler {
+public final class ClamEventsServlet extends HttpServlet implements JcrPropertyScanResultHandler {
 
     private final List<Client> clients = Collections.synchronizedList(new ArrayList<>());
 
diff --git a/src/main/java/org/apache/sling/clam/http/internal/ClamJcrScanServlet.java b/src/main/java/org/apache/sling/clam/http/internal/ClamJcrScanServlet.java
index 63dc53b..b2c3e99 100644
--- a/src/main/java/org/apache/sling/clam/http/internal/ClamJcrScanServlet.java
+++ b/src/main/java/org/apache/sling/clam/http/internal/ClamJcrScanServlet.java
@@ -67,7 +67,7 @@
     ocd = ClamJcrScanServletConfiguration.class
 )
 @SuppressWarnings({"java:S1948", "java:S3077"})
-public class ClamJcrScanServlet extends SlingAllMethodsServlet {
+public final class ClamJcrScanServlet extends SlingAllMethodsServlet {
 
     @Reference(
         policy = ReferencePolicy.DYNAMIC,
diff --git a/src/main/java/org/apache/sling/clam/jcr/internal/DefaultNodeDescendingJcrPropertyDigger.java b/src/main/java/org/apache/sling/clam/jcr/internal/DefaultNodeDescendingJcrPropertyDigger.java
index 0719bf7..a2f1922 100644
--- a/src/main/java/org/apache/sling/clam/jcr/internal/DefaultNodeDescendingJcrPropertyDigger.java
+++ b/src/main/java/org/apache/sling/clam/jcr/internal/DefaultNodeDescendingJcrPropertyDigger.java
@@ -49,7 +49,7 @@
     }
 )
 @SuppressWarnings("java:S3077")
-public class DefaultNodeDescendingJcrPropertyDigger implements NodeDescendingJcrPropertyDigger {
+public final class DefaultNodeDescendingJcrPropertyDigger implements NodeDescendingJcrPropertyDigger {
 
     @Reference(
         policy = ReferencePolicy.DYNAMIC,
diff --git a/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java b/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
index 9a9c1ad..498d3be 100644
--- a/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
+++ b/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
@@ -55,7 +55,7 @@
     }
 )
 @SuppressWarnings("java:S3077")
-public class JcrPropertyScanJobConsumer implements JobConsumer {
+public final class JcrPropertyScanJobConsumer implements JobConsumer {
 
     @Reference(
         policy = ReferencePolicy.DYNAMIC,
diff --git a/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java b/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java
index ebb64cc..7c20c01 100644
--- a/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java
+++ b/src/main/java/org/apache/sling/clam/oak/internal/NodeObservingJcrPropertyDigger.java
@@ -66,7 +66,7 @@
     factory = true
 )
 @SuppressWarnings("java:S3077")
-public class NodeObservingJcrPropertyDigger extends NodeObserver {
+public final class NodeObservingJcrPropertyDigger extends NodeObserver {
 
     @Reference(
         policy = ReferencePolicy.DYNAMIC,
diff --git a/src/main/java/org/apache/sling/clam/result/internal/EventPublishingScanResultHandler.java b/src/main/java/org/apache/sling/clam/result/internal/EventPublishingScanResultHandler.java
index 5bfef06..c16d15e 100644
--- a/src/main/java/org/apache/sling/clam/result/internal/EventPublishingScanResultHandler.java
+++ b/src/main/java/org/apache/sling/clam/result/internal/EventPublishingScanResultHandler.java
@@ -51,7 +51,7 @@
     ocd = EventPublishingScanResultHandlerConfiguration.class
 )
 @SuppressWarnings("java:S3077")
-public class EventPublishingScanResultHandler implements JcrPropertyScanResultHandler {
+public final class EventPublishingScanResultHandler implements JcrPropertyScanResultHandler {
 
     @Reference(
         policy = ReferencePolicy.DYNAMIC,
diff --git a/src/main/java/org/apache/sling/clam/result/internal/MailSendingScanResultHandler.java b/src/main/java/org/apache/sling/clam/result/internal/MailSendingScanResultHandler.java
index a6590ba..486753e 100644
--- a/src/main/java/org/apache/sling/clam/result/internal/MailSendingScanResultHandler.java
+++ b/src/main/java/org/apache/sling/clam/result/internal/MailSendingScanResultHandler.java
@@ -65,7 +65,7 @@
     factory = true
 )
 @SuppressWarnings("java:S3077")
-public class MailSendingScanResultHandler implements JcrPropertyScanResultHandler {
+public final class MailSendingScanResultHandler implements JcrPropertyScanResultHandler {
 
     @Reference(
         policy = ReferencePolicy.DYNAMIC,
diff --git a/src/main/java/org/apache/sling/clam/result/internal/ResourcePersistingScanResultHandler.java b/src/main/java/org/apache/sling/clam/result/internal/ResourcePersistingScanResultHandler.java
index 04808f9..a3af1a1 100644
--- a/src/main/java/org/apache/sling/clam/result/internal/ResourcePersistingScanResultHandler.java
+++ b/src/main/java/org/apache/sling/clam/result/internal/ResourcePersistingScanResultHandler.java
@@ -68,7 +68,7 @@
     factory = true
 )
 @SuppressWarnings("java:S3077")
-public class ResourcePersistingScanResultHandler implements JcrPropertyScanResultHandler {
+public final class ResourcePersistingScanResultHandler implements JcrPropertyScanResultHandler {
 
     @Reference(
         policy = ReferencePolicy.DYNAMIC,