diff --git a/jjb/pipeline/voltha-go-multi-tests.groovy b/jjb/pipeline/voltha-go-multi-tests.groovy
index 5caea0f..6950583 100644
--- a/jjb/pipeline/voltha-go-multi-tests.groovy
+++ b/jjb/pipeline/voltha-go-multi-tests.groovy
@@ -99,15 +99,8 @@
              if [[ \$i -lt ${testRuns} ]]
              then
                # For testing multiple back-to-back runs
-               # Doing some manual cleanup to work around known issues in BBSim and ONOS apps
-
-               helm delete --purge bbsim # VOL-2342
-               helm delete --purge onos # VOL-2343, VOL-2363
-               clear_etcd service/voltha/resource_manager
-               clear_etcd service/voltha/openolt
-               clear_etcd service/voltha/devices
-               sleep 30
-               DEPLOY_K8S=no ./voltha up  # Will just re-deploy BBSim and ONOS
+               # Work around a known issue in BBSim
+               kubectl -n voltha delete pod -lapp=bbsim
              fi
            done
            '''
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index fd85c3b..f989db5 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -45,8 +45,8 @@
           default-image-tag: 'master'
           code-branch: 'master'
           make-target: sanity-multi-kind
-          onus: 2
-          pons: 2
+          onus: 1
+          pons: 1
           test-runs: 5
           time-trigger: "H H/3 * * *"