diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml
index 9191200..643b49e 100644
--- a/.github/actions/maven-publish/action.yml
+++ b/.github/actions/maven-publish/action.yml
@@ -35,7 +35,7 @@ runs:
 
     - name: Publish Java Packages to Maven
       shell: bash
-      run: ./gradlew publish -PisSnapshot=false --stacktrace
+      run: ./gradlew publishToSonatype closeSonatypeStagingRepository -PisSnapshot=false --stacktrace
       env:
         JAVA_HOME: ${{ env.JAVA_HOME }}
         MAVEN_USERNAME: ${{ inputs.ossr-username }}
diff --git a/.github/workflows/dependabot.yml b/.github/dependabot.yml
similarity index 100%
rename from .github/workflows/dependabot.yml
rename to .github/dependabot.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index df5c31c..9829b1a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,7 +33,6 @@ jobs:
     needs: rl-scanner
     with:
       java-version: 8.0.382-tem
-      is-android: false
     secrets:
       ossr-username: ${{ secrets.OSSR_USERNAME }}
       ossr-token: ${{ secrets.OSSR_TOKEN }}
diff --git a/build.gradle b/build.gradle
index 776140e..0a7358e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ plugins {
     id 'java-library'
     id 'jacoco'
     id 'me.champeau.gradle.japicmp' version '0.4.1'
+    id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
 
 repositories {
diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle
index 206a581..b27ee88 100644
--- a/gradle/maven-publish.gradle
+++ b/gradle/maven-publish.gradle
@@ -25,22 +25,18 @@ artifacts {
     archives sourcesJar, javadocJar
 }
 
-
-final releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-final snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-
 publishing {
     publications {
         mavenJava(MavenPublication) {
+            from components.java
+
+            artifact sourcesJar
+            artifact javadocJar
 
             groupId = GROUP
             artifactId = POM_ARTIFACT_ID
             version = getVersionName()
 
-            artifact("$buildDir/libs/${project.name}-${version}.jar")
-            artifact sourcesJar
-            artifact javadocJar
-
             pom {
                 name = POM_NAME
                 packaging = POM_PACKAGING
@@ -68,28 +64,18 @@ publishing {
                     connection = POM_SCM_CONNECTION
                     developerConnection = POM_SCM_DEV_CONNECTION
                 }
-
-                pom.withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-
-                    project.configurations.implementation.allDependencies.each {
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', it.group)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', it.version)
-                    }
-                }
             }
         }
     }
+}
+
+nexusPublishing {
     repositories {
-        maven {
-            name = "sonatype"
-            url = version.endsWith('SNAPSHOT') ? snapshotRepositoryUrl : releaseRepositoryUrl
-            credentials {
-                username = System.getenv("MAVEN_USERNAME")
-                password = System.getenv("MAVEN_PASSWORD")
-            }
+        sonatype {
+            nexusUrl.set(uri('https://ossrh-staging-api.central.sonatype.com/service/local/'))
+            snapshotRepositoryUrl.set(uri('https://central.sonatype.com/repository/maven-snapshots/'))
+            username.set(System.getenv("MAVEN_USERNAME"))
+            password.set(System.getenv("MAVEN_PASSWORD"))
         }
     }
 }