diff --git a/Jenkinsfile b/Jenkinsfile
index b6a36c79f877d..763ee95ddde99 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,8 +4,8 @@ library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
 kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
-  ciStats.trackBuild {
-    githubPr.withDefaultPrComments {
+  githubPr.withDefaultPrComments {
+    ciStats.trackBuild {
       catchError {
         retryable.enable()
         parallel([
@@ -53,10 +53,10 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
         ])
       }
     }
+  }
 
-    if (params.NOTIFY_ON_FAILURE) {
-      slackNotifications.onFailure()
-      kibanaPipeline.sendMail()
-    }
+  if (params.NOTIFY_ON_FAILURE) {
+    slackNotifications.onFailure()
+    kibanaPipeline.sendMail()
   }
 }
diff --git a/vars/githubPr.groovy b/vars/githubPr.groovy
index 965fb1d4e108e..9dad2f88de2ec 100644
--- a/vars/githubPr.groovy
+++ b/vars/githubPr.groovy
@@ -186,6 +186,7 @@ def getNextCommentMessage(previousCommentInfo = [:]) {
   }
 
   messages << getTestFailuresMessage()
+  messages << ciStats.getMetricsReport()
 
   if (info.builds && info.builds.size() > 0) {
     messages << getHistoryText(info.builds)