diff --git a/agent/agent-for-testing/build.gradle.kts b/agent/agent-for-testing/build.gradle.kts
index 61c4c854db7..6526a3fafb8 100644
--- a/agent/agent-for-testing/build.gradle.kts
+++ b/agent/agent-for-testing/build.gradle.kts
@@ -50,7 +50,7 @@ tasks {
     dependsOn(relocateJavaagentLibs)
     isolateClasses(relocateJavaagentLibs.get().outputs.files)
 
-    into("$buildDir/isolated/javaagentLibs")
+    into("${layout.buildDirectory.get()}/isolated/javaagentLibs")
   }
 
   // 3. the relocated and isolated javaagent libs are merged together with the bootstrap libs (which undergo relocation
diff --git a/agent/agent/build.gradle.kts b/agent/agent/build.gradle.kts
index e2cfc41de1a..c550bbf5db4 100644
--- a/agent/agent/build.gradle.kts
+++ b/agent/agent/build.gradle.kts
@@ -95,7 +95,7 @@ tasks {
     dependsOn(relocateJavaagentLibs)
     isolateClasses(relocateJavaagentLibs.get().outputs.files)
 
-    into("$buildDir/isolated/javaagentLibs")
+    into("${layout.buildDirectory.get()}/isolated/javaagentLibs")
   }
 
   // 3. the relocated and isolated javaagent libs are merged together with the bootstrap libs (which undergo relocation
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index d82291cbf59..e30eb9136b9 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -45,5 +45,5 @@ dependencies {
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
 
   // earlier versions aren't compatible with Gradle 8.1.1
-  implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.12")
+  implementation("org.springframework.boot:spring-boot-gradle-plugin:2.7.18")
 }
diff --git a/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts b/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
index b92684469de..818cc79653f 100644
--- a/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
+++ b/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
@@ -62,7 +62,7 @@ tasks.withType<Test>().configureEach {
   // The sources are packaged into the testing jar so we need to make sure to exclude from the test
   // classpath, which automatically inherits them, to ensure our shaded versions are used.
   classpath = classpath.filter {
-    if (file("$buildDir/resources/main") == it || file("$buildDir/classes/java/main") == it) {
+    if (file("${layout.buildDirectory.get()}/resources/main") == it || file("${layout.buildDirectory.get()}/classes/java/main") == it) {
       return@filter false
     }
     return@filter true
diff --git a/buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts b/buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts
index 539bc5b8a3d..9c1009e36f4 100644
--- a/buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts
+++ b/buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts
@@ -2,7 +2,7 @@ plugins {
   `java-library`
 }
 
-val sdkVersionDir = "${buildDir}/generated/resources/sdk-version"
+val sdkVersionDir = "${layout.buildDirectory.get()}/generated/resources/sdk-version"
 
 abstract class GenerateVersionResourceTask : DefaultTask() {
   @get:Input
diff --git a/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts b/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts
index 8bb48923f1c..588571b2452 100644
--- a/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts
+++ b/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts
@@ -87,7 +87,7 @@ configurations.all {
 }
 
 tasks {
-  task<Test>("smokeTest") {
+  tasks.register<Test>("smokeTest") {
     useJUnitPlatform()
 
     // this is just to force building the agent first
diff --git a/buildSrc/src/main/kotlin/ai.spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/ai.spotless-conventions.gradle.kts
index b82f801c400..a617d48cc3c 100644
--- a/buildSrc/src/main/kotlin/ai.spotless-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/ai.spotless-conventions.gradle.kts
@@ -35,7 +35,7 @@ spotless {
       "docs/**/*.md",
       "*.sh",
       "src/**/*.properties")
-    indentWithSpaces()
+    leadingTabsToSpaces()
     trimTrailingWhitespace()
     endWithNewline()
   }
diff --git a/etw/java/build.gradle b/etw/java/build.gradle
index 54d7c070931..2662197eea0 100644
--- a/etw/java/build.gradle
+++ b/etw/java/build.gradle
@@ -22,7 +22,7 @@ sourceSets {
   }
 }
 
-archivesBaseName = "applicationinsights-java-etw-provider"
+base.archivesName = "applicationinsights-java-etw-provider"
 
 logger.info "project ${project.path} prop: ai.etw.native.build=${System.properties['ai.etw.native.build']}"
 
diff --git a/gradle.properties b/gradle.properties
index 7b1392f4105..5f1b65f3bcb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,9 +14,8 @@ org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
 # org.gradle.warning.mode=fail
 
 # To allow caching more tasks in buildSrc project
-# This property is not mentioned in Gradle documentation
-# See https://github.com/gradle/gradle/issues/15214 for background info
-systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true
+# The system property org.gradle.kotlin.dsl.precompiled.accessors.strict
+# is now deprecated and defaults to true, so no longer needed
 
 # Workaround https://youtrack.jetbrains.com/issue/KT-34862
 kotlin.incremental=false
diff --git a/smoke-tests/apps/gRPC/build.gradle.kts b/smoke-tests/apps/gRPC/build.gradle.kts
index 72a040219a7..ba70769ddc0 100644
--- a/smoke-tests/apps/gRPC/build.gradle.kts
+++ b/smoke-tests/apps/gRPC/build.gradle.kts
@@ -2,7 +2,7 @@ import com.google.protobuf.gradle.*
 
 plugins {
   id("ai.smoke-test-jar")
-  id("com.google.protobuf") version "0.8.19"
+  id("com.google.protobuf") version "0.9.4"
 }
 
 val grpcVersion = "1.26.0" // first version with support for arm64