diff --git a/Jenkinsfile b/Jenkinsfile
index bdc9bbfb7736de7557c317d3e66a9c59edbc59a8..544b8452219cbac150a540f29c8dd72942079a58 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,11 +13,13 @@ pipeline {
     stages {
         stage('client build') {
             steps {
-                sh 'npm --version'
-                dir('goofy-client') {
-                    sh 'npm install'
-                    sh 'npm run build'
-                    sh 'npm run test'
+                container("nodejs"){
+                    sh 'npm --version'
+                    dir('goofy-client') {
+                        sh 'npm install'
+                        sh 'npm run build'
+                        sh 'npm run test'
+                    }
                 }
             }
         }
@@ -41,7 +43,7 @@ pipeline {
                     openshift.withCluster() {
                         openshift.withProject() {
                             dir('goofy-server') {
-                                openshift.startBuild("goofy-builder", "--from-dir=.", "--follow")
+                                openshift.startBuild("goofy-builder", "--from-dir=.", "--follow", "--wait")
                             }
                          
                             openshift.tag("goofy-builder:latest", "goofy-builder:${env.BRANCH_NAME}-${version}")