diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index b6d725b..c789fdd 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -274,9 +274,10 @@
               fi
             """
             def extraHelmFlags = env.EXTRA_HELM_FLAGS + " -f $WORKSPACE/voltha-helm-charts/examples/${workflow}-values.yaml "
-            def infraHelmFlags = extraHelmFlags +
+            def infraHelmFlags =
               " --set etcd.enabled=false,kafka.enabled=false" +
-              " --set global.log_level=${logLevel}"
+              " --set global.log_level=${logLevel} " +
+              extraHelmFlags
 
             volthaInfraDeploy([
               workflow: workflow,
@@ -287,7 +288,7 @@
               atomixReplica: atomixReplicas,
             ])
 
-            def stackHelmFlags = extraHelmFlags + "${ofAgentConnections(onosReplicas.toInteger(), "voltha-infra", "default")} " +
+            def stackHelmFlags = "${ofAgentConnections(onosReplicas.toInteger(), "voltha-infra", "default")} " +
                 "--set voltha.services.kafka.adapter.address=kafka.default.svc:9092 " +
                 "--set voltha.services.kafka.cluster.address=kafka.default.svc:9092 " +
                 "--set voltha.services.etcd.address=etcd.default.svc:2379 " +
@@ -299,6 +300,7 @@
                 "--set voltha-adapter-openonu.services.etcd.address=etcd.default.svc:2379"
 
             stackHelmFlags += " --set onu=${onus},pon=${pons} --set global.log_level=${logLevel.toLowerCase()} "
+            stackHelmFlags += extraHelmFlags
 
             volthaStackDeploy([
               bbsimReplica: olts.toInteger(),
diff --git a/vars/volthaInfraDeploy.groovy b/vars/volthaInfraDeploy.groovy
index e7af5e2..4f828fd 100644
--- a/vars/volthaInfraDeploy.groovy
+++ b/vars/volthaInfraDeploy.groovy
@@ -48,8 +48,8 @@
     """
     // TODO support multiple replicas
     sh """
-    helm upgrade --install --create-namespace -n ${cfg.infraNamespace} voltha-infra ${volthaInfraChart} ${cfg.extraHelmFlags} \
+    helm upgrade --install --create-namespace -n ${cfg.infraNamespace} voltha-infra ${volthaInfraChart} \
           --set onos-classic.replicas=${cfg.onosReplica},onos-classic.atomix.replicas=${cfg.atomixReplica} \
-          -f $WORKSPACE/voltha-helm-charts/examples/${cfg.workflow}-values.yaml
+          -f $WORKSPACE/voltha-helm-charts/examples/${cfg.workflow}-values.yaml ${cfg.extraHelmFlags}
     """
 }
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 0b0d116..b39c84f 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -33,18 +33,20 @@
     println "Deploying VOLTHA Stack with the following parameters: ${cfg}."
 
     sh """
-    helm upgrade --install --create-namespace -n ${cfg.volthaNamespace} ${cfg.stackName} ${volthaStackChart} ${cfg.extraHelmFlags} \
+    helm upgrade --install --create-namespace -n ${cfg.volthaNamespace} ${cfg.stackName} ${volthaStackChart} \
           --set global.stack_name=${cfg.stackName} \
           --set global.voltha_infra_name=voltha-infra \
           --set global.voltha_infra_namespace=${cfg.infraNamespace} \
+          ${cfg.extraHelmFlags}
     """
 
     for(int i = 0;i<cfg.bbsimReplica;i++) {
       // TODO differentiate olt_id between different stacks
        sh """
-         helm upgrade --install --create-namespace -n ${cfg.volthaNamespace} bbsim${i} onf/bbsim ${cfg.extraHelmFlags} \
+         helm upgrade --install --create-namespace -n ${cfg.volthaNamespace} bbsim${i} onf/bbsim \
          --set olt_id="${cfg.stackId}${i}" \
-         -f $WORKSPACE/voltha-helm-charts/examples/${cfg.workflow}-values.yaml
+         -f $WORKSPACE/voltha-helm-charts/examples/${cfg.workflow}-values.yaml \
+         ${cfg.extraHelmFlags}
        """
     }