diff --git a/project/Build.scala b/project/Build.scala
index 6339b26243e3..7ca187959306 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -345,9 +345,6 @@ object Build {
           buildScan
             .withPublishing(Publishing.onlyIf(_.authenticated))
             .withBackgroundUpload(!isInsideCI)
-            .withTag(if (isInsideCI) "CI" else "Local")
-            .withLinks(buildScan.links ++ GithubEnv.develocityLinks)
-            .withValues(buildScan.values ++ GithubEnv.develocityValues)
             .withObfuscation(buildScan.obfuscation.withIpAddresses(_.map(_ => "0.0.0.0")))
         )
         .withBuildCache(
diff --git a/project/GithubEnv.scala b/project/GithubEnv.scala
deleted file mode 100644
index 7e629d53f3a7..000000000000
--- a/project/GithubEnv.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-import scala.util.Properties
-import sbt.url
-import java.net.URL
-
-
-// https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/variables#default-environment-variables
-object GithubEnv {
-  lazy val repositoryVar: Option[(String, String)] = envVar("GITHUB_REPOSITORY")
-  lazy val runIdVar: Option[(String, String)] = envVar("GITHUB_RUN_ID")
-  lazy val shaVar: Option[(String, String)] = envVar("GITHUB_SHA")
-  lazy val workflowVar: Option[(String, String)] = envVar("GITHUB_WORKFLOW")
-
-  lazy val runUrl: Option[(String, URL)] =
-    for {
-      (_, repository) <- repositoryVar
-      (_, runId) <- runIdVar
-    } yield "GitHub Run" -> url(s"https://github.com/$repository/actions/runs/$runId")
-  lazy val treeUrl: Option[(String, URL)] =
-    for {
-      (_, repository) <- repositoryVar
-      (_, sha) <- shaVar
-    } yield "GitHub Commit" -> url(s"https://github.com/$repository/tree/$sha")
-
-
-  def develocityValues: Seq[(String, String)] = repositoryVar.toSeq ++ shaVar ++ workflowVar
-  def develocityLinks: Seq[(String, URL)] = runUrl.toSeq ++ treeUrl
-
-  private def envVar(key: String): Option[(String, String)] =
-    Properties.envOrNone(key).map(key -> _)
-}
diff --git a/project/plugins.sbt b/project/plugins.sbt
index fea55b9fd9e6..f8adc793095f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -27,4 +27,6 @@ resolvers +=
 
 addSbtPlugin("com.gradle" % "sbt-develocity" % "1.2.2-rc-1")
 
+addSbtPlugin("com.gradle" % "sbt-develocity-common-custom-user-data" % "1.1")
+
 addSbtPlugin("com.github.sbt" % "sbt-jdi-tools" % "1.2.0")