diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 1c5a0f64cc..fbf2ef5424 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -260,12 +260,33 @@ jobs:
       do:
       - put: repo-status-jdk9-build
         params: { state: "failure", commit: "git-repo" }
+      - task: determine-email-body
+        image: spring-boot-ci-image
+        file: git-repo/ci/tasks/determine-email-body.yml
+        params:
+          STATE: failure
+          BUILD_PIPELINE_NAME: ((pipeline-name))
+          BUILD_JOB_NAME: jdk9-build
+          CONCOURSE_URL: ((concourse-url))
       - put: email-notification
         params:
-          subject_text: "JDK 9 Build failure ${BUILD_PIPELINE_NAME} / ${BUILD_JOB_NAME} / ${BUILD_NAME}"
-          body_text: "Build ${ATC_EXTERNAL_URL}/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME} has failed!"
+          subject: email-details/subject
+          body: email-details/body
+  - do:
+    - task: determine-email-body
+      image: spring-boot-ci-image
+      file: git-repo/ci/tasks/determine-email-body.yml
+      params:
+        STATE: success
+        BUILD_PIPELINE_NAME: ((pipeline-name))
+        BUILD_JOB_NAME: jdk9-build
+        CONCOURSE_URL: ((concourse-url))
   - put: repo-status-jdk9-build
     params: { state: "success", commit: "git-repo" }
+  - put: email-notification
+    params:
+      subject: email-details/subject
+      body: email-details/body
 - name: jdk10-build
   serial: true
   public: true
@@ -298,12 +319,33 @@ jobs:
       do:
       - put: repo-status-jdk10-build
         params: { state: "failure", commit: "git-repo" }
+      - task: determine-email-body
+        image: spring-boot-ci-image
+        file: git-repo/ci/tasks/determine-email-body.yml
+        params:
+          STATE: failure
+          BUILD_PIPELINE_NAME: ((pipeline-name))
+          BUILD_JOB_NAME: jdk10-build
+          CONCOURSE_URL: ((concourse-url))
       - put: email-notification
         params:
-          subject_text: "JDK 10 Build failure ${BUILD_PIPELINE_NAME} / ${BUILD_JOB_NAME} / ${BUILD_NAME}"
-          body_text: "Build ${ATC_EXTERNAL_URL}/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME} has failed!"
+          subject: email-details/subject
+          body: email-details/body
+  - do:
+    - task: determine-email-body
+      image: spring-boot-ci-image
+      file: git-repo/ci/tasks/determine-email-body.yml
+      params:
+        STATE: success
+        BUILD_PIPELINE_NAME: ((pipeline-name))
+        BUILD_JOB_NAME: jdk10-build
+        CONCOURSE_URL: ((concourse-url))
   - put: repo-status-jdk10-build
     params: { state: "success", commit: "git-repo" }
+  - put: email-notification
+    params:
+      subject: email-details/subject
+      body: email-details/body
 - name: stage-milestone
   serial: true
   plan: