diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index 0f9d373..a5a6ba7 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -353,7 +353,8 @@
         outputPath: 'RobotLogs',
         passThreshold: 100,
         reportFileName: '**/report*.html',
-        unstableThreshold: 0
+        unstableThreshold: 0,
+        onlyCritical: true
         ]);
       archiveArtifacts artifacts: '*.log,*.gz,*.tgz,etcd/*.log,*.txt'
     }
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index a2d9c8d..1104e21 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -320,7 +320,8 @@
         outputPath: 'RobotLogs',
         passThreshold: 100,
         reportFileName: '**/report*.html',
-        unstableThreshold: 0
+        unstableThreshold: 0,
+        onlyCritical: true
         ]);
       archiveArtifacts artifacts: '*.log,*.gz,*.tgz,etcd/*.log'
     }
diff --git a/jjb/pipeline/voltha-physical-soak-dt-tests.groovy b/jjb/pipeline/voltha-physical-soak-dt-tests.groovy
index bc23869..e8659cc 100644
--- a/jjb/pipeline/voltha-physical-soak-dt-tests.groovy
+++ b/jjb/pipeline/voltha-physical-soak-dt-tests.groovy
@@ -291,7 +291,8 @@
         outputPath: 'RobotLogs',
         passThreshold: 100,
         reportFileName: '**/report*.html',
-        unstableThreshold: 0
+        unstableThreshold: 0,
+        onlyCritical: true
         ]);
       archiveArtifacts artifacts: '*.log,*.gz,*.tgz,etcd/*.log'
     }
diff --git a/jjb/pipeline/voltha-physical-soak-tests.groovy b/jjb/pipeline/voltha-physical-soak-tests.groovy
index 080efd1..9982fc2 100644
--- a/jjb/pipeline/voltha-physical-soak-tests.groovy
+++ b/jjb/pipeline/voltha-physical-soak-tests.groovy
@@ -227,7 +227,8 @@
         outputPath: 'RobotLogs',
         passThreshold: 100,
         reportFileName: '**/report*.html',
-        unstableThreshold: 0
+        unstableThreshold: 0,
+        onlyCritical: true
         ]);
       archiveArtifacts artifacts: '*.log,*.gz,*.tgz,etcd/*.log'
     }
diff --git a/jjb/pipeline/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
index 1b5cc40..557df9e 100644
--- a/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
@@ -303,7 +303,8 @@
         outputPath: 'RobotLogs',
         passThreshold: 100,
         reportFileName: '**/report*.html',
-        unstableThreshold: 0
+        unstableThreshold: 0,
+        onlyCritical: true
         ]);
       archiveArtifacts artifacts: '*.log,*.gz,*.tgz'
     }
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index b01d88a..acde129 100755
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -159,7 +159,8 @@
     outputPath: '.',
     passThreshold: 100,
     reportFileName: "RobotLogs/*/report*.html",
-    unstableThreshold: 0]);
+    unstableThreshold: 0,
+    onlyCritical: true]);
 }
 
 pipeline {
diff --git a/jjb/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index c954670..2e0f73e 100644
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -234,7 +234,8 @@
          outputPath: '.',
          passThreshold: 100,
          reportFileName: 'RobotLogs/*/report*.html',
-         unstableThreshold: 0]);
+         unstableThreshold: 0,
+         onlyCritical: true]);
       archiveArtifacts artifacts: '*.log,**/*.log,**/*.gz,*.gz,*.txt,**/*.txt'
     }
   }
diff --git a/jjb/pipeline/voltha/master/tucson-build-and-test.groovy b/jjb/pipeline/voltha/master/tucson-build-and-test.groovy
index 5c10f82..b644705 100644
--- a/jjb/pipeline/voltha/master/tucson-build-and-test.groovy
+++ b/jjb/pipeline/voltha/master/tucson-build-and-test.groovy
@@ -354,7 +354,8 @@
         outputPath: '.',
         passThreshold: 100,
         reportFileName: 'RobotLogs/report*.html',
-        unstableThreshold: 0]);
+        unstableThreshold: 0,
+        onlyCritical: true]);
       archiveArtifacts artifacts: '**/*.txt,**/*.gz,*.gz,**/*.log'
     }
   }
diff --git a/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy
index c36a847..c58f61c 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy
@@ -253,7 +253,8 @@
         outputPath: '.',
         passThreshold: 100,
         reportFileName: 'RobotLogs/**/report.html',
-        unstableThreshold: 0]);
+        unstableThreshold: 0,
+        onlyCritical: true]);
       // get all the logs from kubernetes PODs
       sh returnStdout: false, script: '''
 
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index 13e7a89..e22152c 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -606,7 +606,8 @@
         outputPath: 'RobotLogs',
         passThreshold: 100,
         reportFileName: '**/report*.html',
-        unstableThreshold: 0]);
+        unstableThreshold: 0,
+        onlyCritical: true]);
       // get all the logs from kubernetes PODs
       sh returnStdout: false, script: '''