diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml
index c3e1de40..f3661933 100644
--- a/etc/checkstyle/checkstyle.xml
+++ b/etc/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-		"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-		"https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+		"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+		"https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="com.puppycrawl.tools.checkstyle.Checker">
 
 	<module name="SuppressionFilter">
diff --git a/functions/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/GraphicsUtils.java b/functions/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/GraphicsUtils.java
index 246b14a4..d1e7a64f 100644
--- a/functions/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/GraphicsUtils.java
+++ b/functions/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/GraphicsUtils.java
@@ -606,7 +606,7 @@ public final class GraphicsUtils {
 	 * BufferedImage.TYPE_3BYTE_BGR, BufferedImage.TYPE_3BYTE_BGR.
 	 * @param image image to be converted into buffer
 	 * @param imageType desired type
-	 * @return
+	 * @return BufferedImage
 	 */
 	public static BufferedImage toBufferedImageType(BufferedImage image, int imageType) {
 		if (image.getType() == imageType) {
diff --git a/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java b/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java
index f67936ad..9ef3b810 100644
--- a/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java
+++ b/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java
@@ -24,7 +24,6 @@ import java.util.UUID;
 import java.util.function.Function;
 
 import org.junit.jupiter.api.AfterEach;
-
 import reactor.core.publisher.Mono;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraContainerTest.java b/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraContainerTest.java
index 89342646..2a99ea7e 100644
--- a/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraContainerTest.java
+++ b/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraContainerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java b/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java
index 6ef60d1c..f913c6ad 100644
--- a/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java
+++ b/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java
@@ -91,7 +91,7 @@ public class ObjectDetectionOutputConverter implements Function<Map<String, Tens
 	/**
 	 * Loads object labels in the string_int_label_map.proto.
 	 * @param labelsResource location of the labels as a resource
-	 * @return
+	 * @return String[] of labels
 	 */
 	private static String[] loadLabels(Resource labelsResource) throws Exception {
 		try (InputStream is = labelsResource.getInputStream()) {
diff --git a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/TestMailServer.java b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/TestMailServer.java
index 57e5331c..44b1c257 100644
--- a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/TestMailServer.java
+++ b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/TestMailServer.java
@@ -54,6 +54,9 @@ import org.springframework.util.Base64Utils;
 @Deprecated
 public final class TestMailServer {
 
+	private TestMailServer() {
+	}
+
 	public static SmtpServer smtp(int port) {
 		try {
 			return new SmtpServer(port);
@@ -544,7 +547,5 @@ public final class TestMailServer {
 
 	}
 
-	private TestMailServer() {
-	}
 
 }
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index d0df4c9b..23161176 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -20,26 +20,19 @@
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-		<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+		<maven-checkstyle-plugin.version>3.2.0</maven-checkstyle-plugin.version>
 		<disable.checks>false</disable.checks>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failOnViolation>true</maven-checkstyle-plugin.failOnViolation>
 		<maven-checkstyle-plugin.includeTestSourceDirectory>true</maven-checkstyle-plugin.includeTestSourceDirectory>
-		<puppycrawl-tools-checkstyle.version>8.29</puppycrawl-tools-checkstyle.version>
-		<checkstyle.location>https://raw.githubusercontent.com/spring-cloud/stream-applications/master/etc/checkstyle
-		</checkstyle.location>
-		<checkstyle.suppressions.file>
-			${checkstyle.location}/checkstyle-suppressions.xml
-		</checkstyle.suppressions.file>
-		<checkstyle.nohttp.file>
-			${checkstyle.location}/nohttp-checkstyle.xml
-		</checkstyle.nohttp.file>
-		<checkstyle.additional.suppressions.file>
-			${checkstyle.location}/checkstyle-suppressions.xml
-		</checkstyle.additional.suppressions.file>
+		<puppycrawl-tools-checkstyle.version>10.3.4</puppycrawl-tools-checkstyle.version>
+		<checkstyle.location>${maven.multiModuleProjectDirectory}/etc/checkstyle</checkstyle.location>
+		<checkstyle.suppressions.file>${checkstyle.location}/checkstyle-suppressions.xml</checkstyle.suppressions.file>
+		<checkstyle.nohttp.file>${checkstyle.location}/nohttp-checkstyle.xml</checkstyle.nohttp.file>
+		<checkstyle.additional.suppressions.file>${checkstyle.location}/checkstyle-suppressions.xml</checkstyle.additional.suppressions.file>
 		<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
 		<disable.nohttp.checks>true</disable.nohttp.checks>
-		<spring-javaformat-checkstyle.version>0.0.29</spring-javaformat-checkstyle.version>
+		<spring-javaformat-checkstyle.version>0.0.35</spring-javaformat-checkstyle.version>
 		<spring-boot.version>3.0.0-SNAPSHOT</spring-boot.version>
 		<spring-kafka.version>3.0.0-SNAPSHOT</spring-kafka.version>
 		<spring-rabbit.version>3.0.0-SNAPSHOT</spring-rabbit.version>