diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java
index 5b0daa95995..bb19a95fc03 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java
@@ -67,7 +67,7 @@ public String classEntryName(String name) {
 
   /** For testing purposes only. */
   public static AgentJarIndex emptyIndex() {
-    return new AgentJarIndex(new String[0], ClassNameTrie.Builder.EMPTY_TRIE);
+    return new AgentJarIndex(new String[0], ClassNameTrie.EMPTY_TRIE);
   }
 
   public static AgentJarIndex readIndex(JarFile agentJar) {
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
index 86f47c55eed..76a758d3af6 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java
@@ -26,7 +26,7 @@ public class RepoIndex {
 
   static final RepoIndex EMPTY =
       new RepoIndex(
-          ClassNameTrie.Builder.EMPTY_TRIE,
+          ClassNameTrie.EMPTY_TRIE,
           Collections.emptyMap(),
           Collections.emptyList(),
           Collections.emptyList());
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
index bea68325982..d67886afd05 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/Redaction.java
@@ -104,7 +104,7 @@ public class Redaction {
           "xsrf",
           "xsrftoken");
   private static final Set<String> KEYWORDS = ConcurrentHashMap.newKeySet();
-  private static ClassNameTrie typeTrie = ClassNameTrie.Builder.EMPTY_TRIE;
+  private static ClassNameTrie typeTrie = ClassNameTrie.EMPTY_TRIE;
   private static List<String> redactedClasses;
   private static List<String> redactedPackages;
 
@@ -190,7 +190,7 @@ public static List<String> getRedactedClasses() {
   }
 
   public static void clearUserDefinedTypes() {
-    typeTrie = ClassNameTrie.Builder.EMPTY_TRIE;
+    typeTrie = ClassNameTrie.EMPTY_TRIE;
   }
 
   public static void resetUserDefinedKeywords() {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f7e2bbfbd1f..c14f8193f3d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ scala33 = "3.3.0"
 autoservice = "1.1.1"
 asm = "9.9.1"
 byte-buddy = "1.18.10"
-instrument-java = "0.0.3"
+instrument-java = "0.0.4"
 
 # Benchmarks
 jmh = "1.37"