diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 55d91f6..26a4a3d 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -83,7 +83,7 @@
            export TYPE=minimal
            export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
            export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
-           export PATH=/w/workspace/voltha-bbsim-system-tests/kind-voltha/bin:$PATH
+           export PATH=/w/workspace/${gerritProject}_sanity-system-test/kind-voltha/bin:$PATH
            docker images | grep citest
            for image in \$(docker images -f "reference=*/*citest" --format "{{.Repository}}"); do echo "Pushing \$image to nodes"; kind load docker-image \$image:citest --name voltha-\$TYPE --nodes voltha-\$TYPE-worker,voltha-\$TYPE-worker2; done
            '''
@@ -119,7 +119,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/voltha-bbsim-system-tests/kind-voltha/bin:$PATH
+           export PATH=/w/workspace/${gerritProject}_sanity-system-test/kind-voltha/bin:$PATH
            cd $WORKSPACE/voltha-system-tests/tests/sanity
            robot -e notready --critical sanity --noncritical VOL-1705 -v num_onus:1 sanity.robot || true
            '''
@@ -137,7 +137,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/voltha-bbsim-system-tests/kind-voltha/bin:$PATH
+         export PATH=/w/workspace/${gerritProject}_sanity-system-test/kind-voltha/bin:$PATH
          kubectl get pods --all-namespaces -o jsonpath="{..image}" |tr -s "[[:space:]]" "\n" | sort | uniq -c
          kubectl get nodes -o wide
          kubectl get pods -o wide