diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts
index a9b9188011e1..386372e7899a 100644
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts
@@ -40,37 +40,28 @@ tasks {
     destinationDirectory.set(layout.buildDirectory.dir("tmp"))
     archiveFileName.set("logback-classic-modified.jar")
     exclude("/META-INF/services/javax.servlet.ServletContainerInitializer")
-    doFirst {
-      configurations.configureEach {
-        if (name.lowercase().endsWith("testruntimeclasspath")) {
-          val logbackJar = find { it.name.contains("logback-classic") }
-          logbackJar?.let {
-            from(zipTree(logbackJar))
-          }
-        }
-      }
-    }
+
+    val testRuntimeClasspath = configurations.named("testRuntimeClasspath")
+    from({
+      testRuntimeClasspath.get().filter { it.name.contains("logback-classic") }.map { zipTree(it) }
+    })
   }
 
   test {
     dependsOn(modifyLogbackJar)
     dependsOn(setupServer)
 
-    doFirst {
-      // --add-modules is unrecognized on jdk8, ignore it instead of failing
-      jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-      // needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
-      jvmArgs("--add-modules=java.se")
-      // add offset to default port values
-      jvmArgs("-Djboss.socket.binding.port-offset=400")
+    // --add-modules is unrecognized on jdk8, ignore it instead of failing
+    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+    // needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
+    jvmArgs("--add-modules=java.se")
+    // add offset to default port values
+    jvmArgs("-Djboss.socket.binding.port-offset=400")
 
-      // remove logback-classic from classpath
-      classpath = classpath.filter {
-        !it.absolutePath.contains("logback-classic")
-      }
-      // add modified copy of logback-classic to classpath
-      classpath = classpath.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
-    }
+    // remove logback-classic from classpath and add modified copy
+    classpath = classpath.filter {
+      !it.absolutePath.contains("logback-classic")
+    }.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
   }
 }
 
diff --git a/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts
index 57b2fdf8dc35..874db6857cd8 100644
--- a/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts
@@ -41,37 +41,28 @@ tasks {
     destinationDirectory.set(layout.buildDirectory.dir("tmp"))
     archiveFileName.set("logback-classic-modified.jar")
     exclude("/META-INF/services/javax.servlet.ServletContainerInitializer")
-    doFirst {
-      configurations.configureEach {
-        if (name.lowercase().endsWith("testruntimeclasspath")) {
-          val logbackJar = find { it.name.contains("logback-classic") }
-          logbackJar?.let {
-            from(zipTree(logbackJar))
-          }
-        }
-      }
-    }
+
+    val testRuntimeClasspath = configurations.named("testRuntimeClasspath")
+    from({
+      testRuntimeClasspath.get().filter { it.name.contains("logback-classic") }.map { zipTree(it) }
+    })
   }
 
   test {
     dependsOn(modifyLogbackJar)
     dependsOn(setupServer)
 
-    doFirst {
-      // --add-modules is unrecognized on jdk8, ignore it instead of failing
-      jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-      // needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
-      jvmArgs("--add-modules=java.se")
-      // add offset to default port values
-      jvmArgs("-Djboss.socket.binding.port-offset=200")
+    // --add-modules is unrecognized on jdk8, ignore it instead of failing
+    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+    // needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
+    jvmArgs("--add-modules=java.se")
+    // add offset to default port values
+    jvmArgs("-Djboss.socket.binding.port-offset=200")
 
-      // remove logback-classic from classpath
-      classpath = classpath.filter {
-        !it.absolutePath.contains("logback-classic")
-      }
-      // add modified copy of logback-classic to classpath
-      classpath = classpath.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
-    }
+    // remove logback-classic from classpath and add modified copy
+    classpath = classpath.filter {
+      !it.absolutePath.contains("logback-classic")
+    }.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
   }
 }
 
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/wildfly-testing/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/wildfly-testing/build.gradle.kts
index 902bc2362d5c..0d92ab0d8f6f 100644
--- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/wildfly-testing/build.gradle.kts
+++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/wildfly-testing/build.gradle.kts
@@ -50,16 +50,11 @@ tasks {
     destinationDirectory.set(layout.buildDirectory.dir("tmp"))
     archiveFileName.set("logback-classic-modified.jar")
     exclude("/META-INF/services/javax.servlet.ServletContainerInitializer")
-    doFirst {
-      configurations.configureEach {
-        if (name.lowercase().endsWith("testruntimeclasspath")) {
-          val logbackJar = find { it.name.contains("logback-classic") }
-          logbackJar?.let {
-            from(zipTree(logbackJar))
-          }
-        }
-      }
-    }
+
+    val testRuntimeClasspath = configurations.named("testRuntimeClasspath")
+    from({
+      testRuntimeClasspath.get().filter { it.name.contains("logback-classic") }.map { zipTree(it) }
+    })
   }
 
   val copyDependencies by registering(Copy::class) {
@@ -72,21 +67,17 @@ tasks {
     dependsOn(setupServer)
     dependsOn(copyDependencies)
 
-    doFirst {
-      // --add-modules is unrecognized on jdk8, ignore it instead of failing
-      jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-      // needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
-      jvmArgs("--add-modules=java.se")
-      // add offset to default port values
-      jvmArgs("-Djboss.socket.binding.port-offset=300")
-      jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+    // --add-modules is unrecognized on jdk8, ignore it instead of failing
+    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+    // needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
+    jvmArgs("--add-modules=java.se")
+    // add offset to default port values
+    jvmArgs("-Djboss.socket.binding.port-offset=300")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 
-      // remove logback-classic from classpath
-      classpath = classpath.filter {
-        !it.absolutePath.contains("logback-classic")
-      }
-      // add modified copy of logback-classic to classpath
-      classpath = classpath.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
-    }
+    // remove logback-classic from classpath and add modified copy
+    classpath = classpath.filter {
+      !it.absolutePath.contains("logback-classic")
+    }.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
   }
 }