diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 5d1ef60c3db..91c1fed84b3 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -77,7 +77,7 @@ repositories {
 dependencies {
   implementation(gradleApi())
 
-  implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.18.8")
+  implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.18.10")
 
   implementation("org.eclipse.aether", "aether-connector-basic", "1.1.0")
   implementation("org.eclipse.aether", "aether-transport-http", "1.1.0")
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 c65742f2c83..087db26fd69 100644
--- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt
+++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt
@@ -30,7 +30,7 @@ class CallSiteInstrumentationPluginTest : GradleFixture() {
     }
 
     dependencies {
-      implementation("net.bytebuddy:byte-buddy:1.18.8")
+      implementation("net.bytebuddy:byte-buddy:1.18.10")
       implementation("com.google.auto.service:auto-service-annotations:1.1.1")
     }
   """
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 9bbcb7bf386..1fef4354b2c 100644
--- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt
+++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt
@@ -30,7 +30,7 @@ class BuildTimeInstrumentationPluginTest : GradleFixture() {
     }
 
     dependencies {
-      compileOnly("net.bytebuddy:byte-buddy:1.18.8") // just to build TestPlugin
+      compileOnly("net.bytebuddy:byte-buddy:1.18.10") // just to build TestPlugin
     }
 
     buildTimeInstrumentation.plugins.set(listOf("TestPlugin"))
@@ -71,7 +71,7 @@ class BuildTimeInstrumentationPluginTest : GradleFixture() {
       }
 
       dependencies {
-        compileOnly("net.bytebuddy:byte-buddy:1.18.8")
+        compileOnly("net.bytebuddy:byte-buddy:1.18.10")
       }
 
       buildTimeInstrumentation {
@@ -112,7 +112,7 @@ class BuildTimeInstrumentationPluginTest : GradleFixture() {
       }
 
       dependencies {
-        compileOnly("net.bytebuddy:byte-buddy:1.18.8")
+        compileOnly("net.bytebuddy:byte-buddy:1.18.10")
       }
 
       buildTimeInstrumentation {
diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy
index 661d532966e..f76c9dff98e 100644
--- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy
+++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy
@@ -162,7 +162,7 @@ class CallSiteInstrumentationTest extends BaseCallSiteTest {
       })
       )
       .make()
-      .load(Thread.currentThread().contextClassLoader, ClassLoadingStrategy.Default.INJECTION)
+      .load(Thread.currentThread().contextClassLoader, ClassLoadingStrategy.Default.WRAPPER)
     return Tuple.tuple(newType.loaded, newType.bytes)
   }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ba7e784ffe5..f7e2bbfbd1f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -31,7 +31,7 @@ scala33 = "3.3.0"
 # Bytecode manipulations & codegen
 autoservice = "1.1.1"
 asm = "9.9.1"
-byte-buddy = "1.18.8"
+byte-buddy = "1.18.10"
 instrument-java = "0.0.3"
 
 # Benchmarks