diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index c33e48b..07cf657 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -85,21 +85,14 @@
         if [ "${params.branch}" == "master" ]; then
            set +e
 
-           voltctl log level list
-           if [ \$? -ne 0 ]
-           then
-             export KVSTORE="-e \$(kubectl -n voltha get svc voltha-etcd-cluster-client -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')"
-           else
-             export KVSTORE=""
-           fi
 
         # Remove noise from voltha-core logs
-           voltctl \$KVSTORE log level set WARN read-write-core#github.com/opencord/voltha-go/db/model
-           voltctl \$KVSTORE log level set WARN read-write-core#github.com/opencord/voltha-lib-go/v3/pkg/kafka
+           voltctl log level set WARN read-write-core#github.com/opencord/voltha-go/db/model
+           voltctl log level set WARN read-write-core#github.com/opencord/voltha-lib-go/v3/pkg/kafka
         # Remove noise from openolt logs
-           voltctl \$KVSTORE log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/db
-           voltctl \$KVSTORE log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/probe
-           voltctl \$KVSTORE log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
+           voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/db
+           voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/probe
+           voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
         fi
         """
       }
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 76e56b9..3286fbb 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -437,7 +437,7 @@
 
       - string:
           name: extraRobotArgs
-          default: '-i sanityORDeleteOLT'
+          default: '-i sanityORDeleteOLT -X'
           description: 'Arguments to pass to robot'
 
     project-type: pipeline
@@ -579,7 +579,7 @@
 
       - string:
           name: extraRobotArgs
-          default: '-i sanityORDeleteOLT'
+          default: '-i sanityORDeleteOLT -X'
           description: 'Arguments to pass to robot'
 
     project-type: pipeline
@@ -722,7 +722,7 @@
 
       - string:
           name: extraRobotArgs
-          default: '-e bbsim'
+          default: '-e bbsim -X'
           description: 'Arguments to pass to robot'
 
     project-type: pipeline
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 0b29ff5..a02386c 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -241,9 +241,9 @@
           extraHelmFlags: '--set memoryLimit=8192Mi --set defaults.rw_core.timeout=30s'
 
       # development pipeline
-      # - 'voltha-scale-measurements-dev':
-      #     name: 'voltha-scale-measurements-dev'
-      #     build-node: 'voltha-scale'
+      - 'voltha-scale-measurements-dev':
+          name: 'voltha-scale-measurements-dev'
+          build-node: 'voltha-scale'
 
 
 - job-template:
@@ -467,10 +467,10 @@
 
     dsl: !include-raw-escape: pipeline/{pipeline-script}
 
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 {time-trigger}
+    # triggers:
+    #   - timed: |
+    #              TZ=America/Los_Angeles
+    #              {time-trigger}
 
 - job-template:
     id: 'voltha-scale-measurements-dev'