diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 68a2458..b08885f 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -856,7 +856,7 @@
 
       - string:
           name: ntlFile
-          default: 'run.ntl'
+          default: 'ci.ntl'
           description: 'NG40 test automation file'
 
       - string:
diff --git a/jjb/pipeline/voltha-scale-matrix.groovy b/jjb/pipeline/voltha-scale-matrix.groovy
index 624b582..7cc810b 100644
--- a/jjb/pipeline/voltha-scale-matrix.groovy
+++ b/jjb/pipeline/voltha-scale-matrix.groovy
@@ -169,14 +169,14 @@
 
         sleep 60 # we have to wait for prometheus to collect all the information
 
-        python tests/scale/stats-aggregation.py -i \$IN_FOLDER -o \$OUT_FOLDER || true
+        python tests/scale/stats-aggregation.py -s \$IN_FOLDER -o \$OUT_FOLDER
         """
       }
     }
   }
   post {
     always {
-      archiveArtifacts artifacts: '*-install-minimal.log,*-minimal-env.sh,RobotLogs/**/*,stats/**/*'
+      archiveArtifacts artifacts: '*-install-minimal.log,*-minimal-env.sh,RobotLogs/**/*,stats/**/*,logs/**/*'
     }
   }
 }
@@ -238,7 +238,7 @@
       }
     }
     stage('Test topology: ' + list[i]['olt'] + "-" + list[i]['pon'] + "-" + list[i]['onu']) {
-      timeout(time: 10, unit: 'MINUTES') {
+      timeout(time: 15, unit: 'MINUTES') {
         sh returnStdout: false, script: """
         mkdir -p $WORKSPACE/RobotLogs/${list[i]['olt']}-${list[i]['pon']}-${list[i]['onu']}
         cd $WORKSPACE/voltha-system-tests
@@ -252,8 +252,6 @@
           -v withEapol:false \
           -v withDhcp:false \
           -v withIgmp:false \
-          --noncritical non-critical \
-          -e teardown \
           -e authentication \
           -e dhcp"
 
@@ -283,7 +281,7 @@
 
       sleep 60 # we have to wait for prometheus to collect all the information
 
-      python tests/scale/sizing.py -o \$LOG_FOLDER -s ${minutesDelta}|| true
+      python tests/scale/sizing.py -o \$LOG_FOLDER -s ${minutesDelta}
       """
     }
   }
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 514d995..c4e7a59 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -428,7 +428,7 @@
             _TAG=$_TAG bash $WORKSPACE/pprof.sh &
           fi
         '''
-        timeout(time: 11, unit: 'MINUTES') {
+        timeout(time: 15, unit: 'MINUTES') {
           sh '''
             ROBOT_PARAMS="-v olt:${olts} \
               -v pon:${pons} \
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index cf0cfc9..2624032 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -47,7 +47,7 @@
           ofAgentImg: andreacampanella/voltha-ofagent-go:meter-log
           rwCoreImg: andreacampanella/voltha-rw-core:meter-log
           withPcap: true
-          extraHelmFlags: '--set use_openonu_adapter_go=true'
+          extraHelmFlags: '--set use_openonu_adapter_go=true,authRetry=true,dhcpRetry=true'
 
       # this job will be used to test custom images without disrupting tests on master
       - 'voltha-scale-measurements':