diff --git a/base/build.gradle b/base/build.gradle
index 0b8adc6..bd0d446 100644
--- a/base/build.gradle
+++ b/base/build.gradle
@@ -131,10 +131,10 @@ publishing {
 		mavenLocal()
 
         maven {
-            url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+            url = findProperty("deployPublishUrl") ?: System.properties['deploy.publish_url']
             credentials {
-                username = findProperty("sonatypeUsername")
-                password = findProperty("sonatypePassword")
+                username = findProperty("deployUsername") ?: System.properties['deploy.user']
+                password = findProperty("deployPassword") ?: System.properties['deploy.token']
             }
         }
     }
diff --git a/build.gradle b/build.gradle
index 4f43f59..9a1e5ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,8 +9,10 @@ repositories {
 }
 
 ext {
+	patchVersion = findProperty("deployVersion") ?: "local-1.0.0"
     baseVersion  = "3.9.4.001"
     baseGroupId  = "io.github.adempiere"
+    publishGroupId  = "io.github.adempiere"
 }
 
 sourceCompatibility = 1.11
@@ -51,16 +53,11 @@ dependencies {
    	
 }
 
-def entityType = 'P'
-group = "io.github.adempiere"
-version = findProperty("deployVersion") ?: "local-1.0.0"
-
 jar {
 	manifest {
 		attributes(
 			"Implementation-Title": "ADempiere Patch",
-			"Implementation-Version": version,
-			"EntityType": entityType
+			"Implementation-Version": patchVersion
 		)
     }
 }
@@ -79,9 +76,9 @@ publishing {
     }
     publications {
         mavenJava(MavenPublication) {
-			groupId = group
+			groupId = publishGroupId
 			artifactId = 'adempiere-customizations'
-			version = version
+			version = patchVersion
            	from components.java
            	pom {
                 name = 'Adempiere Patches'