diff --git a/jjb/pipeline/voltha-system-test-bbsim.groovy b/jjb/pipeline/voltha-system-test-bbsim.groovy
index 14410ac..ba61757 100644
--- a/jjb/pipeline/voltha-system-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-system-test-bbsim.groovy
@@ -53,8 +53,9 @@
     stage('Deploy Voltha') {
       steps {
         sh """
-           cd kind-voltha/
+           pushd kind-voltha/
            ./voltha up
+           popd
            """
       }
     }
@@ -73,9 +74,10 @@
     stage('Deploy Voltha Again') {
       steps {
         sh """
-           cd kind-voltha/
+           pushd kind-voltha/
            ./voltha down
            ./voltha up
+           popd
            """
       }
     }
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 66e736a..3c3c81d 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -20,9 +20,10 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-system-test'
           pipeline-script: 'voltha-system-test-bbsim.groovy'
+          build-node: 'ubuntu16.04-basebuild-4c-8g'
           default-image-tag: 'master'
           code-branch: 'master'
-          make-target: sanity-multi-kind
+          make-target: sanity-single-kind
           onus: 2
           pons: 2
           time-trigger: "H H/12 * * *"