diff --git a/build.gradle.kts b/build.gradle.kts
index 7ba605f45..bb71ccb6f 100755
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,6 +20,7 @@
 import com.android.build.gradle.BaseExtension
 import com.itsaky.androidide.plugins.AndroidIDEPlugin
 import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
+import com.vanniktech.maven.publish.GradlePlugin
 import com.vanniktech.maven.publish.JavaLibrary
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
@@ -67,6 +68,14 @@ val Project.projectVersionCode: Int by lazy {
     )
 }
 
+val Project.publishingVersion by lazy {
+  var version = simpleVersionName
+  if (CI.isCiBuild) {
+    version += "-SNAPSHOT"
+  }
+  return@lazy version
+}
+
 fun Project.configureBaseExtension() {
   extensions.findByType(BaseExtension::class)?.run {
     compileSdkVersion(BuildConfig.compileSdk)
@@ -143,17 +152,14 @@ subprojects {
         }
       }
 
-      var versionName = project.simpleVersionName
-      if (CI.isCiBuild) {
-        versionName += "-SNAPSHOT"
-      }
-
-      coordinates(project.group.toString(), project.name, versionName)
+      coordinates(project.group.toString(), project.name, project.publishingVersion)
       publishToMavenCentral(host = S01)
       signAllPublications()
 
       if (plugins.hasPlugin("com.android.library")) {
         configure(AndroidSingleVariantLibrary())
+      } else if (plugins.hasPlugin("java-gradle-plugin")) {
+        configure(GradlePlugin(javadocJar = JavadocJar.Javadoc()))
       } else if (plugins.hasPlugin("java-library")) {
         configure(JavaLibrary(javadocJar = JavadocJar.Javadoc()))
       }
@@ -162,7 +168,7 @@ subprojects {
 
   plugins.withId("com.gradle.plugin-publish") {
     configure<GradlePluginDevelopmentExtension> {
-      version = project.simpleVersionName
+      version = project.publishingVersion
     }
   }
 
diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
index ca9d4b66e..c68729975 100644
--- a/gradle-plugin/build.gradle.kts
+++ b/gradle-plugin/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
-
 /*
  *  This file is part of AndroidIDE.
  *
@@ -17,10 +15,12 @@ import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
+
 plugins {
   id("java-gradle-plugin")
   id("org.jetbrains.kotlin.jvm")
-  id("com.gradle.plugin-publish")
+  id("com.vanniktech.maven.publish.base")
 }
 
 tasks.create("generateBuildInfo") {