diff --git a/jjb/pipeline/voltha-go-multi-tests.groovy b/jjb/pipeline/voltha-go-multi-tests.groovy
index 6950583..a167a29 100644
--- a/jjb/pipeline/voltha-go-multi-tests.groovy
+++ b/jjb/pipeline/voltha-go-multi-tests.groovy
@@ -83,11 +83,6 @@
     stage('Run E2E Tests') {
       steps {
         sh '''
-
-           clear_etcd() {
-             kubectl -n voltha exec $(kubectl -n voltha get pods -lapp=etcd -o=name) -- sh -c "ETCDCTL_API=3 etcdctl del --prefix $1"
-           }
-
            mkdir -p $WORKSPACE/RobotLogs
            git clone https://gerrit.opencord.org/voltha-system-tests
            cd kind-voltha
@@ -96,12 +91,6 @@
              make -C $WORKSPACE/voltha-system-tests ${makeTarget}
              echo "Completed run: \$i"
              echo ""
-             if [[ \$i -lt ${testRuns} ]]
-             then
-               # For testing multiple back-to-back runs
-               # 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 3e2e5a2..0b0034c 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -18,14 +18,14 @@
           time-trigger: "H H/3 * * *"
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-sanity-test-single-onu'
+          name: 'periodic-voltha-functional-test'
           build-node: 'qct-pod4-node2'
           default-image-tag: 'master'
           code-branch: 'master'
-          make-target: sanity-kind
+          make-target: functional-single-kind
           onus: 1
           pons: 1
-          time-trigger: "H H/3 * * *"
+          time-trigger: "H H/12 * * *"
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-system-test'
@@ -58,7 +58,6 @@
           make-target: scale-multi-kind
           onus: 2
           pons: 8
-          robot-args: '-v teardown_device:False'
           time-trigger: "H H/3 * * *"
 
       # Per-patchset Pod builds on Tucson pod