diff --git a/payapi/build.gradle b/payapi/build.gradle
index 60c843d..2f1eed1 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -1,5 +1,3 @@
-import java.text.SimpleDateFormat
-
 plugins {
     id "java"
     id "org.springframework.boot"
@@ -9,16 +7,19 @@
     id "com.palantir.docker"
 }
 
+apply plugin: 'io.spring.dependency-management'
+apply plugin: 'kotlin'
 
 def payapiStartClass = "com.supwisdom.dlpay.PayApiApplicationKt"
 
 println("Build version: $buildVersion")
 
 bootJar {
+    enabled = true
     mainClassName = payapiStartClass
     manifest {
         attributes("Payapi-Version": buildVersion,
-                "Payapi-Buildtime": new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(new Date()))
+                "Payapi-Buildtime": buildTime)
     }
 }
 
@@ -43,10 +44,10 @@
     } else {
         imageVersion = details.lastTag
     }
-    println("Docker image tag : " + imageVersion)
-    name "harbor.supwisdom.com/dali/payapi:" + imageVersion
-    println(jar.archiveFile.get().toString())
-    files jar.archiveFile
+    println("Docker image tag : ${imageVersion}")
+    name "${dockerRegistry}/payapi:${imageVersion}"
+    println(jar.archiveFile.get())
+    files jar.archiveFile.get()
 }
 
 docker.dependsOn(jar)
@@ -65,9 +66,9 @@
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
     implementation "org.springframework.session:spring-session-data-redis"
     implementation "org.springframework.boot:spring-boot-starter-cache"
-    implementation "org.springframework.kafka:spring-kafka"
     implementation "org.springframework.social:spring-social-web:${springSocialVersion}"
-    implementation "org.springframework.kafka:spring-kafka:${springKafkaVersion}"
+    implementation "org.apache.kafka:kafka-streams"
+    implementation "org.springframework.kafka:spring-kafka"
 
     implementation "org.springframework.cloud:spring-cloud-starter"
     implementation "org.springframework.cloud:spring-cloud-starter-consul-discovery"