diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index af074db..b393d38 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -24,7 +24,9 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
+          extraHelmFlags: >
+            --set global.image_tag=master--set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-single-kind
@@ -57,7 +59,9 @@
           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 onu=2,pon=2
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-multi-olt
@@ -140,7 +144,9 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multi-uni-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          extraHelmFlags: >
+            --set global.image_tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-single-kind-multiuni-att
@@ -163,7 +169,9 @@
           name: 'periodic-voltha-multi-uni-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 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          extraHelmFlags: >
+            --set global.image_tag=master --set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-multiuni-multiolt-att
@@ -235,7 +243,9 @@
       - '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=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           time-trigger: "H H/12 * * *"
           logLevel: 'DEBUG'
           testTargets: |
@@ -471,7 +481,9 @@
       - '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 onu=2,pon=2
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           olts: 2
           logLevel: 'DEBUG'
           testTargets: |
@@ -846,7 +858,9 @@
           name: 'periodic-voltha-etcd-test'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           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 onu=2,pon=2
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           time-trigger: "H H/12 * * *"
           testTargets: |
             - target: sanity-multi-kind
@@ -873,7 +887,9 @@
           name: 'periodic-voltha-sanity-test-multi-runs'
           code-branch: 'master'
           time-trigger: "H H/23 * * *"
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
+          extraHelmFlags: >
+            --set global.image_tag=master --set onu=2,pon=2
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           testTargets: |
             - target: sanity-kind
               workflow: att
@@ -938,7 +954,9 @@
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
           time-trigger: "@daily"
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          extraHelmFlags: >
+            --set global.image_tag=master
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           testTargets: |
             - target: sanity-kind-dt
               workflow: dt
@@ -949,7 +967,9 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
+          extraHelmFlags: >
+            --set global.image_tag=master --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           time-trigger: "H H/23 * * *"
           robot-args: '-v unitag_sub:True'
           testTargets: |
@@ -972,7 +992,9 @@
       # ATT Per-patchset Pod builds on Tucson pod (master)
       - 'verify_physical_voltha_patchset_auto':
           name: 'verify_physical_voltha_patchset_auto'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
+          extraHelmFlags: >
+            --set global.image_tag=master --set global.log_level=debug
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           workflow: 'att'
           branch-pattern: master
 
@@ -990,7 +1012,9 @@
           name: 'verify_physical_voltha_patchset_manual'
           trigger-string: 'hardware test'
           branch-pattern: master
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
+          extraHelmFlags: >
+            --set global.image_tag=master --set global.log_level=debug
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
           workflow: 'att'
 
       # ATT Manual Pod builds on Tucson pod (voltha-2.8)
@@ -1009,7 +1033,9 @@
           trigger-string: 'DT hardware test'
           default-test-args: '-i sanityDt -i PowerSwitch -X'
           branch-pattern: master
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
+          extraHelmFlags: >
+            --set global.image_tag=master --set global.log_level=debug
+            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
 
       # DT Manual Pod builds on Tucson pod  (voltha-2.8)
       - 'verify_physical_voltha_patchset_manual':