diff --git a/build-logic/src/main/kotlin/JapiCmp.kt b/build-logic/src/main/kotlin/JapiCmp.kt
index 79e9eb5ae66..8841e849e6f 100644
--- a/build-logic/src/main/kotlin/JapiCmp.kt
+++ b/build-logic/src/main/kotlin/JapiCmp.kt
@@ -1,3 +1,4 @@
+
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.gradle.api.DefaultTask
@@ -43,7 +44,8 @@ object JapiCmp {
       }
 
       this.artifact = artifact
-      output.set(File(buildDir, "japicmp/cache/$artifact"))
+
+      output.set(File(layout.buildDirectory.asFile.get(), "japicmp/cache/$artifact"))
     }
 
     // TODO: Make this lazy
@@ -62,8 +64,8 @@ object JapiCmp {
           packageExcludes = listOf("*.internal*")
           onlyModified = true
           failOnSourceIncompatibility = false
-          htmlOutputFile = file("$buildDir/reports/japicmp.html")
-          txtOutputFile = file("$buildDir/reports/japicmp.txt")
+          htmlOutputFile = file("${layout.buildDirectory.asFile.get()}/reports/japicmp.html")
+          txtOutputFile = file("${layout.buildDirectory.asFile.get()}/reports/japicmp.txt")
         }
         tasks.register("checkJapicmp", me.champeau.gradle.japicmp.JapicmpTask::class.java) {
           dependsOn(downloadBaselineJarTaskProvider)
@@ -73,8 +75,8 @@ object JapiCmp {
           packageExcludes = listOf("*.internal*")
           onlyModified = true
           failOnSourceIncompatibility = true
-          htmlOutputFile = file("$buildDir/reports/japicmp.html")
-          txtOutputFile = file("$buildDir/reports/japicmp.txt")
+          htmlOutputFile = file("${layout.buildDirectory.asFile.get()}/reports/japicmp.html")
+          txtOutputFile = file("${layout.buildDirectory.asFile.get()}/reports/japicmp.txt")
         }
       }
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index b3697e181f9..dfb3633d5f8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
 import JapiCmp.configureJapiCmp
-import java.util.Locale
 
 plugins {
   id("apollo.library") apply false
@@ -102,7 +101,7 @@ tasks.register("ciBuild") {
 rootProject.configureDokka()
 tasks.named("dokkaHtmlMultiModule").configure {
   this as org.jetbrains.dokka.gradle.DokkaMultiModuleTask
-  outputDirectory.set(buildDir.resolve("dokkaHtml/kdoc"))
+  outputDirectory.set(layout.buildDirectory.asFile.get().resolve("dokkaHtml/kdoc"))
 }
 
 tasks.named("dependencyUpdates").configure {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 033e24c4cdf..7f93135c49b 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f4197d5f4b..0fb28372970 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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index fcb6fca147c..0adc8e1a532 100755
--- a/gradlew
+++ b/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/intellij-plugin/build.gradle.kts b/intellij-plugin/build.gradle.kts
index e247925716e..1d210f5df85 100644
--- a/intellij-plugin/build.gradle.kts
+++ b/intellij-plugin/build.gradle.kts
@@ -137,7 +137,7 @@ tasks {
   }
 }
 
-val mockJdkRoot = buildDir.resolve("mockJDK")
+val mockJdkRoot = layout.buildDirectory.asFile.get().resolve("mockJDK")
 
 // Setup fake JDK for maven dependencies to work
 // See https://jetbrains-platform.slack.com/archives/CPL5291JP/p1664105522154139 and https://youtrack.jetbrains.com/issue/IJSDK-321
diff --git a/libraries/apollo-gradle-plugin/build.gradle.kts b/libraries/apollo-gradle-plugin/build.gradle.kts
index a185f179a27..7771d080370 100644
--- a/libraries/apollo-gradle-plugin/build.gradle.kts
+++ b/libraries/apollo-gradle-plugin/build.gradle.kts
@@ -117,7 +117,7 @@ tasks.register("cleanStaleTestProjects") {
   /**
    * Remove stale testProject directories
    */
-  val buildFiles = buildDir.listFiles()
+  val buildFiles = layout.buildDirectory.asFile.get().listFiles()
   doFirst {
     buildFiles?.forEach {
       if (it.isDirectory && it.name.startsWith("testProject")) {