diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index ddfe37a..da04f62 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -163,6 +163,14 @@
 
                     orchestrate.installKubernetesControl(saltMaster)
                 }
+
+
+                if (common.checkContains('INSTALL', 'contrail')) {
+                    state('Install Contrail for Kubernetes') {
+                        orchestrate.installContrailNetwork(saltMaster)
+                        orchestrate.installContrailCompute(saltMaster)
+                    }
+                }
             }
 
             // install openstack
diff --git a/test-nodejs-pipeline.groovy b/test-nodejs-pipeline.groovy
index 9e033fd..d659b7e 100644
--- a/test-nodejs-pipeline.groovy
+++ b/test-nodejs-pipeline.groovy
@@ -58,15 +58,9 @@
              }
         }
         stage('Generate config file for devops portal') {
-            def builder = new groovy.json.JsonBuilder()
-            def config = builder.services {
-                elasticsearch {
-                    endpoint 'http://elasticsearch:9200'
-                }
-            }
             writeFile (
                 file: "${workspace}/test_config.json",
-                text: config.toString()
+                text: '${JSON_CONFIG}'
             )
        }
        stage('Start container') {
@@ -95,7 +89,7 @@
         common.sendNotification(currentBuild.result, "" ,["slack"])
         stage('Cleanup') {
             if (containerId != null) {
-                dockerCleanupCommands = ['stop', 'rm']
+                dockerCleanupCommands = ['stop', 'rm -f']
                 for (int i = 0; i < dockerCleanupCommands.size(); i++) {
                     sh("docker-compose -f ${COMPOSE_PATH} -p ${uniqId} ${dockerCleanupCommands[i]} || true")
                 }