diff --git a/ci/parameters.yml b/ci/parameters.yml
index a013b4eedb..420bfc284f 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -7,5 +7,7 @@ docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io/"
 branch: "2.0.x"
 build-name: "spring-boot"
+pipeline-name: "spring-boot-2.0.x"
+concourse-url: "https://ci.spring.io"
 bintray-subject: "spring"
 bintray-repo: "jars"
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 31118a79e9..fe56fcdebe 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -142,6 +142,9 @@ jobs:
         file: git-repo/ci/tasks/determine-email-body.yml
         params:
           STATE: failure
+          BUILD_PIPELINE_NAME: ((pipeline-name))
+          BUILD_JOB_NAME: build
+          CONCOURSE_URL: ((concourse-url))
       - put: email-notification
         params:
           subject: email-details/subject
@@ -152,6 +155,9 @@ jobs:
       file: git-repo/ci/tasks/determine-email-body.yml
       params:
         STATE: success
+        BUILD_PIPELINE_NAME: ((pipeline-name))
+        BUILD_JOB_NAME: build
+        CONCOURSE_URL: ((concourse-url))
   - put: repo-status-build
     params: { state: "success", commit: "git-repo" }
   - put: email-notification
diff --git a/ci/scripts/determine-email-body.sh b/ci/scripts/determine-email-body.sh
index bcb421b81c..d793ecee0b 100755
--- a/ci/scripts/determine-email-body.sh
+++ b/ci/scripts/determine-email-body.sh
@@ -1,24 +1,25 @@
 #!/bin/bash
 set -e
 
-PREV_SHA=$(git rev-parse HEAD^1)
+pushd git-repo > /dev/null
+	PREV_SHA=$(git rev-parse HEAD^1)
+popd > /dev/null
 PREV_STATUSES=$(curl https://api.github.com/repos/spring-projects/spring-boot/commits/$PREV_SHA/statuses)
-PREV_STATES=echo $PREV_STATUSES | jq -r '.[]  | select(.context == "build") | .state'
+PREV_STATES=$(echo $PREV_STATUSES | jq -r --arg BUILD_JOB_NAME "$BUILD_JOB_NAME" '.[]  | select(.context == $BUILD_JOB_NAME) | .state')
 WAS_PREV_SUCCESSFUL=$(echo $PREV_STATES | grep 'success')
 
 if [[ $STATE == "success" ]];then
-	echo "Build SUCCESSFUL ${BUILD_PIPELINE_NAME} / ${BUILD_JOB_NAME} / ${BUILD_NAME}" > email-details/subject
+	echo "Build SUCCESSFUL ${BUILD_PIPELINE_NAME} / ${BUILD_JOB_NAME}" > email-details/subject
 	if [[ $WAS_PREV_SUCCESSFUL == "" ]];then
-    	echo "Build ${ATC_EXTERNAL_URL}/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME} is successful!" > email-details/body
+    	echo "Build ${CONCOURSE_URL}/teams/spring-boot/pipelines/${BUILD_PIPELINE_NAME} is successful!" > email-details/body
 	elif [[ $WAS_PREV_SUCCESSFUL == "success" ]];then
-		echo "" > email-details/body
+		touch email-details/body
 	fi
-fi
 elif [[ $STATE == "failure" ]];then
-	echo "Build ${ATC_EXTERNAL_URL}/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME} has failed!" > email-details/body
+	echo "Build ${CONCOURSE_URL}/teams/spring-boot/pipelines/${BUILD_PIPELINE_NAME} has failed!" > email-details/body
 	if [[ $WAS_PREV_SUCCESSFUL == "" ]];then
-		echo "Still FAILING ${BUILD_PIPELINE_NAME} / ${BUILD_JOB_NAME} / ${BUILD_NAME}" > email-details/subject
+		echo "Still FAILING ${BUILD_PIPELINE_NAME} / ${BUILD_JOB_NAME}" > email-details/subject
 	elif [[ $WAS_PREV_SUCCESSFUL == "success" ]];then
-		echo "Build FAILURE ${BUILD_PIPELINE_NAME} / ${BUILD_JOB_NAME} / ${BUILD_NAME}" > email-details/subject
+		echo "Build FAILURE ${BUILD_PIPELINE_NAME} / ${BUILD_JOB_NAME}" > email-details/subject
 	fi
 fi