diff --git a/gradle/java.gradle b/gradle/java.gradle
index 741d5ab993..aa28a23fa3 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -10,7 +10,8 @@ apply from: "$rootDir/gradle/codenarc.gradle"
 apply from: "$rootDir/gradle/spotbugs.gradle"
 
 afterEvaluate {
-  if (group == 'io.opentelemetry.instrumentation.auto' || findProperty('mavenGroupId') == 'io.opentelemetry.instrumentation.auto') {
+  if (!archivesBaseName.startsWith('javaagent') &&
+    (group == 'io.opentelemetry.instrumentation.auto' || findProperty('mavenGroupId') == 'io.opentelemetry.instrumentation.auto')) {
     archivesBaseName = 'opentelemetry-auto-' + archivesBaseName
   } else {
     archivesBaseName = 'opentelemetry-' + archivesBaseName
diff --git a/javaagent-bootstrap/javaagent-bootstrap.gradle b/javaagent-bootstrap/javaagent-bootstrap.gradle
index 32623346dc..67daec0cca 100644
--- a/javaagent-bootstrap/javaagent-bootstrap.gradle
+++ b/javaagent-bootstrap/javaagent-bootstrap.gradle
@@ -1,5 +1,3 @@
-group = 'io.opentelemetry.javaagent'
-
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/javaagent-tooling/javaagent-tooling.gradle b/javaagent-tooling/javaagent-tooling.gradle
index 28947547f1..8bf0e62d17 100644
--- a/javaagent-tooling/javaagent-tooling.gradle
+++ b/javaagent-tooling/javaagent-tooling.gradle
@@ -1,5 +1,3 @@
-group = 'io.opentelemetry.javaagent'
-
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/publish.gradle"
 
diff --git a/javaagent/javaagent.gradle b/javaagent/javaagent.gradle
index 44816e6084..589c28f642 100644
--- a/javaagent/javaagent.gradle
+++ b/javaagent/javaagent.gradle
@@ -5,7 +5,6 @@ plugins {
 }
 
 description = 'OpenTelemetry Javaagent'
-group = 'io.opentelemetry.javaagent'
 
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/publish.gradle"