diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index c0e0bad..c6a5c2f 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -54,39 +54,6 @@
               logging: true
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-bbsim-new-olt-app'
-          code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=matteoscandolo/voltha-onos,onos-classic.image.tag=oltapp --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3'
-          time-trigger: "H H/23 * * *"
-          logLevel: DEBUG
-          testTargets: |
-            - target: functional-single-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-alarms-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-failurescenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-errorscenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: onos-ha-test
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-
-      - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-test-bbsim'
           code-branch: 'master'
           olts: 2
@@ -349,89 +316,6 @@
               logging: true
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-openonu-go-test-bbsim-new-olt-app'
-          code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=matteoscandolo/voltha-onos,onos-classic.image.tag=oltapp '
-          time-trigger: "H H/12 * * *"
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: 1t1gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t4gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: 1t8gem-openonu-go-adapter-test
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: mib-upload-templating-openonu-go-adapter-test
-              workflow: att
-              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: reconcile-openonu-go-adapter-test-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-passed-test
-              workflow: att
-              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
-              teardown: true
-              logging: true
-            - target: openonu-go-adapter-omci-hardening-failed-test
-              workflow: att
-              flags: "--set omci_response_rate=7"
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-omci-get-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-onu-flows-check-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-
-      - 'voltha-periodic-test':
           name: 'periodic-voltha-openonu-go-test-bbsim-2.8'
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
           code-branch: 'voltha-2.8'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index a15fda0..ef58d06 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -49,78 +49,10 @@
           withIgmp: false
           # extraHelmFlags: " -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn "
 
-      # new OLT App jobs
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-master-2-16-32-att-subscribers-newoltapp'
-          'disable-job': false
-          build-node: 'voltha-scale-1'
-          time-trigger: "H H/4 * * *"
-          # time-trigger: "H 0 29 2 *"
-          logLevel: INFO
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          withEapol: true
-          withDhcp: true
-          withIgmp: false
-          inMemoryEtcdStorage: false
-          extraHelmFlags: >
-            --set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn
-          onosImg: matteoscandolo/voltha-onos:oltapp
-          withMonitoring: false
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers-newoltapp'
-          'disable-job': false
-          build-node: 'voltha-scale-1'
-          time-trigger: "H H/4 * * *"
-          # time-trigger: "H 0 29 2 *"
-          logLevel: INFO
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          withEapol: false
-          withDhcp: false
-          withIgmp: false
-          workflow: dt
-          inMemoryEtcdStorage: false
-          extraHelmFlags: >
-            -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn
-          onosImg: 'matteoscandolo/voltha-onos:oltapp'
-          withMonitoring: false
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers-newoltapp'
-          'disable-job': false
-          build-node: 'voltha-scale-1'
-          time-trigger: "H H/4 * * *"
-          # time-trigger: "H 0 29 2 *"
-          logLevel: INFO
-          olts: 2
-          pons: 16
-          onus: 32
-          withFlows: true
-          provisionSubscribers: true
-          withEapol: false
-          withDhcp: true
-          withIgmp: true
-          workflow: tt
-          inMemoryEtcdStorage: false
-          extraHelmFlags: >
-            --set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn
-            --set global.rpc_timeout=30s,global.adapter_open_onu.timeout=30s,global.adapter_open_olt.timeout=30s,global.adapter_open_olt.rpc_timeout=30s
-          onosImg: 'matteoscandolo/voltha-onos:oltapp'
-          withMonitoring: false
-          openonuAdapterGoImg: matteoscandolo/voltha-openonu-adapter-go:meter-fix
-          onosStatInterval: 30
-          onosGroupInterval: 30
-
       # jobs for 1024 ONUs with openonu-go and clustered ONOS (2 OLTs)
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-att-subscribers'
-          'disable-job': true
+          'disable-job': false
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
           olts: 2
@@ -135,7 +67,7 @@
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'
-          'disable-job': true
+          'disable-job': false
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
           olts: 2
@@ -151,7 +83,7 @@
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
-          'disable-job': true
+          'disable-job': false
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
           olts: 2
@@ -165,7 +97,11 @@
           withIgmp: true
           onosReplicas: 3
           atomixReplicas: 3
-          extraHelmFlags: '--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn'
+          extraHelmFlags: >
+            --set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn
+            --set global.rpc_timeout=30s,global.adapter_open_onu.timeout=30s,global.adapter_open_olt.timeout=30s,global.adapter_open_olt.rpc_timeout=30s
+          onosStatInterval: 30
+          onosGroupInterval: 30
 
       # multi-stack jobs
       - 'voltha-scale-measurements':
@@ -186,7 +122,6 @@
           withDhcp: true
           withIgmp: false
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn"
-          onosImg: 'matteoscandolo/voltha-onos:oltapp'
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-10-stacks-2-16-32-dt-subscribers'
@@ -206,7 +141,6 @@
           withDhcp: false
           withIgmp: false
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn"
-          onosImg: 'matteoscandolo/voltha-onos:oltapp'
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-10-stacks-2-16-32-tt-subscribers'
@@ -226,7 +160,6 @@
           withDhcp: true
           withIgmp: true
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn"
-          onosImg: 'matteoscandolo/voltha-onos:oltapp'
 
       # voltha-2.8 Jobs
       - 'voltha-scale-measurements':
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index a62e0e0..a02c14c 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -205,7 +205,6 @@
           waitTimerForOltUp: 540
           VolthaEtcdPort: 9999
           time: '1'
-          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # Menlo pod test job - master test job uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -231,7 +230,6 @@
           in-band-management: true
           waitTimerForOltUp: 540
           time: '6'
-          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -262,7 +260,6 @@
           in-band-management: true
           time: '11'
           pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
-          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -277,7 +274,6 @@
           profile: '1T8GEM'
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
           power-switch: True
-          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # ONF Menlo Soak POD build job - voltha-master branch
       - 'build_voltha_pod_manual':
@@ -414,7 +410,6 @@
           num-of-onos: '3'
           num-of-atomix: '3'
           time: '16'
-          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # Berlin POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -440,7 +435,6 @@
           num-of-onos: '3'
           num-of-atomix: '3'
           time: '1'
-          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':