diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7e5d2a8..75accab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
diff --git a/oauth/build.gradle b/oauth/build.gradle
index 3496703..2ae2546 100644
--- a/oauth/build.gradle
+++ b/oauth/build.gradle
@@ -10,25 +10,19 @@
 apply plugin: 'java'
 apply plugin: 'io.spring.dependency-management'
 
-def details = versionDetails()
-
 sourceCompatibility = jdkVersion
 def startClass = 'com.supwisdom.oauth.OAuthApplication'
 
-println("Build version: $version")
+println("Build version: $gitVersion")
 
 bootJar {
+    enabled = true
     mainClassName = startClass
     manifest {
-        attributes('oauth-Version': version)
+        attributes('oauth-Version': gitVersion)
     }
 }
 
-jar {
-    baseName = 'oauth'
-}
-
-
 dependencies {
     implementation project(":payapi-common")
 
diff --git a/payapi-common/build.gradle b/payapi-common/build.gradle
index 7ae26c0..28dc87a 100644
--- a/payapi-common/build.gradle
+++ b/payapi-common/build.gradle
@@ -4,8 +4,18 @@
     id "org.springframework.boot"
 }
 
+jar {
+    enabled = true
+    archiveFileName = "${project.name}-${buildVersion}.${archiveExtension.getOrElse('.jar')}"
+    manifest {
+        attributes('Implementation-Title': project.name,
+                'Implementation-Version': buildVersion)
+    }
+}
+println("Build Version: $buildVersion")
 bootJar {
     enabled = false
+
 }
 
 apply from: rootProject.file('gradle/swnx-publish.gradle')
@@ -13,10 +23,8 @@
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            groupId = project.group
-            artifactId = project.name
-            version = version
             from components.java
+            version = buildVersion
         }
     }
 }
@@ -28,4 +36,7 @@
 
     compileOnly "org.projectlombok:lombok:${lombokVersion}"
     annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
-}
\ No newline at end of file
+}
+
+
+publish.dependsOn(jar)
\ No newline at end of file
diff --git a/payapi-sdk/build.gradle b/payapi-sdk/build.gradle
index f76dc3a..ecd7869 100644
--- a/payapi-sdk/build.gradle
+++ b/payapi-sdk/build.gradle
@@ -7,22 +7,19 @@
 
 apply plugin: 'io.spring.dependency-management'
 
-def sdkVersion = gitVersion()
-
-
 apply from: rootProject.file('gradle/swnx-publish.gradle')
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            groupId = project.group
-            artifactId = 'payapi-sdk'
-            version = sdkVersion
             from components.java
+            version = buildVersion
         }
     }
 }
 
+println("Build Version: $buildVersion")
+
 bootJar {
     enabled = false
 }
@@ -37,9 +34,9 @@
 
 jar {
     enabled = true
-    baseName = "payapi-sdk"
+    archiveFileName = "${project.name}-${buildVersion}.${archiveExtension.getOrElse('.jar')}"
     manifest {
-        attributes('Payapi-SDK-Version': sdkVersion)
+        attributes('Payapi-SDK-Version': buildVersion)
     }
 }
 
diff --git a/payapi/build.gradle b/payapi/build.gradle
index 184dbb5..60c843d 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -9,24 +9,19 @@
     id "com.palantir.docker"
 }
 
-payapiVersion = version
 
 def payapiStartClass = "com.supwisdom.dlpay.PayApiApplicationKt"
 
-println("Build version: $payapiVersion")
+println("Build version: $buildVersion")
 
 bootJar {
     mainClassName = payapiStartClass
     manifest {
-        attributes("Payapi-Version": payapiVersion,
+        attributes("Payapi-Version": buildVersion,
                 "Payapi-Buildtime": new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(new Date()))
     }
 }
 
-jar {
-    baseName = "payapi"
-}
-
 compileKotlin {
     kotlinOptions {
         freeCompilerArgs = ["-Xjsr305=strict"]
@@ -50,8 +45,8 @@
     }
     println("Docker image tag : " + imageVersion)
     name "harbor.supwisdom.com/dali/payapi:" + imageVersion
-    println(jar.archivePath)
-    files jar.archivePath
+    println(jar.archiveFile.get().toString())
+    files jar.archiveFile
 }
 
 docker.dependsOn(jar)
diff --git a/ynrcc-agent/build.gradle b/ynrcc-agent/build.gradle
index 2e612c1..54fab87 100644
--- a/ynrcc-agent/build.gradle
+++ b/ynrcc-agent/build.gradle
@@ -8,7 +8,7 @@
 apply plugin: 'java'
 apply plugin: 'io.spring.dependency-management'
 
-def ynrccVersion = version
+def ynrccVersion = buildVersion
 def details = versionDetails()
 
 sourceCompatibility = jdkVersion