diff --git a/build.gradle b/build.gradle
index 5775bdf6523..b28974ad630 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,6 @@ plugins {
 	id "com.github.ben-manes.versions" version '0.24.0'
 }
 
-apply from: "$rootDir/gradle/build-scan-user-data.gradle"
 ext {
 	moduleProjects = subprojects.findAll { it.name.startsWith("spring-") }
 	javaProjects = subprojects - project(":framework-bom")
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index fb3d59fded0..f8b86d4cd9f 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -30,6 +30,7 @@ resources:
     branch: ((branch))
 - name: every-morning
   type: time
+  icon: alarm
   source:
     start: 8:00 AM
     stop: 9:00 AM
@@ -166,7 +167,11 @@ jobs:
         params: { state: "failure", commit: "git-repo" }
       - put: slack-alert
         params:
-          text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>"
+          text: >
+            :concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
+            [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
+            [<$TEXT_FILE_CONTENT|build scan>]
+          text_file: git-repo/build/build-scan-uri.txt
           silent: true
           icon_emoji: ":concourse:"
           username: concourse-ci
@@ -227,7 +232,11 @@ jobs:
         params: { state: "failure", commit: "git-repo" }
       - put: slack-alert
         params:
-          text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>"
+          text: >
+            :concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
+            [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
+            [<$TEXT_FILE_CONTENT|build scan>]
+          text_file: git-repo/build/build-scan-uri.txt
           silent: true
           icon_emoji: ":concourse:"
           username: concourse-ci
@@ -259,7 +268,11 @@ jobs:
             params: { state: "failure", commit: "git-repo" }
           - put: slack-alert
             params:
-              text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>"
+              text: >
+                :concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
+                [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
+                [<$TEXT_FILE_CONTENT|build scan>]
+              text_file: git-repo/build/build-scan-uri.txt
               silent: true
               icon_emoji: ":concourse:"
               username: concourse-ci
@@ -291,7 +304,11 @@ jobs:
             params: { state: "failure", commit: "git-repo" }
           - put: slack-alert
             params:
-              text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>"
+              text: >
+                :concourse-failed: ${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!
+                [<https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|build log>]
+                [<$TEXT_FILE_CONTENT|build scan>]
+              text_file: git-repo/build/build-scan-uri.txt
               silent: true
               icon_emoji: ":concourse:"
               username: concourse-ci
diff --git a/gradle/build-scan-user-data.gradle b/gradle/build-scan-user-data.gradle
deleted file mode 100644
index 156191d1152..00000000000
--- a/gradle/build-scan-user-data.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-addCustomJavaHomeMetadata()
-addCustomJavaSourceVersionMetadata()
-
-void addCustomJavaHomeMetadata() {
-	def customJavaHome = System.getProperty("customJavaHome")
-	if (customJavaHome) {
-		buildScan.value "Custom JAVA_HOME", customJavaHome
-	}
-}
-
-void addCustomJavaSourceVersionMetadata() {
-	def customJavaSourceVersion = System.getProperty("customJavaSourceVersion")
-	if (customJavaSourceVersion) {
-		buildScan.value "Custom Java Source Version", customJavaSourceVersion
-	}
-}
diff --git a/settings.gradle b/settings.gradle
index 1eb14494dd7..996a10b47c5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -41,3 +41,21 @@ rootProject.name = "spring"
 rootProject.children.each {project ->
 	project.buildFileName = "${project.name}.gradle"
 }
+
+settings.gradle.projectsLoaded {
+	gradleEnterprise {
+		buildScan {
+			if (settings.gradle.rootProject.hasProperty('customJavaHome')) {
+				value("Custom JAVA_HOME", settings.gradle.rootProject.getProperty('customJavaHome'))
+			}
+			if (settings.gradle.rootProject.hasProperty('customJavaSourceVersion')) {
+				value("Custom Java Source Version", settings.gradle.rootProject.getProperty('customJavaSourceVersion'))
+			}
+			settings.gradle.rootProject.getBuildDir().mkdirs()
+			new File(settings.gradle.rootProject.getBuildDir(), "build-scan-uri.txt").text = "(build scan not generated)"
+			buildScanPublished { scan ->
+				new File(settings.gradle.rootProject.getBuildDir(), "build-scan-uri.txt").text = "${scan.buildScanUri}\n"
+			}
+		}
+	}
+}