diff --git a/jjb/pipeline/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha-scale-multi-stack.groovy
index d8d9be9..c8c5323 100644
--- a/jjb/pipeline/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha-scale-multi-stack.groovy
@@ -202,15 +202,15 @@
         sh returnStdout: false, script: '''
           cd $WORKSPACE/kind-voltha/
 
-          ETCD_CHART=$HOME/teone/helm-charts/etcd
-          KAFKA_CHART=$HOME/teone/helm-charts/kafka
+          export ETCD_CHART=$HOME/teone/helm-charts/etcd
+          export KAFKA_CHART=$HOME/teone/helm-charts/kafka
 
           # KAFKA config
-          NUM_OF_KAFKA=${kafkaReplicas}
-          EXTRA_HELM_FLAGS+=' --set prometheus.kafka.enabled=true,prometheus.operator.enabled=true,prometheus.jmx.enabled=true,prometheus.operator.serviceMonitor.namespace=default '
+          export NUM_OF_KAFKA=${kafkaReplicas}
+          export EXTRA_HELM_FLAGS+=' --set prometheus.kafka.enabled=true,prometheus.operator.enabled=true,prometheus.jmx.enabled=true,prometheus.operator.serviceMonitor.namespace=default '
 
           # ETCD config
-          EXTRA_HELM_FLAGS+=" --set memoryMode=${inMemoryEtcdStorage} "
+          export EXTRA_HELM_FLAGS+=" --set memoryMode=${inMemoryEtcdStorage} "
 
           NAME=infra JUST_INFRA=y ./voltha up
 
@@ -490,8 +490,8 @@
 
           for bbsim in "\${IDS[@]}"
           do
-            kubectl -n ${stack_ns} exec -t \$bbsim -- bbsimctl onu list > $LOG_FOLDER/$bbsim-device-list.txt || true
-            kubectl -n ${stack_ns} exec -t \$bbsim -- bbsimctl service list > $LOG_FOLDER/$bbsim-service-list.txt || true
+            kubectl -n ${stack_ns} exec -t \$bbsim -- bbsimctl onu list > $LOG_FOLDER/\$bbsim-device-list.txt || true
+            kubectl -n ${stack_ns} exec -t \$bbsim -- bbsimctl service list > $LOG_FOLDER/\$bbsim-service-list.txt || true
           done
           """
         }
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 9e08b81..856aa7c 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -75,8 +75,8 @@
           withMonitoring: false
           volthaStacks: 2
           olts: 2
-          pons: 8
-          onus: 16
+          pons: 16
+          onus: 32
           withFlows: true
           provisionSubscribers: true
           withEapol: true
@@ -86,6 +86,7 @@
           withPcap: true
           volthaSystemTestsChange: refs/changes/27/21627/2
           kindVolthaChange: refs/changes/85/21485/8
+          openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:topic
 
 
       # jobs for 512 ONUs with a 8 openonu-adapters and clustered ONOS (1 OLT)