diff --git a/Jenkinsfile b/Jenkinsfile
index f2d6fc0af7781d..01545d8f923184 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,6 +79,10 @@ def withWorkers(name, preWorkerClosure = {}, workerClosures = [:]) {
         catchError {
           publishJunit()
         }
+
+        catchError {
+          runErrorReporter()
+        }
       }
     }
   }
@@ -143,6 +147,9 @@ def legacyJobRunner(name) {
               catchError {
                 publishJunit()
               }
+              catchError {
+                runErrorReporter()
+              }
             }
           }
         }
@@ -247,7 +254,7 @@ def runbld(script) {
 }
 
 def bash(script) {
-  sh "#!/bin/bash -x\n${script}"
+  sh "#!/bin/bash\n${script}"
 }
 
 def doSetup() {
@@ -261,3 +268,10 @@ def buildOss() {
 def buildXpack() {
   runbld "./test/scripts/jenkins_xpack_build_kibana.sh"
 }
+
+def runErrorReporter() {
+  bash """
+    source src/dev/ci_setup/setup_env.sh
+    node src/dev/failed_tests/cli
+  """
+}
diff --git a/src/dev/build/tasks/optimize_task.js b/src/dev/build/tasks/optimize_task.js
index 5dde9990f8e9c6..3ce5c8155c017a 100644
--- a/src/dev/build/tasks/optimize_task.js
+++ b/src/dev/build/tasks/optimize_task.js
@@ -47,7 +47,8 @@ export const OptimizeBuildTask = {
     await exec(log, kibanaScript, kibanaArgs, {
       cwd: build.resolvePath('.'),
       env: {
-        FORCE_DLL_CREATION: 'true'
+        FORCE_DLL_CREATION: 'true',
+        NODE_OPTIONS: '--max-old-space-size=3072',
       },
     });
 
diff --git a/src/dev/failed_tests/cli.js b/src/dev/failed_tests/cli.js
index a9f031448d6018..a046f70080c287 100644
--- a/src/dev/failed_tests/cli.js
+++ b/src/dev/failed_tests/cli.js
@@ -23,19 +23,15 @@ const { resolve } = require('path');
 process.chdir(resolve(__dirname, '../../..'));
 
 // JOB_NAME is formatted as `elastic+kibana+7.x` in some places and `elastic+kibana+7.x/JOB=kibana-intake,node=immutable` in others
-
 const jobNameSplit = (process.env.JOB_NAME || '').split(/\+|\//);
 const branch = jobNameSplit.length >= 3 ? jobNameSplit[2] : process.env.GIT_BRANCH;
-
-const isPr = !!process.env.ghprbPullId;
-
 if (!branch) {
   console.log('Unable to determine originating branch from job name or other environment variables');
   process.exit(1);
 }
 
+const isPr = !!process.env.ghprbPullId;
 const isMasterOrVersion = branch.match(/^(origin\/){0,1}master$/) || branch.match(/^(origin\/){0,1}\d+\.(x|\d+)$/);
-
 if (!isMasterOrVersion || isPr) {
   console.log('Failure issues only created on master/version branch jobs');
   process.exit(0);
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index 1c77192b950c3e..bd26ec1ff4cc15 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
 
-if [[ "$IS_PIPELINE_JOB" ]] ; then
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+else
   source src/dev/ci_setup/setup_env.sh
 fi
 
diff --git a/test/scripts/jenkins_unit.sh b/test/scripts/jenkins_unit.sh
index b5ae3724ce37c8..fc379ec1c5ecc2 100755
--- a/test/scripts/jenkins_unit.sh
+++ b/test/scripts/jenkins_unit.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+fi
 
 export TEST_BROWSER_HEADLESS=1
 
diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh
index 37c7e2f4d5b699..d6a95d8e026c02 100755
--- a/test/scripts/jenkins_xpack.sh
+++ b/test/scripts/jenkins_xpack.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+fi
 
 export TEST_BROWSER_HEADLESS=1
 
diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
index 6e9864870b1ec0..83c0042df43156 100755
--- a/test/scripts/jenkins_xpack_ci_group.sh
+++ b/test/scripts/jenkins_xpack_ci_group.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
 
-export TEST_BROWSER_HEADLESS=1
-
-if [[ "$IS_PIPELINE_JOB" ]] ; then
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+else
   source src/dev/ci_setup/setup_env.sh
 fi
 
+export TEST_BROWSER_HEADLESS=1
+
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
   echo " -> Ensuring all functional tests are in a ciGroup"
   cd "$XPACK_DIR"