diff --git a/build.gradle b/build.gradle
index 74f08770aa2..d001be9e435 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ buildscript {
         classpath libs.buildscript.gh.release
         classpath libs.buildscript.android.gradle
         classpath libs.buildscript.android.dexcount
+        classpath libs.buildscript.maven.publish
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6695893d1bc..fbfbd22679e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -44,6 +44,8 @@ android-props-minSdk = "21"
 android-props-compileSdk = "36"
 android-props-buildTools = "36.0.0"
 
+maven-publish = "0.32.0-rc1"
+
 [libraries]
 
 kt-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kt" }
@@ -116,6 +118,7 @@ buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", ver
 buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
 buildscript-android-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle" }
 buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gradle-plugin", version.ref = "dexcount" }
+buildscript-maven-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "maven-publish" }
 
 [plugins]
 
diff --git a/gradle/templates/publish.gradle b/gradle/templates/publish.gradle
index c6e31fea6c3..5e7f25fc58c 100644
--- a/gradle/templates/publish.gradle
+++ b/gradle/templates/publish.gradle
@@ -3,6 +3,10 @@ if (ext.getProperties()["do_publish"] == false) {
 }
 
 apply plugin: 'maven-publish'
+apply plugin: 'com.vanniktech.maven.publish'
+
+mavenPublishing {
+}
 
 task javadocsJar(type: Jar) {
     archiveClassifier = 'javadoc'
@@ -76,7 +80,7 @@ publishing {
             if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
                 maven {
                     name = "sonatype"
-                    url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
+                    url = uri("https://central.sonatype.com/api/v1")
 
                     credentials {
                         username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
diff --git a/gradle/templates/publish_jvm.gradle b/gradle/templates/publish_jvm.gradle
index 5a052b6c675..e9eb031d1d1 100644
--- a/gradle/templates/publish_jvm.gradle
+++ b/gradle/templates/publish_jvm.gradle
@@ -1,4 +1,7 @@
 apply plugin: 'maven-publish'
+apply plugin: 'com.vanniktech.maven.publish'
+
+mavenPublishing {}
 
 task javadocJar(type: Jar) {
     from javadoc
@@ -83,7 +86,7 @@ publishing {
                 if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
                     maven {
                         name = "sonatype"
-                        url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
+                        url = uri("https://central.sonatype.com/api/v1")
                 
                         credentials {
                             username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')