diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt
index 2f69abd5fc9..deba44a3a08 100644
--- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt
+++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt
@@ -18,8 +18,10 @@ class CallSiteInstrumentationPluginTest {
       id 'dd-trace-java.call-site-instrumentation'
     }
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    java {
+      sourceCompatibility = JavaVersion.VERSION_1_8
+      targetCompatibility = JavaVersion.VERSION_1_8
+    }
 
     csi {
       suffix = 'CallSite'
diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt
index 2a76a65cc5d..017f6e6041d 100644
--- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt
+++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt
@@ -21,8 +21,10 @@ class BuildTimeInstrumentationPluginTest {
       id 'dd-trace-java.build-time-instrumentation'
     }
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    java {
+      sourceCompatibility = JavaVersion.VERSION_1_8
+      targetCompatibility = JavaVersion.VERSION_1_8
+    }
 
     repositories {
       mavenCentral()
@@ -76,8 +78,10 @@ class BuildTimeInstrumentationPluginTest {
         id 'dd-trace-java.build-time-instrumentation'
       }
 
-      sourceCompatibility = JavaVersion.VERSION_1_8
-      targetCompatibility = JavaVersion.VERSION_1_8
+      java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+      }
 
       repositories {
         mavenCentral()
@@ -121,8 +125,10 @@ class BuildTimeInstrumentationPluginTest {
         id 'dd-trace-java.build-time-instrumentation'
       }
 
-      sourceCompatibility = JavaVersion.VERSION_1_8
-      targetCompatibility = JavaVersion.VERSION_1_8
+      java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+      }
 
       repositories {
         mavenCentral()
diff --git a/dd-java-agent/benchmark-integration/build.gradle b/dd-java-agent/benchmark-integration/build.gradle
index 6c192e30e1a..9a033a774d7 100644
--- a/dd-java-agent/benchmark-integration/build.gradle
+++ b/dd-java-agent/benchmark-integration/build.gradle
@@ -25,8 +25,10 @@ apply from: "$rootDir/gradle/java.gradle"
 
 description = 'Integration Level Agent benchmarks.'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+java {
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 subprojects { sub ->
   sub.apply plugin: 'com.gradleup.shadow'
diff --git a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle
index 38ec3084caf..34d05cae255 100644
--- a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle
+++ b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle
@@ -6,13 +6,13 @@ muzzle {
   }
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 configurations {
   testImplementation.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
   testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
-apply from: "$rootDir/gradle/java.gradle"
-
 testJvmConstraints {
   // Log4j 1.x reached EOL in 2015 and is not compatible with Java 25+: https://endoflife.date/log4j
   maxJavaVersion = JavaVersion.VERSION_24
diff --git a/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle b/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle
index d9af7c46cf9..d9ba9f90361 100644
--- a/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle
+++ b/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle
@@ -7,14 +7,14 @@ muzzle {
   }
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 configurations.configureEach {
   // shut up about broken xml-api pom relocation
   resolutionStrategy {
     force 'xml-apis:xml-apis:1.4.01'
   }
 }
-
-apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'dd-trace-java.call-site-instrumentation'
 
 addTestSuiteForDir('latestDepTest', 'test')
diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle
index ce207c150da..ae08816c90f 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle
+++ b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle
@@ -13,10 +13,11 @@ muzzle {
     assertInverse = true
   }
 }
+apply from: "$rootDir/gradle/java.gradle"
+
 configurations.configureEach {
   resolutionStrategy.deactivateDependencyLocking()
 }
-apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuite('test_spark24')