diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 032d1a8a5..e4c93a848 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,9 +14,10 @@ plugins {
 }
 
 if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
-    pluginManager.apply(libs.plugins.google.services.get().pluginId)
-    // Firebase Crashlytics
-    apply(plugin = "com.google.firebase.crashlytics")
+    pluginManager.apply {
+        apply(libs.plugins.google.services.get().pluginId)
+        apply(libs.plugins.firebase.crashlytics.get().pluginId)
+    }
 }
 
 // shortcutHelper.setFilePath("./shortcuts.xml")
@@ -247,7 +248,9 @@ dependencies {
     implementation(libs.logcat)
 
     // Crash reports/analytics
-    // "standardImplementation"(libs.firebase.analytics)
+//    "standardImplementation"(platform(libs.firebase.bom))
+//    "standardImplementation"(libs.firebase.analytics)
+//    "standardImplementation"(libs.firebase.crashlytics)
 
     // Shizuku
     implementation(libs.bundles.shizuku)
@@ -266,8 +269,9 @@ dependencies {
     implementation(sylibs.simularity)
 
     // Firebase (EH)
-    implementation(sylibs.firebase.analytics)
-    implementation(sylibs.firebase.crashlytics.ktx)
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.analytics)
+    implementation(libs.firebase.crashlytics)
 
     // Better logging (EH)
     implementation(sylibs.xlog)
diff --git a/build.gradle.kts b/build.gradle.kts
index da61cdb01..b223d0e1b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,6 @@
 buildscript {
     dependencies {
         // classpath(libs.android.shortcut.gradle)
-        classpath(sylibs.firebase.crashlytics.gradle)
         classpath(sylibs.versionsx)
     }
 }
@@ -9,6 +8,7 @@ buildscript {
 plugins {
     alias(kotlinx.plugins.serialization) apply false
     alias(libs.plugins.aboutLibraries) apply false
+    alias(libs.plugins.firebase.crashlytics) apply false
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.moko) apply false
     alias(libs.plugins.sqldelight) apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aa25ab7d6..bdc249d3b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,6 +10,7 @@ sqlite = "2.4.0"
 voyager = "1.0.0"
 spotless = "6.25.0"
 ktlint-core = "1.3.1"
+firebase-bom = "33.2.0"
 
 [libraries]
 desugar = "com.android.tools:desugar_jdk_libs:2.1.1"
@@ -71,7 +72,9 @@ moko-core = { module = "dev.icerock.moko:resources", version.ref = "moko" }
 
 logcat = "com.squareup.logcat:logcat:0.1"
 
-firebase-analytics = "com.google.firebase:firebase-analytics:22.1.0"
+firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
+firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
+firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
 
 aboutLibraries-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutlib_version" }
 
@@ -103,6 +106,7 @@ google-services = { id = "com.google.gms.google-services", version = "4.4.2" }
 aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlib_version" }
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 moko = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" }
+firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.2" }
 
 [bundles]
 okhttp = ["okhttp-core", "okhttp-logging", "okhttp-brotli", "okhttp-dnsoverhttps"]
diff --git a/gradle/sy.versions.toml b/gradle/sy.versions.toml
index 5fb5c0eab..c5e46572a 100644
--- a/gradle/sy.versions.toml
+++ b/gradle/sy.versions.toml
@@ -2,10 +2,6 @@
 koin = "4.0.0"
 
 [libraries]
-firebase-analytics = "com.google.firebase:firebase-analytics:22.0.2"
-firebase-crashlytics-ktx = "com.google.firebase:firebase-crashlytics:19.0.2"
-firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:3.0.2"
-
 simularity = "info.debatty:java-string-similarity:2.0.0"
 xlog = "com.elvishew:xlog:1.11.1"