diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3fd5e29b4e3..29ffde6b08d 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -59,8 +59,8 @@ dependencies {
 
     implementation(libs.kotlinx.serialization.json)
     implementation("com.google.code.gson:gson:2.8.9")
-    implementation("com.android.tools.build:gradle:8.2.1")
-    implementation("com.android.tools.build:builder-test-api:8.2.1")
+    implementation(libs.android.gradlePlugin.gradle)
+    implementation(libs.android.gradlePlugin.builder.test.api)
 
     testImplementation(libs.bundles.kotest)
     testImplementation("junit:junit:4.13.2")
diff --git a/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml b/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml
index 9ba594e642d..65506053b3e 100644
--- a/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml
+++ b/firebase-dataconnect/gradleplugin/gradle/libs.versions.toml
@@ -1,8 +1,2 @@
-[versions]
-androidGradlePlugin = "8.2.1"
-
-[libraries]
-android-gradlePlugin-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }
-
 [plugins]
 spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA1" }
diff --git a/firebase-dataconnect/gradleplugin/plugin/build.gradle.kts b/firebase-dataconnect/gradleplugin/plugin/build.gradle.kts
index d6d6014abc2..1735f7c00ef 100644
--- a/firebase-dataconnect/gradleplugin/plugin/build.gradle.kts
+++ b/firebase-dataconnect/gradleplugin/plugin/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }
 
 dependencies {
-  compileOnly(libs.android.gradlePlugin.api)
+  compileOnly(firebaseLibs.android.gradlePlugin.gradle.api)
   implementation(gradleKotlinDsl())
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8f7f8a6d4dc..dd51263275b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,6 +2,7 @@
 # javalite, protoc and protobufjavautil versions should be in sync while updating and
 # it needs to match the protobuf version which grpc has transitive dependency on, which
 # needs to match the version of grpc that grpc-kotlin has a transitive dependency on.
+androidGradlePlugin = "8.2.1"
 android-lint = "31.3.2"
 autovalue = "1.10.1"
 coroutines = "1.7.3"
@@ -24,6 +25,9 @@ androidx-test-junit="1.1.5"
 androidx-test-truth = "1.5.0"
 
 [libraries]
+android-gradlePlugin-gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
+android-gradlePlugin-gradle-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }
+android-gradlePlugin-builder-test-api = { group = "com.android.tools.build", name = "builder-test-api", version.ref = "androidGradlePlugin" }
 android-lint = { module = "com.android.tools.lint:lint", version.ref = "android-lint" }
 android-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "android-lint" }
 android-lint-checks = { module = "com.android.tools.lint:lint-checks", version.ref = "android-lint" }