diff --git a/build.gradle b/build.gradle
index 7b4426c8..51994979 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,4 +91,11 @@ tasks.register('apiDocs', Copy) {
     into file("${buildDir}/asciidoc/api")
 }
 
+tasks.named('bootJar') {
+    enabled = false // Plugins should not create a bootJar
+}
+tasks.named('jar', Jar) {
+    archiveClassifier = '' // Remove '-plain' suffix from jar file name
+}
+
 asciidoctor.dependsOn(apiDocs)