diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3f12b8dc6..8458193f9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
+    id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.plugin.compose")
     id("com.google.gms.google-services")
 }
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 7c3326eab..46e3f4891 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     id("com.android.library")
     id("com.vanniktech.maven.publish")
+    id("org.jetbrains.kotlin.android")
     alias(libs.plugins.kotlin.compose)
 }
 
@@ -16,7 +17,7 @@ android {
         buildConfigField("String", "LIBRARY_NAME", "\"firebase-ui-android\"")
         buildConfigField("String", "VERSION_NAME", "\"${Config.version}\"")
 
-        resourcePrefix = "fui_"
+        resourcePrefix("fui_")
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -105,7 +106,7 @@ dependencies {
     implementation(libs.zxing.core)
     annotationProcessor(libs.androidx.lifecycle.compiler)
 
-    api(platform(libs.firebase.bom))
+    implementation(platform(libs.firebase.bom))
     api(libs.firebase.auth)
 
     // Phone number validation
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 1a99d4e86..e4e440600 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -3,7 +3,7 @@ object Config {
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     object SdkVersions {
-        const val compile = 37
+        const val compile = 36
         const val target = 36
         const val min = 23
     }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index e7cf48cda..297988e9f 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdk = Config.SdkVersions.min
 
-        resourcePrefix = "fui_"
+        resourcePrefix("fui_")
         vectorDrawables.useSupportLibrary = true
     }
 
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index f61d1e1ea..b2fcf8797 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdk = Config.SdkVersions.min
 
-        resourcePrefix = "fui_"
+        resourcePrefix("fui_")
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-    api(platform(libs.firebase.bom))
+    implementation(platform(libs.firebase.bom))
     api(project(":common"))
     api(libs.firebase.database)
 
diff --git a/e2eTest/build.gradle.kts b/e2eTest/build.gradle.kts
index 10cabe4f1..e54f6003d 100644
--- a/e2eTest/build.gradle.kts
+++ b/e2eTest/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.library")
+    id("org.jetbrains.kotlin.android")
     alias(libs.plugins.kotlin.compose)
 }
 
diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts
index 972edefb2..6074dab4d 100644
--- a/firestore/build.gradle.kts
+++ b/firestore/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdk = Config.SdkVersions.min
 
-        resourcePrefix = "fui_"
+        resourcePrefix("fui_")
         vectorDrawables.useSupportLibrary = true
 
         multiDexEnabled = true
@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-    api(platform(libs.firebase.bom))
+    implementation(platform(libs.firebase.bom))
     api(project(":common"))
     api(libs.firebase.firestore)
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6b074e3e0..6d61a0153 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin = "2.2.0"
-android-gradle-plugin = "9.2.1"
-google-services = "4.5.0"
+android-gradle-plugin = "8.10.0"
+google-services = "4.3.8"
 maven-publish-plugin = "0.34.0"
 versions-plugin = "0.20.0"
 
@@ -26,7 +26,7 @@ datastore = "1.1.1"
 fragment = "1.3.5"
 googleid = "1.1.1"
 legacy-support-v4 = "1.0.0"
-lifecycle = "2.11.0"
+lifecycle = "2.3.1"
 lifecycle-extensions = "2.2.0"
 libphonenumber = "9.0.16"
 material = "1.4.0"
diff --git a/internal/lintchecks/build.gradle.kts b/internal/lintchecks/build.gradle.kts
index 13974d79e..47d681e9e 100644
--- a/internal/lintchecks/build.gradle.kts
+++ b/internal/lintchecks/build.gradle.kts
@@ -9,7 +9,7 @@ android {
     defaultConfig {
         minSdk = Config.SdkVersions.min
 
-        resourcePrefix = "fui_"
+        resourcePrefix("fui_")
         vectorDrawables.useSupportLibrary = true
 
         multiDexEnabled = true
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 46fd191f3..cfff0f508 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdk = Config.SdkVersions.min
 
-        resourcePrefix = "fui_"
+        resourcePrefix("fui_")
         vectorDrawables.useSupportLibrary = true
     }
 
diff --git a/proguard-tests/build.gradle.kts b/proguard-tests/build.gradle.kts
index d2d1f62fc..a86aa2999 100644
--- a/proguard-tests/build.gradle.kts
+++ b/proguard-tests/build.gradle.kts
@@ -18,7 +18,7 @@ android {
         versionName = Config.version
         versionCode = 1
 
-        resourcePrefix = "fui_"
+        resourcePrefix("fui_")
         vectorDrawables.useSupportLibrary = true
 
         multiDexEnabled = true
@@ -35,8 +35,11 @@ android {
             // using the debug key
             signingConfig = signingConfigs["debug"]
 
-            isMinifyEnabled = true
-            isShrinkResources = true
+            postprocessing {
+                isRemoveUnusedCode = true
+                isRemoveUnusedResources = true
+                isObfuscate = true
+            }
         }
     }
 
diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts
index 978f0a3b6..7ac13aeba 100644
--- a/storage/build.gradle.kts
+++ b/storage/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdk = Config.SdkVersions.min
 
-        resourcePrefix = "fui_"
+        resourcePrefix("fui_")
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -50,7 +50,7 @@ android {
 dependencies {
     api(libs.glide)
 
-    api(platform(libs.firebase.bom))
+    implementation(platform(libs.firebase.bom))
     api(libs.firebase.storage)
     // Override Play Services
     implementation(libs.androidx.legacy.support.v4)