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
            """
       }
     }