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':
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 3a3cc91..5f423ff 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -64,6 +64,7 @@
           withDhcp: true
           withIgmp: 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'
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'
@@ -80,6 +81,7 @@
           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-2-16-32-tt-subscribers'
@@ -102,6 +104,7 @@
             --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
+          onosImg: 'matteoscandolo/voltha-onos:oltapp'
 
       # multi-stack jobs
       - 'voltha-scale-measurements':
@@ -122,6 +125,7 @@
           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'
@@ -141,6 +145,7 @@
           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'
@@ -160,6 +165,7 @@
           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 a02c14c..e908af9 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -64,6 +64,7 @@
           VolthaEtcdPort: 9999
           num-of-onos: '3'
           num-of-atomix: '3'
+          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # flex pod1 test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -115,6 +116,7 @@
           VolthaEtcdPort: 9999
           num-of-onos: '3'
           num-of-atomix: '3'
+          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -178,6 +180,7 @@
           reinstall-olt: true
           enableMultiUni: true
           uniPortMask: '0x0003'
+          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -205,6 +208,7 @@
           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':
@@ -230,6 +234,7 @@
           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':
@@ -288,6 +293,7 @@
           num-of-onus: 32
           num-of-ponports: 16
           logLevel: 'WARN'
+          extraHelmFlags: "--set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp"
 
       # ONF Menlo Soak POD test job - voltha-master branch
       # Run tests manually triggering the job
@@ -410,6 +416,7 @@
           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':
@@ -435,6 +442,7 @@
           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':