diff --git a/conventions/src/main/kotlin/otel.publish-conventions.gradle.kts b/conventions/src/main/kotlin/otel.publish-conventions.gradle.kts
index 75a8be439e..e8542821bc 100644
--- a/conventions/src/main/kotlin/otel.publish-conventions.gradle.kts
+++ b/conventions/src/main/kotlin/otel.publish-conventions.gradle.kts
@@ -9,8 +9,10 @@ publishing {
       plugins.withId("java-platform") {
         from(components["javaPlatform"])
       }
-      plugins.withId("java-library") {
-        from(components["java"])
+      if(project.path != ":javaagent"){
+        plugins.withId("java-library") {
+          from(components["java"])
+        }
       }
 
       versionMapping {
diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts
index 72e9886de4..e74f2c857c 100644
--- a/javaagent/build.gradle.kts
+++ b/javaagent/build.gradle.kts
@@ -158,9 +158,7 @@ tasks {
   val shadowJar by existing(ShadowJar::class) {
     configurations = listOf(bootstrapLibs)
 
-    // without an explicit dependency on jar here, :javaagent:test fails on CI because :javaagent:jar
-    // runs after :javaagent:shadowJar and loses (at least) the manifest entries
-    dependsOn(jar, relocateJavaagentLibs, relocateExporterLibs)
+    dependsOn(relocateJavaagentLibs, relocateExporterLibs)
     isolateClasses(relocateJavaagentLibs.get().outputs.files)
     isolateClasses(relocateExporterLibs.get().outputs.files)
 
@@ -220,6 +218,10 @@ tasks {
     add("baseJar", baseJavaagentJar)
   }
 
+  jar {
+    enabled = false
+  }
+
   assemble {
     dependsOn(shadowJar, slimShadowJar, baseJavaagentJar)
   }
@@ -252,6 +254,7 @@ tasks {
     publications {
       named<MavenPublication>("maven") {
         artifact(slimShadowJar)
+        project.shadow.component(this)
       }
     }
   }