diff --git a/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java b/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java
index dbd2b1a9de..648d78f575 100644
--- a/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java
+++ b/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java
@@ -37,7 +37,8 @@ public class AgentInfo {
         "com.lmax.disruptor",
         "com.dslplatform.json",
         "com.googlecode.concurrentlinkedhashmap",
-        "co.elastic.otel"
+        "co.elastic.otel",
+        "codes.rafael.asmjdkbridge"
     ));
 
     private static final Set<String> agentRootPackages = new HashSet<>(Arrays.asList(
diff --git a/pom.xml b/pom.xml
index 41cf08ac34..cfc1a7adc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
         <version.jetty-server>9.4.11.v20180605</version.jetty-server>
         <version.json-schema-validator>1.5.3</version.json-schema-validator>
         <!-- Byte Buddy and ASM must be kept in sync -->
-        <version.byte-buddy>1.15.11</version.byte-buddy>
+        <version.byte-buddy>1.17.0</version.byte-buddy>
         <version.asm>9.7.1</version.asm>
         <version.cucumber>5.4.0</version.cucumber>
 
@@ -615,7 +615,25 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.6.0</version>
+                    <dependencies>
+                        <!-- work-around to support java 24 bytecode -->
+                        <dependency>
+                            <groupId>org.ow2.asm</groupId>
+                            <artifactId>asm</artifactId>
+                            <version>${version.asm}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.ow2.asm</groupId>
+                            <artifactId>asm-commons</artifactId>
+                            <version>${version.asm}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.ow2.asm</groupId>
+                            <artifactId>asm-tree</artifactId>
+                            <version>${version.asm}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>