diff --git a/README.md b/README.md
index f0546c011..1ee4116ac 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 <br/>
 <br/>
 The Firebase Kotlin SDK is a Kotlin-first SDK for Firebase. It's API is similar to the 
-<a href="https://firebase.github.io/firebase-android-sdk/reference/kotlin/firebase-ktx/">Firebase Android SDK Kotlin Extensions</a> 
+<a href="https://firebase.google.com/docs/reference/kotlin/packages">Firebase Android SDK Kotlin Extensions</a> 
 but also supports multiplatform projects, enabling you to use Firebase directly from your common source targeting 
 <strong>iOS</strong>, <strong>Android</strong>, <strong>Desktop</strong> or <strong>Web</strong>, enabling the use of 
 Firebase as a backend for <a href="https://www.jetbrains.com/lp/compose-multiplatform/">Compose Multiplatform</a>, for example.
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
index 875743cda..72b67d8a3 100644
--- a/firebase-app/build.gradle.kts
+++ b/firebase-app/build.gradle.kts
@@ -137,7 +137,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.common.ktx)
+                api(libs.google.firebase.common)
             }
         }
 
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
index c02a592b2..7a0d0adec 100644
--- a/firebase-auth/build.gradle.kts
+++ b/firebase-auth/build.gradle.kts
@@ -139,7 +139,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.auth.ktx)
+                api(libs.google.firebase.auth)
             }
         }
     }
diff --git a/firebase-common-internal/build.gradle.kts b/firebase-common-internal/build.gradle.kts
index 058fa4172..9d6067d7a 100644
--- a/firebase-common-internal/build.gradle.kts
+++ b/firebase-common-internal/build.gradle.kts
@@ -126,7 +126,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.common.ktx)
+                api(libs.google.firebase.common)
             }
         }
 
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
index 6e7e5e59a..82b6cab2e 100644
--- a/firebase-common/build.gradle.kts
+++ b/firebase-common/build.gradle.kts
@@ -124,7 +124,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.common.ktx)
+                api(libs.google.firebase.common)
             }
         }
 
diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
index 2f6f64b23..fa7cee1ec 100644
--- a/firebase-config/build.gradle.kts
+++ b/firebase-config/build.gradle.kts
@@ -132,7 +132,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.config.ktx)
+                api(libs.google.firebase.config)
             }
         }
 
diff --git a/firebase-crashlytics/build.gradle.kts b/firebase-crashlytics/build.gradle.kts
index 6b3c5b7f9..189fb6833 100644
--- a/firebase-crashlytics/build.gradle.kts
+++ b/firebase-crashlytics/build.gradle.kts
@@ -120,7 +120,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.crashlytics.ktx)
+                api(libs.google.firebase.crashlytics)
             }
         }
 
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
index 3e42f0d5e..5914d2f67 100644
--- a/firebase-database/build.gradle.kts
+++ b/firebase-database/build.gradle.kts
@@ -146,7 +146,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.database.ktx)
+                api(libs.google.firebase.database)
             }
         }
         getByName("jvmMain") {
diff --git a/firebase-installations/build.gradle.kts b/firebase-installations/build.gradle.kts
index f195d567a..2017b1c56 100644
--- a/firebase-installations/build.gradle.kts
+++ b/firebase-installations/build.gradle.kts
@@ -136,7 +136,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.installations.ktx)
+                api(libs.google.firebase.installations)
             }
         }
 
diff --git a/firebase-perf/build.gradle.kts b/firebase-perf/build.gradle.kts
index 6738bd248..840ff5f0e 100644
--- a/firebase-perf/build.gradle.kts
+++ b/firebase-perf/build.gradle.kts
@@ -131,7 +131,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.perf.ktx)
+                api(libs.google.firebase.perf)
             }
         }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 44ae42acf..a79b72942 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,16 +29,16 @@ androidx-test-runner = { module = "androidx.test:runner", version.ref = "android
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
 gitlive-firebase-java-sdk = { module = "dev.gitlive:firebase-java-sdk", version.ref = "gitlive-firebase-java-sdk" }
 google-firebase-analytics = { module = "com.google.firebase:firebase-analytics"}
-google-firebase-auth-ktx = { module = "com.google.firebase:firebase-auth-ktx"}
-google-firebase-common-ktx = { module = "com.google.firebase:firebase-common-ktx"}
-google-firebase-config-ktx = { module = "com.google.firebase:firebase-config-ktx"}
-google-firebase-crashlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx"}
-google-firebase-database-ktx = { module = "com.google.firebase:firebase-database-ktx"}
+google-firebase-auth = { module = "com.google.firebase:firebase-auth"}
+google-firebase-common = { module = "com.google.firebase:firebase-common"}
+google-firebase-config = { module = "com.google.firebase:firebase-config"}
+google-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics"}
+google-firebase-database = { module = "com.google.firebase:firebase-database"}
 google-firebase-firestore = { module = "com.google.firebase:firebase-firestore"}
 google-firebase-functions = { module = "com.google.firebase:firebase-functions"}
-google-firebase-installations-ktx = { module = "com.google.firebase:firebase-installations-ktx"}
+google-firebase-installations = { module = "com.google.firebase:firebase-installations"}
 google-firebase-messaging = { module = "com.google.firebase:firebase-messaging"}
-google-firebase-perf-ktx = { module = "com.google.firebase:firebase-perf-ktx"}
+google-firebase-perf = { module = "com.google.firebase:firebase-perf"}
 google-firebase-storage = { module = "com.google.firebase:firebase-storage"}
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 junit = { module = "junit:junit", version.ref = "junit" }