diff --git a/jjb/pipeline/voltha/master/tucson-build-and-test.groovy b/jjb/pipeline/voltha/master/tucson-build-and-test.groovy
index d400681..f2070fe 100644
--- a/jjb/pipeline/voltha/master/tucson-build-and-test.groovy
+++ b/jjb/pipeline/voltha/master/tucson-build-and-test.groovy
@@ -114,15 +114,15 @@
             if (volthaHelmChartsChange != "" || gerritProject == "voltha-helm-charts") {
               localCharts = true
             }
-            def extraHelmFlags = "-f $WORKSPACE/${configBaseDir}/${configKubernetesDir}/voltha/${configFileName}.yml ${imageFlags} "
+            def flags = "-f $WORKSPACE/${configBaseDir}/${configKubernetesDir}/voltha/${configFileName}.yml ${imageFlags} "
             // NOTE temporary workaround expose ONOS node ports (pod-config needs to be updated to contain these values)
-            extraHelmFlags = extraHelmFlags + "--set onos-classic.onosSshPort=30115 " +
+            flags = flags + "--set onos-classic.onosSshPort=30115 " +
             "--set onos-classic.onosApiPort=30120 " +
             "--set onos-classic.onosOfPort=31653 " +
-            "--set onos-classic.individualOpenFlowNodePorts=true "
+            "--set onos-classic.individualOpenFlowNodePorts=true " + extraHelmFlags
             volthaDeploy([
               workflow: workFlow.toLowerCase(),
-              extraHelmFlags: extraHelmFlags,
+              extraHelmFlags: flags,
               localCharts: localCharts,
               kubeconfig: "$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf",
               onosReplica: 3,
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 9e359af..40c4de5 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -305,6 +305,7 @@
       - 'verify_physical_voltha_patchset_auto':
           name: 'verify_physical_voltha_patchset_auto'
           default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
 
       # Per-patchset Pod builds on Tucson pod (voltha-2.7)
       - 'verify_physical_voltha_patchset_auto':
@@ -322,6 +323,7 @@
           trigger-string: 'hardware test'
           default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
           branch-pattern: master
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
 
 
       # Per-patchset Pod builds on Tucson pod  (master)
@@ -333,6 +335,7 @@
           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'
 
       # Per-patchset Pod builds on Tucson pod (voltha-2.7)
       - 'verify_physical_voltha_patchset_manual':
@@ -368,6 +371,7 @@
           oltDebVersionVoltha23: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
           profile: 'Default'
           default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
 
 - job-template:
     id: 'voltha-periodic-test'
@@ -856,6 +860,11 @@
           default: '{workflow}'
           description: 'Installs and uses the specified work flow on the POD'
 
+      - string:
+          name: extraHelmFlags
+          default: '{extraHelmFlags}'
+          description: 'Helm flags (passed to each helm command)'
+
       # deprecated parameters, remove after VOLTHA-2.8 is released
       - string:
           name: deploymentConfigFile
@@ -918,6 +927,7 @@
     oltDebVersionVoltha23: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
     volthaSystemTestsChange: ''
     volthaHelmChartsChange: ''
+    extraHelmFlags: ''
 
     properties:
       - cord-infra-properties:
@@ -972,6 +982,7 @@
     volthaSystemTestsChange: ''
     volthaHelmChartsChange: ''
     workflow: 'att'
+    extraHelmFlags: ''
 
     properties:
       - cord-infra-properties: