diff --git a/pom.xml b/pom.xml
index 6763ba47..8060cc3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -325,8 +325,8 @@ limitations under the License.
 							<phase>validate</phase>
 							<inherited>true</inherited>
 							<configuration>
-								<configLocation>checkstyle.xml</configLocation>
-								<headerLocation>LICENSE.txt</headerLocation>
+								<headerLocation>spring-cloud-build-tools/src/main/resources/checkstyle-header.txt</headerLocation>
+								<propertyExpansion>checkstyle.build.directory=${project.build.directory}</propertyExpansion>
 								<consoleOutput>true</consoleOutput>
 								<!-- TODO: Start fixing the errors -->
 								<includeTestSourceDirectory>false</includeTestSourceDirectory>
diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt b/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt
new file mode 100644
index 00000000..154aaa1a
--- /dev/null
+++ b/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt
@@ -0,0 +1,17 @@
+^\Q/*\E$
+^\Q * Copyright \E20\d\d\-20\d\d\Q the original author or authors.\E$
+^\Q *\E$
+^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
+^\Q * you may not use this file except in compliance with the License.\E$
+^\Q * You may obtain a copy of the License at\E$
+^\Q *\E$
+^\Q *      http://www.apache.org/licenses/LICENSE-2.0\E$
+^\Q *\E$
+^\Q * Unless required by applicable law or agreed to in writing, software\E$
+^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$
+^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$
+^\Q * See the License for the specific language governing permissions and\E$
+^\Q * limitations under the License.\E$
+^\Q */\E$
+^$
+^.*$
diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
index 40b79604..ebc2dfd7 100644
--- a/spring-cloud-build-tools/src/main/resources/checkstyle.xml
+++ b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
@@ -6,11 +6,10 @@
 
 	<!-- TAKEN FROM SPRING BOOT -->
 	<!-- Root Checks -->
-	<!--<module name="io.spring.javaformat.checkstyle.check.SpringHeaderCheck">
-		<property name="fileExtensions" value="java" />
-		<property name="headerType" value="${headerType}"/>
-		<property name="headerCopyrightPattern" value="${headerCopyrightPattern}"/>
-	</module>-->
+	<module name="com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck">
+		<property name="headerFile" value="${checkstyle.header.file}" />
+		<property name="fileExtensions" value="java,groovy" />
+	</module>
 	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
 		<property name="lineSeparator" value="lf"/>
 	</module>