diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index d5a5698..e2e81aa 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -31,7 +31,7 @@
     stage('Download kind-voltha') {
       steps {
         sh """
-           git clone https://github.com/ciena/kind-voltha.git
+           git clone https://github.com/andybavier/kind-voltha.git
            """
       }
     }
@@ -40,23 +40,11 @@
       steps {
         sh """
            cd kind-voltha/
-           TYPE=minimal WITH_RADIUS=y WITH_TP=no ./voltha up
+           TYPE=minimal WITH_RADIUS=y WITH_TP=no WITH_BBSIM=y ./voltha up
            """
       }
     }
 
-    stage('Install BBSIM') {
-      steps {
-        sh '''
-           cd kind-voltha/
-           export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
-           export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
-           export PATH=/w/workspace/kind-voltha-minimal/kind-voltha/bin:$PATH
-           helm install --set onus_per_pon_port=1 onf/bbsim -n bbsim
-           '''
-      }
-    }
-
     stage('Run E2E Tests') {
       steps {
         sh '''
@@ -64,7 +52,7 @@
            cd kind-voltha/
            export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
            export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
-           export PATH=/w/workspace/kind-voltha-minimal/kind-voltha/bin:$PATH
+           export PATH=/w/workspace/voltha-go-e2e-tests/kind-voltha/bin:$PATH
            cd $WORKSPACE/voltha-system-tests/tests/sanity
            robot -e notready -v num_onus:1 sanity.robot || true
            '''
@@ -82,7 +70,7 @@
          cp install-minimal.log $WORKSPACE/
          export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
          export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
-         export PATH=/w/workspace/kind-voltha-minimal/kind-voltha/bin:$PATH
+         export PATH=/w/workspace/voltha-go-e2e-tests/kind-voltha/bin:$PATH
          kubectl get pods --all-namespaces
          kubectl describe pods -n voltha
          voltctl || true
@@ -98,7 +86,7 @@
          ## get voltha pod logs
          for pod in \$(kubectl get pods --no-headers -n voltha | awk '{print \$1}');
          do
-           if [[ \$pod == *"arouter"* ]]; then
+           if [[ \$pod == *"-api-"* ]]; then
              kubectl logs \$pod arouter -n voltha > $WORKSPACE/\$pod.log;
            else
              kubectl logs \$pod -n voltha > $WORKSPACE/\$pod.log;