diff --git a/Jenkinsfile b/Jenkinsfile
index 996406928021..f9a939533180 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,6 +41,10 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
           ])
         }
         node('flyweight') {
+          // If the build doesn't have a result set by this point, there haven't been any errors and it can be marked as a success
+          // The e-mail plugin for the infra e-mail depends upon this being set
+          currentBuild.result = currentBuild.result ?: 'SUCCESS'
+
           sendMail()
         }
       }
@@ -233,9 +237,8 @@ def sendKibanaMail() {
   catchError {
     if(params.NOTIFY_ON_FAILURE && currentBuild.result != 'SUCCESS' && currentBuild.result != 'ABORTED') {
       emailext(
-        // to: 'build-kibana@elastic.co',
-        to: 'brian.seeders@elastic.co', // TODO switch this out after testing
-        subject: "${env.PROJECT_NAME} - Build # ${env.BUILD_NUMBER} - ${currentBuild.result}",
+        to: 'build-kibana@elastic.co',
+        subject: "${env.JOB_NAME} - Build # ${env.BUILD_NUMBER} - ${currentBuild.result}",
         body: '${SCRIPT,template="groovy-html.template"}',
         mimeType: 'text/html',
       )