diff --git a/build.gradle b/build.gradle
index 3837c1a593..8c6ceda2c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -317,7 +317,7 @@ configure(javaProjects) { subproject ->
 	}
 
 	checkstyle {
-		configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
+		configDirectory.set(rootProject.file("src/checkstyle"))
 		toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '8.32'
 	}
 
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index b953a4bb45..f98f6f3c35 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -5,12 +5,12 @@
 <module name="Checker">
 
 	<module name="SuppressionFilter">
-		<property name="file" value="src/checkstyle/checkstyle-suppressions.xml"/>
+		<property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
 	</module>
 
 	<!-- Root Checks -->
 	<module name="RegexpHeader">
-		<property name="headerFile" value="src/checkstyle/checkstyle-header.txt"/>
+		<property name="headerFile" value="${config_loc}/checkstyle-header.txt"/>
 		<property name="fileExtensions" value="java"/>
 	</module>