diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..323872ee
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+root=true
+
+[*.java]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.groovy]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.xml]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
\ No newline at end of file
diff --git a/.springformat b/.springformat
new file mode 100644
index 00000000..e69de29b
diff --git a/pom.xml b/pom.xml
index 734e5b69..f68cea48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 		<!-- Plugins -->
 		<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-		<checkstyle.version>3.0.0</checkstyle.version>
+		<checkstyle.version>8.12</checkstyle.version>
 		<puppycrawl-tools-checkstyle.version>8.12</puppycrawl-tools-checkstyle.version>
 		<spring-javaformat.version>0.0.6</spring-javaformat.version>
 		<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
@@ -58,6 +58,8 @@
 		<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
 		<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
 		<license-maven-plugin.version>1.16</license-maven-plugin.version>
+		<spring-javaformat-checkstyle.version>0.0.6</spring-javaformat-checkstyle.version>
+		<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -297,24 +299,32 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-checkstyle-plugin</artifactId>
-					<version>${checkstyle.version}</version>
+					<version>${maven-checkstyle-plugin.version}</version>
 					<dependencies>
 						<dependency>
-							<groupId>org.springframework.cloud</groupId>
-							<artifactId>spring-cloud-build-tools</artifactId>
-							<version>${spring-cloud-build.version}</version>
+							<groupId>com.puppycrawl.tools</groupId>
+							<artifactId>checkstyle</artifactId>
+							<version>${checkstyle.version}</version>
+						</dependency>
+						<dependency>
+							<groupId>io.spring.javaformat</groupId>
+							<artifactId>spring-javaformat-checkstyle</artifactId>
+							<version>${spring-javaformat-checkstyle.version}</version>
 						</dependency>
 					</dependencies>
-					<configuration>
-						<configLocation>checkstyle.xml</configLocation>
-						<headerLocation>LICENSE.txt</headerLocation>
-						<consoleOutput>true</consoleOutput>
-						<failsOnError>true</failsOnError>
-					</configuration>
 					<executions>
 						<execution>
-							<id>validate</id>
+							<id>checkstyle-validation</id>
 							<phase>validate</phase>
+							<inherited>true</inherited>
+							<configuration>
+								<configLocation>io/spring/javaformat/checkstyle/checkstyle.xml</configLocation>
+								<consoleOutput>true</consoleOutput>
+								<!-- TODO: Start fixing the errors -->
+								<includeTestSourceDirectory>true</includeTestSourceDirectory>
+								<failsOnError>false</failsOnError>
+								<failOnViolation>false</failOnViolation>
+							</configuration>
 							<goals>
 								<goal>check</goal>
 							</goals>