diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts
index f0d08d324f56..1bad9133c991 100644
--- a/javaagent/build.gradle.kts
+++ b/javaagent/build.gradle.kts
@@ -216,6 +216,12 @@ tasks {
     dependsOn(shadowJar, baseJavaagentJar)
   }
 
+  if((findProperty("removeJarVersionNumbers") ?: "false").toString().toBoolean()) {
+    withType<AbstractArchiveTask>().configureEach {
+      archiveVersion.set("")
+    }
+  }
+
   withType<Test>().configureEach {
     dependsOn(shadowJar)