diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 9cc7707..af074db 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -24,9 +24,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-test-bbsim'
           code-branch: 'master'
-          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
+          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 '
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-single-kind
@@ -59,9 +57,7 @@
           name: 'periodic-voltha-multiple-olts-test-bbsim'
           code-branch: 'master'
           olts: 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
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-multi-olt
@@ -144,9 +140,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multi-uni-test-bbsim'
           code-branch: 'master'
-          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
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-single-kind-multiuni-att
@@ -169,9 +163,7 @@
           name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim'
           code-branch: 'master'
           olts: 2
-          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
+          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'
           time-trigger: "H H/23 * * *"
           testTargets: |
             - target: functional-multiuni-multiolt-att
@@ -243,9 +235,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-openonu-go-test-bbsim'
           code-branch: 'master'
-          extraHelmFlags: >
-            --set global.image_tag=master
-            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
           time-trigger: "H H/12 * * *"
           logLevel: 'DEBUG'
           testTargets: |
@@ -481,9 +471,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim'
           code-branch: 'master'
-          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
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
           olts: 2
           logLevel: 'DEBUG'
           testTargets: |
@@ -858,9 +846,7 @@
           name: 'periodic-voltha-etcd-test'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
-          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
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
           time-trigger: "H H/12 * * *"
           testTargets: |
             - target: sanity-multi-kind
@@ -887,9 +873,7 @@
           name: 'periodic-voltha-sanity-test-multi-runs'
           code-branch: 'master'
           time-trigger: "H H/23 * * *"
-          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
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
           testTargets: |
             - target: sanity-kind
               workflow: att
@@ -954,9 +938,7 @@
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
           time-trigger: "@daily"
-          extraHelmFlags: >
-            --set global.image_tag=master
-            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
           testTargets: |
             - target: sanity-kind-dt
               workflow: dt
@@ -967,9 +949,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim'
           code-branch: 'master'
-          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
+          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 '
           time-trigger: "H H/23 * * *"
           robot-args: '-v unitag_sub:True'
           testTargets: |
@@ -992,9 +972,7 @@
       # 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 global.log_level=debug
-            --set onos-classic.image.repository=matteoscandolo/voltha-onos --set onos-classic.image.tag=oltapp
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
           workflow: 'att'
           branch-pattern: master
 
@@ -1012,9 +990,7 @@
           name: 'verify_physical_voltha_patchset_manual'
           trigger-string: 'hardware test'
           branch-pattern: master
-          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
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
           workflow: 'att'
 
       # ATT Manual Pod builds on Tucson pod (voltha-2.8)
@@ -1033,9 +1009,7 @@
           trigger-string: 'DT hardware test'
           default-test-args: '-i sanityDt -i PowerSwitch -X'
           branch-pattern: master
-          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
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
 
       # 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 5f423ff..3a3cc91 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -64,7 +64,6 @@
           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'
@@ -81,7 +80,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-2-16-32-tt-subscribers'
@@ -104,7 +102,6 @@
             --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':
@@ -125,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'
@@ -145,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'
@@ -165,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 e908af9..a02c14c 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -64,7 +64,6 @@
           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':
@@ -116,7 +115,6 @@
           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':
@@ -180,7 +178,6 @@
           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':
@@ -208,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':
@@ -234,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':
@@ -293,7 +288,6 @@
           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
@@ -416,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':
@@ -442,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':