diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
index b60a1d5035b..44c1e9fc9ca 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
@@ -41,7 +41,7 @@ dependencies {
 }
 
 
-configurations.all {
+configurations.configureEach {
   resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
 }
 
diff --git a/dd-java-agent/instrumentation/axis2-1.3/build.gradle b/dd-java-agent/instrumentation/axis2-1.3/build.gradle
index 7cd4d775420..eeb498f73f8 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/build.gradle
+++ b/dd-java-agent/instrumentation/axis2-1.3/build.gradle
@@ -14,7 +14,7 @@ apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('latestDepForkedTest', 'test')
-configurations.all {
+configurations.configureEach {
   // the version used by axis2 isn't available in a public repository - we don't need it, so exclude it
   exclude group: 'org.apache.woden', module: 'woden'
   // shut up about broken xml-api pom relocation
diff --git a/dd-java-agent/instrumentation/javax-xml/build.gradle b/dd-java-agent/instrumentation/javax-xml/build.gradle
index 5a91a4582a6..b83bde3596d 100644
--- a/dd-java-agent/instrumentation/javax-xml/build.gradle
+++ b/dd-java-agent/instrumentation/javax-xml/build.gradle
@@ -14,7 +14,7 @@ repositories {
   }
 }
 
-configurations.all {
+configurations.configureEach {
   // shut up about broken xml-api pom relocation
   resolutionStrategy {
     force 'xml-apis:xml-apis:1.4.01'
diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle
index f1a6cb184a9..b2b85e57720 100644
--- a/dd-java-agent/instrumentation/mule-4.5/build.gradle
+++ b/dd-java-agent/instrumentation/mule-4.5/build.gradle
@@ -71,7 +71,7 @@ configurations {
   latestMuleServices
 }
 
-configurations.all {
+configurations.configureEach {
   exclude group: 'pull-parser', module: 'pull-parser'
 
   resolutionStrategy {
diff --git a/dd-java-agent/instrumentation/owasp-esapi-2/build.gradle b/dd-java-agent/instrumentation/owasp-esapi-2/build.gradle
index 219dfaa0923..a1804517668 100644
--- a/dd-java-agent/instrumentation/owasp-esapi-2/build.gradle
+++ b/dd-java-agent/instrumentation/owasp-esapi-2/build.gradle
@@ -7,7 +7,7 @@ muzzle {
   }
 }
 
-configurations.all {
+configurations.configureEach {
   // shut up about broken xml-api pom relocation
   resolutionStrategy {
     force 'xml-apis:xml-apis:1.4.01'
diff --git a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle
index 2cf0449164c..7d80a9e81f7 100644
--- a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle
+++ b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle
@@ -22,7 +22,7 @@ addTestSuite('jettyAsyncTest')
 //check.dependsOn nettyTest, jettyAsyncTest
 // CI invocations are only for test/latestDepTest
 test.finalizedBy nettyTest, jettyAsyncTest
-configurations.all {
+configurations.configureEach {
   resolutionStrategy.deactivateDependencyLocking()
 }
 dependencies {
diff --git a/dd-java-agent/instrumentation/spark/build.gradle b/dd-java-agent/instrumentation/spark/build.gradle
index 806f480fbe5..b3b9965c9d0 100644
--- a/dd-java-agent/instrumentation/spark/build.gradle
+++ b/dd-java-agent/instrumentation/spark/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 apply from: "$rootDir/gradle/java.gradle"
-configurations.all {
+configurations.configureEach {
   resolutionStrategy.deactivateDependencyLocking()
 }
 dependencies {
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 a9a87a99ef1..07519ca9f52 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle
+++ b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle
@@ -13,7 +13,7 @@ muzzle {
     assertInverse = true
   }
 }
-configurations.all {
+configurations.configureEach {
   resolutionStrategy.deactivateDependencyLocking()
 }
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle
index a5de69adf09..b17f1757b48 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle
+++ b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle
@@ -33,7 +33,7 @@ ext {
   // Spark does not support Java > 11 until 3.3.0 https://issues.apache.org/jira/browse/SPARK-33772
   maxJavaVersionForTests = JavaVersion.VERSION_11
 }
-configurations.all {
+configurations.configureEach {
   resolutionStrategy.deactivateDependencyLocking()
 }
 dependencies {
diff --git a/dd-java-agent/instrumentation/sslsocket/build.gradle b/dd-java-agent/instrumentation/sslsocket/build.gradle
index efd8e548ec1..91a9151d7d0 100644
--- a/dd-java-agent/instrumentation/sslsocket/build.gradle
+++ b/dd-java-agent/instrumentation/sslsocket/build.gradle
@@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle"
 
 // IBM8 is having troubles with TLS set up by jetty 9.4.
 // As a temporary workaround we used a lower jetty version for ssl socket tests
-configurations.all {
+configurations.configureEach {
   resolutionStrategy {
     force group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428'
   }
diff --git a/dd-java-agent/instrumentation/synapse-3.0/build.gradle b/dd-java-agent/instrumentation/synapse-3.0/build.gradle
index afbba97b99c..a8c0c4dd48c 100644
--- a/dd-java-agent/instrumentation/synapse-3.0/build.gradle
+++ b/dd-java-agent/instrumentation/synapse-3.0/build.gradle
@@ -9,7 +9,7 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
-configurations.all {
+configurations.configureEach {
   // the version used by Synapse isn't available in a public repository - we don't need it, so exclude it
   exclude group: 'org.snmp4j', module: 'snmp4j'
   exclude group: 'org.snmp4j', module: 'snmp4j-agent'
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
index 0033491b85e..594c05cfb57 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
@@ -65,7 +65,7 @@ addTestSuiteExtendingForDir('latest10ForkedTest', 'latest10Test', 'latestDepTest
 
 def tomcatVersion = '5.5.12' // earliest 5.5.x available in maven central (with all needed dependencies).
 
-configurations.all {
+configurations.configureEach {
   // shut up about broken xml-api pom relocation
   resolutionStrategy {
     force 'xml-apis:xml-apis:1.4.01'
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/build.gradle
index 74f62c1c6cc..5239d2d3148 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/build.gradle
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/build.gradle
@@ -55,7 +55,7 @@ dependencies {
   implementation project(':dd-java-agent:instrumentation:tomcat:tomcat-common')
 }
 
-configurations.all {
+configurations.configureEach {
   // shut up about broken xml-api pom relocation
   resolutionStrategy {
     force 'xml-apis:xml-apis:1.4.01'
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle
index 6181c44a608..bcc417844be 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle
@@ -1,6 +1,6 @@
 apply from: "$rootDir/gradle/java.gradle"
 
-configurations.all {
+configurations.configureEach {
   // shut up about broken xml-api pom relocation
   resolutionStrategy {
     force 'xml-apis:xml-apis:1.4.01'
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle
index da1d669a662..1b4488d5b3e 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle
@@ -34,7 +34,7 @@ dependencies {
   latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+'
 
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:javax-websocket-1.0")
-  configurations.all {
+  configurations.configureEach {
     it.resolutionStrategy {
       force libs.slf4j
     }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle
index b77f99a12c0..e1b6775832d 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle
@@ -29,7 +29,7 @@ dependencies {
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10")
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0")
 
-  configurations.all {
+  configurations.configureEach {
     it.resolutionStrategy {
       force libs.slf4j
     }
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle
index c3dbc7e52b1..248b14e4549 100644
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle
+++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle
@@ -50,7 +50,7 @@ dependencies {
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:javax-websocket-1.0")
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0")
 
-  configurations.all {
+  configurations.configureEach {
     it.resolutionStrategy {
       force libs.slf4j
     }
diff --git a/dd-trace-ot/build.gradle.kts b/dd-trace-ot/build.gradle.kts
index d7f9f8a8aff..f4c4273e30b 100644
--- a/dd-trace-ot/build.gradle.kts
+++ b/dd-trace-ot/build.gradle.kts
@@ -86,7 +86,7 @@ dependencies {
 }
 
 // gradle can't downgrade the opentracing dependencies with `strictly`
-configurations.matching { it.name.startsWith("ot31") }.all {
+configurations.matching { it.name.startsWith("ot31") }.configureEach {
   resolutionStrategy {
     force("io.opentracing:opentracing-api:0.31.0")
     force("io.opentracing:opentracing-util:0.31.0")