diff --git a/jjb/pipeline/voltha-system-test-bbsim.groovy b/jjb/pipeline/voltha-system-test-bbsim.groovy
index 1b291f2..e639d4a 100644
--- a/jjb/pipeline/voltha-system-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-system-test-bbsim.groovy
@@ -43,13 +43,31 @@
   }
 
   stages {
-    stage('Create K8s Cluster') {
+    stage('Create Kubernetes Cluster') {
       steps {
         sh """
            git clone https://github.com/ciena/kind-voltha.git
            pushd kind-voltha/
-           ./voltha up
+           JUST_K8S=y ./voltha up
+           popd
+           """
+      }
+    }
+
+    stage('Setup log collector') {
+      steps {
+        sh """
            bash <( curl -sfL https://raw.githubusercontent.com/boz/kail/master/godownloader.sh) -b "$WORKSPACE/kind-voltha/bin"
+           kail -n voltha -n default > $WORKSPACE/onos-voltha-combined.log &
+           """
+      }
+    }
+
+    stage('Deploy Voltha') {
+      steps {
+        sh """
+           pushd kind-voltha/
+           ./voltha up
            popd
            """
       }