diff --git a/static-instrumenter/maven-plugin/build.gradle.kts b/static-instrumenter/maven-plugin/build.gradle.kts
index 3a5a5cd6..7311c7a8 100644
--- a/static-instrumenter/maven-plugin/build.gradle.kts
+++ b/static-instrumenter/maven-plugin/build.gradle.kts
@@ -1,4 +1,8 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
+  id("com.github.johnrengelman.shadow")
+
   id("otel.java-conventions")
   id("otel.publish-conventions")
 }
@@ -19,6 +23,14 @@ dependencies {
 }
 
 tasks {
+  processResources {
+    val agentJar = project(":static-instrumenter:agent-instrumenter").tasks.getByName("shadowJar", ShadowJar::class)
+    dependsOn(agentJar)
+    from(agentJar.archiveFile) {
+      rename { "opentelemetry-agent.jar" }
+    }
+  }
+
   withType<JavaCompile>().configureEach {
     with(options) {
       release.set(11)
diff --git a/static-instrumenter/maven-plugin/src/main/java/io/opentelemetry/contrib/staticinstrumenter/plugin/maven/InstrumentationAgent.java b/static-instrumenter/maven-plugin/src/main/java/io/opentelemetry/contrib/staticinstrumenter/plugin/maven/InstrumentationAgent.java
index 70e3db4d..34630aca 100644
--- a/static-instrumenter/maven-plugin/src/main/java/io/opentelemetry/contrib/staticinstrumenter/plugin/maven/InstrumentationAgent.java
+++ b/static-instrumenter/maven-plugin/src/main/java/io/opentelemetry/contrib/staticinstrumenter/plugin/maven/InstrumentationAgent.java
@@ -24,10 +24,9 @@ import org.slf4j.LoggerFactory;
 
 public class InstrumentationAgent {
 
-  // TODO: change after the new static-instr capable agent is released
-  public static final String JAR_FILE_NAME = "opentelemetry-javaagent.jar";
-  // TODO: change after the new static-instr capable agent is released
-  public static final String MAIN_CLASS = "io.opentelemetry.javaagent.StaticInstrumenter";
+  public static final String JAR_FILE_NAME = "opentelemetry-agent.jar";
+  public static final String MAIN_CLASS =
+      "io.opentelemetry.contrib.staticinstrumenter.agent.main.Main";
 
   private static final Logger logger = LoggerFactory.getLogger(InstrumentationAgent.class);
 
diff --git a/static-instrumenter/maven-plugin/src/test/resources/opentelemetry-javaagent.jar b/static-instrumenter/maven-plugin/src/test/resources/opentelemetry-javaagent.jar
deleted file mode 100644
index 2babfdd8..00000000
Binary files a/static-instrumenter/maven-plugin/src/test/resources/opentelemetry-javaagent.jar and /dev/null differ