diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle
index 89cef4c18bc..01dc8d4f8fe 100644
--- a/grails-bom/build.gradle
+++ b/grails-bom/build.gradle
@@ -41,7 +41,7 @@ ext {
         "net.java.dev.jna:jna::$jnaVersion",
         "org.apache.commons:commons-text::$commonsTextVersion",
         "commons-codec:commons-codec::$commonsCodecVersion",
-        "org.grails:grails-datastore-core::$datastoreVersion",
+        "org.grails:grails-datastore:core,gorm,gorm-support,gorm-validation:$datastoreVersion",
         "org.aspectj:aspectjrt::$aspectjVersion",
         "org.aspectj:aspectjweaver::$aspectjVersion",
         "jakarta.inject:jakarta.inject-api::$jakartaInjectVersion",
diff --git a/grails-plugin-domain-class/build.gradle b/grails-plugin-domain-class/build.gradle
index 49191b3aae0..81d0d267d18 100644
--- a/grails-plugin-domain-class/build.gradle
+++ b/grails-plugin-domain-class/build.gradle
@@ -4,12 +4,12 @@ dependencies {
     api project(":grails-plugin-validation")
 
     // Datastore APIs
-    api "org.grails:grails-datastore-gorm-validation:$datastoreVersion"
-    api("org.grails:grails-datastore-gorm:$datastoreVersion") {
+    api "org.grails:grails-datastore-gorm-validation"
+    api("org.grails:grails-datastore-gorm") {
         transitive = false
     }
-    api("org.grails:grails-datastore-gorm-support:$datastoreVersion") {
+    api("org.grails:grails-datastore-gorm-support") {
         transitive = false
     }
-    api "org.grails:grails-datastore-core:$datastoreVersion"
+    api "org.grails:grails-datastore-core"
 }
diff --git a/grails-plugin-i18n/build.gradle b/grails-plugin-i18n/build.gradle
index 779b7293cf6..94a9ef1aae6 100644
--- a/grails-plugin-i18n/build.gradle
+++ b/grails-plugin-i18n/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
     api project(":grails-web")
-    testCompileOnly "org.apache.groovy:groovy-ant:$groovyVersion"
+    testCompileOnly "org.apache.groovy:groovy-ant"
 }