diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/build.gradle b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/build.gradle
deleted file mode 100644
index df5b5fc1fd21..000000000000
--- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-plugins {
-  id("otel.javaagent-instrumentation")
-}
-
-muzzle {
-  pass {
-    group = "org.eclipse.jetty"
-    module = 'jetty-client'
-    versions = "[9.2,9.4.+)"
-  }
-}
-
-
-//Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
-def jettyVers_base9 = '9.2.0.v20140526'
-
-
-dependencies {
-  implementation project(':instrumentation:jetty-httpclient:jetty-httpclient-9.2:library')
-
-  library "org.eclipse.jetty:jetty-client:${jettyVers_base9}"
-  latestDepTestLibrary "org.eclipse.jetty:jetty-client:9.+"
-
-  testImplementation project(':instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing')
-  testImplementation("org.eclipse.jetty:jetty-server:${jettyVers_base9}") {
-    exclude group: 'org.eclipse.jetty', module: 'jetty-client'
-  }
-}
diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/build.gradle.kts b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/build.gradle.kts
new file mode 100644
index 000000000000..dd3e7e12e952
--- /dev/null
+++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/build.gradle.kts
@@ -0,0 +1,25 @@
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+
+muzzle {
+  pass {
+    group.set("org.eclipse.jetty")
+    module.set("jetty-client")
+    versions.set("[9.2,9.4.+)")
+  }
+}
+
+
+//Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
+val jettyVers_base9 = "9.2.0.v20140526"
+
+
+dependencies {
+  implementation(project(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:library"))
+
+  library("org.eclipse.jetty:jetty-client:${jettyVers_base9}")
+  latestDepTestLibrary("org.eclipse.jetty:jetty-client:9.+")
+
+  testImplementation(project(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing"))
+}
diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle
deleted file mode 100644
index 0dc360992f41..000000000000
--- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-plugins {
-  id("otel.library-instrumentation")
-  id("net.ltgt.errorprone")
-}
-
-
-//Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
-def jettyVers_base9 = '9.2.0.v20140526'
-
-dependencies {
-  library "org.eclipse.jetty:jetty-client:${jettyVers_base9}"
-  latestDepTestLibrary "org.eclipse.jetty:jetty-client:9.+"
-  testImplementation project(':instrumentation:jetty-httpclient::jetty-httpclient-9.2:testing')
-
-  implementation "org.slf4j:slf4j-api"
-}
-
diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle.kts b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle.kts
new file mode 100644
index 000000000000..22d8c00ec85a
--- /dev/null
+++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+  id("otel.library-instrumentation")
+}
+
+
+//Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
+val jettyVers_base9 = "9.2.0.v20140526"
+
+dependencies {
+  library("org.eclipse.jetty:jetty-client:${jettyVers_base9}")
+  latestDepTestLibrary("org.eclipse.jetty:jetty-client:9.+")
+  testImplementation(project(":instrumentation:jetty-httpclient::jetty-httpclient-9.2:testing"))
+
+  implementation("org.slf4j:slf4j-api")
+}
+
diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle
deleted file mode 100644
index 630e8bd91a72..000000000000
--- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle
+++ /dev/null
@@ -1,22 +0,0 @@
-plugins {
-  id("otel.java-conventions")
-}
-
-//Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
-def jettyVers_base9 = '9.2.0.v20140526'
-
-dependencies {
-  api(project(':testing-common')) {
-    exclude group: 'org.eclipse.jetty', module: 'jetty-client'
-    exclude group: 'org.eclipse.jetty', module: 'jetty-server'
-  }
-
-
-  api "org.eclipse.jetty:jetty-client:${jettyVers_base9}"
-
-  implementation "org.junit.jupiter:junit-jupiter-api"
-
-  implementation "org.codehaus.groovy:groovy-all"
-  implementation "io.opentelemetry:opentelemetry-api"
-  implementation "org.spockframework:spock-core"
-}
diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle.kts b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle.kts
new file mode 100644
index 000000000000..d49aaa874513
--- /dev/null
+++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+  id("otel.java-conventions")
+}
+
+//Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
+val jettyVers_base9 = "9.2.0.v20140526"
+
+dependencies {
+  api(project(":testing-common"))
+
+
+  api("org.eclipse.jetty:jetty-client:${jettyVers_base9}")
+
+  implementation("org.junit.jupiter:junit-jupiter-api")
+
+  implementation("org.codehaus.groovy:groovy-all")
+  implementation("io.opentelemetry:opentelemetry-api")
+  implementation("org.spockframework:spock-core")
+}