diff --git a/Jenkinsfile b/Jenkinsfile
index 38aad3f3..50072dc1 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ def GIT_BRANCH_NAME=getGitBranchName()
 pipeline {
   agent {
     kubernetes{
-      label 'slave-2cpu-8gb'
+      label 'slave-4cpu-16gb'
     }
   }
   parameters {
@@ -606,12 +606,12 @@ def generateBuildStage(server) {
       echo "This is ${server}."
       def name = getName(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
-        sh """
-            lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run docker:${env.BUILD_COMMAND};
-            docker tag ${name}:${version} ${REPOSITORY_SERVER}/${name}:${version}
-            docker push ${REPOSITORY_SERVER}/${name}:${version}
-            docker rmi ${REPOSITORY_SERVER}/${name}:${version}
-        """
+      def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
+      sh "lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;"
+      def newImage = docker.build("$imageTag", "-f servers/$server/Dockerfile .")
+      docker.withRegistry('https://gcr.io', "gcr:google-container-registry") {
+        newImage.push()
+      }
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')
         throw(e)