diff --git a/jjb/pipeline/voltha/master/physical-build.groovy b/jjb/pipeline/voltha/master/physical-build.groovy
index 25cd2a0..a9cdc8b 100644
--- a/jjb/pipeline/voltha/master/physical-build.groovy
+++ b/jjb/pipeline/voltha/master/physical-build.groovy
@@ -44,6 +44,7 @@
       steps {
         getVolthaCode([
           branch: "${branch}",
+          volthaSystemTestsChange: "${volthaSystemTestsChange}",
           volthaHelmChartsChange: "${volthaHelmChartsChange}",
         ])
       }
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 7ba6eb5..6ab32d9 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -24,7 +24,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5'
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-single-kind
@@ -48,7 +48,7 @@
           name: 'periodic-voltha-multiple-olts-test-bbsim'
           code-branch: 'master'
           olts: 2
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5 --set onu=2,pon=2'
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-multi-olt
@@ -88,7 +88,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-openonu-go-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5'
           time-trigger: "H H/12 * * *"
           logLevel: 'DEBUG'
           testTargets: |
@@ -133,7 +133,7 @@
           name: 'patchset-voltha-openonu-go-test-bbsim'
           trigger-comment: "voltha test openonu singleolt"
           code-branch: '$GERRIT_BRANCH'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5'
           gerrit-project: '$GERRIT_PROJECT'
           gerritRefspec: '$GERRIT_REFSPEC'
           logLevel: 'DEBUG'
@@ -192,7 +192,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5 --set onu=2,pon=2'
           olts: 2
           logLevel: 'DEBUG'
           testTargets: |
@@ -260,7 +260,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-pm-data-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
           time-trigger: "H H/23 * * *"
           logLevel: 'DEBUG'
           testTargets: |
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 606c3bc..479541e 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -63,11 +63,11 @@
           withDhcp: true
           withIgmp: false
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml'
-          onosImg: andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix
+          onosImg: andreacampanella/voltha-onos:voltha-onos-2.5
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'
-          'disable-job': false
+          'disable-job': true
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
           olts: 2
@@ -80,10 +80,11 @@
           withDhcp: false
           withIgmp: false
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml '
+          onosImg: andreacampanella/voltha-onos:voltha-onos-2.5
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
-          'disable-job': false
+          'disable-job': true
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
           olts: 2
@@ -98,7 +99,7 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.rw_core.core_timeout=60s --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml '
-          onosImg: andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix
+          onosImg: andreacampanella/voltha-onos:voltha-onos-2.5
 
       # multi-stack jobs
       - 'voltha-scale-measurements':
@@ -164,7 +165,7 @@
       # voltha-2.7 Jobs
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.7-2-16-32-att-subscribers'
-          'disable-job': false
+          'disable-job': true
           pipeline-script: 'voltha/voltha-2.7/voltha-scale-test.groovy'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
@@ -188,7 +189,7 @@
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.7-2-16-32-dt-subscribers'
-          'disable-job': false
+          'disable-job': true
           pipeline-script: 'voltha/voltha-2.7/voltha-scale-test.groovy'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"
@@ -213,7 +214,7 @@
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-voltha-2.7-2-16-32-tt-subscribers'
-          'disable-job': false
+          'disable-job': true
           pipeline-script: 'voltha/voltha-2.7/voltha-scale-test.groovy'
           build-node: 'voltha-scale-1'
           time-trigger: "H H/4 * * *"