diff --git a/build.gradle b/build.gradle
index f9f618ba34..33759f52b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,6 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1'
 		classpath 'org.hibernate.build.gradle:hibernate-matrix-testing:3.0.0.Final'
 		classpath 'org.hibernate.build.gradle:version-injection-plugin:1.0.0'
 		classpath 'gradle.plugin.com.github.lburgazzoli:gradle-karaf-plugin:0.1.1'
@@ -25,6 +24,7 @@ plugins {
 	id 'com.gradle.build-scan' version '2.4.2'
 	id 'me.champeau.buildscan-recipes' version '0.2.3'
 	id 'org.hibernate.build.xjc' version '2.0.1' apply false
+	id 'org.hibernate.build.maven-repo-auth' version '3.0.2' apply false
 }
 
 allprojects {
diff --git a/gradle/publishing-repos.gradle b/gradle/publishing-repos.gradle
index 7a5031b47b..b3245a10d5 100644
--- a/gradle/publishing-repos.gradle
+++ b/gradle/publishing-repos.gradle
@@ -9,7 +9,7 @@ apply from: rootProject.file( 'gradle/base-information.gradle' )
 
 
 apply plugin: 'maven-publish'
-apply plugin: 'maven-publish-auth'
+apply plugin: 'org.hibernate.build.maven-repo-auth'
 apply plugin: 'com.jfrog.bintray'
 
 
diff --git a/hibernate-infinispan/hibernate-infinispan.gradle b/hibernate-infinispan/hibernate-infinispan.gradle
index 122450e2b1..4db08089dc 100644
--- a/hibernate-infinispan/hibernate-infinispan.gradle
+++ b/hibernate-infinispan/hibernate-infinispan.gradle
@@ -9,7 +9,7 @@ apply from: rootProject.file( 'gradle/base-information.gradle' )
 apply from: rootProject.file( 'gradle/publishing-repos.gradle' )
 apply from: rootProject.file( 'gradle/publishing-pom.gradle' )
 apply plugin: 'maven-publish'
-apply plugin: 'maven-publish-auth'
+apply plugin: 'org.hibernate.build.maven-repo-auth'
 
 description = '(deprecated - use org.infinispan:infinispan-hibernate-cache-v53 instead)'
 
diff --git a/hibernate-orm-modules/hibernate-orm-modules.gradle b/hibernate-orm-modules/hibernate-orm-modules.gradle
index b4f865936d..7d7cab1082 100644
--- a/hibernate-orm-modules/hibernate-orm-modules.gradle
+++ b/hibernate-orm-modules/hibernate-orm-modules.gradle
@@ -15,7 +15,7 @@ apply plugin: 'java'
 apply from: rootProject.file( 'gradle/libraries.gradle' )
 
 apply plugin: 'maven-publish'
-apply plugin: 'maven-publish-auth'
+apply plugin: 'org.hibernate.build.maven-repo-auth'
 apply from: rootProject.file( 'gradle/publishing-repos.gradle' )
 apply from: rootProject.file( 'gradle/publishing-pom.gradle' )