diff --git a/build.gradle.kts b/build.gradle.kts
index 80dd63d4..388d0ecc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,10 +7,10 @@ plugins {
 
 // Register root tasks before evaluating subprojects.
 tasks.register<io.gitlab.arturbosch.detekt.report.ReportMergeTask>("detektReportMergeSarif") {
-	output.set(rootProject.buildDir.resolve("reports/detekt/merge.sarif"))
+	output.set(rootProject.layout.buildDirectory.file("reports/detekt/merge.sarif"))
 }
 tasks.register<io.gitlab.arturbosch.detekt.report.ReportMergeTask>("detektReportMergeXml") {
-	output.set(rootProject.buildDir.resolve("reports/detekt/merge.xml"))
+	output.set(rootProject.layout.buildDirectory.file("reports/detekt/merge.xml"))
 }
 
 // TODEL https://issuetracker.google.com/issues/222730176
@@ -21,7 +21,7 @@ subprojects.forEach { evaluationDependsOn(it.path) } // evaluationDependsOnSubpr
 apply(plugin = "android-reporting")
 
 tasks.register<Delete>("clean") {
-	delete(rootProject.buildDir)
+	delete(rootProject.layout.buildDirectory)
 }
 
 tasks.register("check") {
diff --git a/gradle/plugins/gradle/wrapper/gradle-wrapper.jar b/gradle/plugins/gradle/wrapper/gradle-wrapper.jar
index 033e24c4..7f93135c 100644
Binary files a/gradle/plugins/gradle/wrapper/gradle-wrapper.jar and b/gradle/plugins/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/plugins/gradle/wrapper/gradle-wrapper.properties b/gradle/plugins/gradle/wrapper/gradle-wrapper.properties
index c747538f..14ec34c8 100644
--- a/gradle/plugins/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/plugins/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/plugins/gradlew b/gradle/plugins/gradlew
index fcb6fca1..0adc8e1a 100755
--- a/gradle/plugins/gradlew
+++ b/gradle/plugins/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c747538f..14ec34c8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME