diff --git a/build.gradle.kts b/build.gradle.kts
index a1fe9bbcb7d..7ef9868b0ad 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
   id("dd-trace-java.config-inversion-linter")
   id("dd-trace-java.ci-jobs")
 
-  id("com.diffplug.spotless") version "8.4.0"
+  alias(libs.plugins.spotless)
   id("me.champeau.gradle.japicmp") version "0.4.3"
   id("com.github.spotbugs") version "6.5.10"
   id("de.thetaphi.forbiddenapis") version "3.10"
@@ -43,10 +43,10 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     tableTestFormatter(libs.versions.tabletest.formatter.get())
   }
   groovyGradle {
-    greclipse()
+    greclipse(libs.versions.greclipse.get())
   }
   groovy {
-    greclipse()
+    greclipse(libs.versions.greclipse.get())
   }
   kotlinGradle {
     ktlint(libs.versions.ktlint.get())
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 86c975353cc..e74f4807da9 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
   `java-gradle-plugin`
   `kotlin-dsl`
   `jvm-test-suite`
-  id("com.diffplug.spotless") version "8.4.0"
+  alias(libs.plugins.spotless)
 }
 
 // The buildSrc still needs to target Java 8 as build time instrumentation and muzzle plugin
diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
index bd36f275672..56626d7cf1f 100644
--- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
+++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.file.DuplicatesStrategy.INCLUDE
 
 plugins {
   java
-  id("com.diffplug.spotless") version "8.4.0"
+  alias(libs.plugins.spotless)
   alias(libs.plugins.shadow)
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 764461c9920..d8746d0960a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,8 +11,10 @@ spotbugs_annotations = "4.10.3"
 
 # Source code formatters
 google-java-format = "1.36.1"
+greclipse = "4.27" # Pinned. See: https://github.com/diffplug/spotless/issues/3013
 ktlint = "1.8.0"
 scalafmt = "3.11.5"
+spotless = "8.9.0"
 tabletest-formatter = "1.1.2"
 
 # DataDog libs and forks
@@ -200,3 +202,4 @@ spock = ["spock-core", "objenesis"]
 
 [plugins]
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index 3d6ab12be40..0bf8376e467 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -38,7 +38,7 @@ spotless {
     } else {
       target '*.gradle'
     }
-    greclipse().configFile(configPath + '/enforcement/spotless-groovy.properties')
+    greclipse(libs.versions.greclipse.get()).configFile(configPath + '/enforcement/spotless-groovy.properties')
   }
 
   kotlinGradle {
@@ -61,7 +61,7 @@ spotless {
         // so it formats Java files by default (unless `excludeJava` is used).
       }
       targetExclude(buildDirectoryFiles)
-      greclipse().configFile(configPath + '/enforcement/spotless-groovy.properties')
+      greclipse(libs.versions.greclipse.get()).configFile(configPath + '/enforcement/spotless-groovy.properties')
     }
   }
 
diff --git a/test-published-dependencies/build.gradle.kts b/test-published-dependencies/build.gradle.kts
index b9f87c679d4..942dcb27f2a 100644
--- a/test-published-dependencies/build.gradle.kts
+++ b/test-published-dependencies/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  id("com.diffplug.spotless") version "8.4.0"
+  alias(libs.plugins.spotless)
 }
 
 val sharedConfigDirectory = "$rootDir/../gradle"