diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 11f9f18..3149962 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -51,7 +51,7 @@
 
       # GRPC jobs
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-master-2-16-32-att-subscribers-grpc'
+          name: 'voltha-scale-measurements-master-2-16-32-att-subscribers-newoltapp'
           'disable-job': false
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
@@ -67,16 +67,9 @@
           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
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha1-voltha-core.default.svc:55558
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha1-voltha-adapter-openolt-api.default.svc:50060
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha1-voltha-core.default.svc:55558
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha1-voltha-adapter-openonu-api.default.svc:50060
-            --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
-            --set services.etcd.address=voltha-infra-etcd.default.svc:2379
-            --set global.tracing.enabled=true
           onosImg: matteoscandolo/voltha-onos:oltapp
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers-grpc'
+          name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers-newoltapp'
           'disable-job': false
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
@@ -93,16 +86,9 @@
           inMemoryEtcdStorage: false
           extraHelmFlags: >
             -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha1-voltha-core.default.svc:55558
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha1-voltha-adapter-openolt-api.default.svc:50060
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha1-voltha-core.default.svc:55558
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha1-voltha-adapter-openonu-api.default.svc:50060
-            --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
-            --set services.etcd.address=voltha-infra-etcd.default.svc:2379
-            --set global.tracing.enabled=true
           onosImg: 'matteoscandolo/voltha-onos:oltapp'
       - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers-grpc'
+          name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers-newoltapp'
           'disable-job': false
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
@@ -119,36 +105,8 @@
           inMemoryEtcdStorage: false
           extraHelmFlags: >
             --set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha1-voltha-core.default.svc:55558
-            --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha1-voltha-adapter-openolt-api.default.svc:50060
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha1-voltha-core.default.svc:55558
-            --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha1-voltha-adapter-openonu-api.default.svc:50060
-            --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
-            --set services.etcd.address=voltha-infra-etcd.default.svc:2379
-            --set global.tracing.enabled=true
           onosImg: 'matteoscandolo/voltha-onos:oltapp'
 
-      # OLT app rewrite jobs
-      - 'voltha-scale-measurements':
-          name: 'voltha-scale-measurements-master-2-16-32-att-subscribers-new-olt-app'
-          'disable-job': false
-          build-node: 'voltha-scale-1'
-          # trigger on Feb 29th (a.k.a only trigger it manually)
-          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'
-          onosImg: 'matteoscandolo/voltha-onos:oltapp'
-          openonuAdapterGoImg: 'gcgirish/voltha-openonu-adapter-go:syncFlow'
-
       # 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'