diff --git a/agent/agent-for-testing/build.gradle.kts b/agent/agent-for-testing/build.gradle.kts
index 61c4c854db7..895258bff58 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.dir("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..e8378f728cb 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.dir("isolated/javaagentLibs"))
   }
 
   // 3. the relocated and isolated javaagent libs are merged together with the bootstrap libs (which undergo relocation
diff --git a/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts b/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts
index 8bb48923f1c..759c89c5f65 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") {
+  register<Test>("smokeTest") {
     useJUnitPlatform()
 
     // this is just to force building the agent first
diff --git a/etw/java/build.gradle b/etw/java/build.gradle
index 54d7c070931..3661c02deca 100644
--- a/etw/java/build.gradle
+++ b/etw/java/build.gradle
@@ -22,7 +22,9 @@ 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 d62f42a61e5..2fad04f40d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,10 +12,5 @@ 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
-
 # Workaround https://youtrack.jetbrains.com/issue/KT-34862
 kotlin.incremental=false