diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3aa4b29489..6fbd33acc2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
     id("godtools.application-conventions")
     kotlin("kapt")
-    id("com.google.firebase.appdistribution")
-    id("com.google.firebase.crashlytics")
-    id("com.google.firebase.firebase-perf")
-    id("com.google.gms.google-services")
+    alias(libs.plugins.firebase.appdistribution)
+    alias(libs.plugins.firebase.crashlytics)
+    alias(libs.plugins.firebase.perf)
+    alias(libs.plugins.google.services)
     alias(libs.plugins.grgit)
     alias(libs.plugins.hilt)
 }
@@ -229,8 +229,9 @@ dependencies {
 // region Firebase App Distribution
 if (project.hasProperty("firebaseAppDistributionBuild")) {
     firebaseAppDistribution {
-        artifactPath =
-            buildDir.resolve("outputs/apk_from_bundle/productionQa/app-production-qa-universal.apk").path
+        artifactPath = layout.buildDirectory
+            .file("outputs/apk_from_bundle/productionQa/app-production-qa-universal.apk")
+            .get().asFile.path
         releaseNotes = generateFirebaseAppDistributionReleaseNotes()
         serviceCredentialsFile = rootProject.file("firebase/firebase_api_key.json").path
         groups = "android-testers"
diff --git a/app/google-services.json b/app/google-services.json
index 1af6796bdf..d54d791143 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -21,10 +21,6 @@
             "package_name": "org.keynote.godtools.android",
             "certificate_hash": "ee40b2e6569e1e242f69bf9dd839f6fb135337d8"
           }
-        },
-        {
-          "client_id": "71275134527-roo71fe00mo561o79j6b9jveuocsq38i.apps.googleusercontent.com",
-          "client_type": 3
         }
       ],
       "api_key": [
@@ -77,10 +73,6 @@
             "package_name": "org.keynote.godtools.android.debug",
             "certificate_hash": "5a863ad7021d70e6cac9d3f47d297c2261222424"
           }
-        },
-        {
-          "client_id": "71275134527-roo71fe00mo561o79j6b9jveuocsq38i.apps.googleusercontent.com",
-          "client_type": 3
         }
       ],
       "api_key": [
@@ -125,10 +117,6 @@
             "package_name": "org.keynote.godtools.android.qa",
             "certificate_hash": "e759fc0eb96d7e32a0c627209ea35bb84fd28866"
           }
-        },
-        {
-          "client_id": "71275134527-roo71fe00mo561o79j6b9jveuocsq38i.apps.googleusercontent.com",
-          "client_type": 3
         }
       ],
       "api_key": [
diff --git a/build.gradle b/build.gradle
index 1826f3cfee..0aaebfb8eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,10 +13,6 @@ buildscript {
         classpath libs.gradleDownloadTask
 
         classpath libs.android.gradlePlugin
-        classpath libs.firebase.appdistribution.gradlePlugin
-        classpath libs.firebase.crashlytics.gradlePlugin
-        classpath libs.firebase.perf.gradlePlugin
-        classpath libs.google.services.gradlePlugin
         classpath libs.kotlin.gradlePlugin
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ab93368934..3baa2b217b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -90,15 +90,12 @@ facebook-flipper = { module = "com.facebook.flipper:flipper", version.ref = "fac
 facebook-flipper-plugins-leakcanary2 = { module = "com.facebook.flipper:flipper-leakcanary2-plugin", version.ref = "facebook-flipper" }
 facebook-flipper-plugins-network = { module = "com.facebook.flipper:flipper-network-plugin", version.ref = "facebook-flipper" }
 facebook-soloader = "com.facebook.soloader:soloader:0.10.5"
-firebase-appdistribution-gradlePlugin = "com.google.firebase:firebase-appdistribution-gradle:4.0.0"
 firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics", version.ref = "firebase-crashlytics" }
-firebase-crashlytics-gradlePlugin = "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
 firebase-crashlytics-ndk = { module = "com.google.firebase:firebase-crashlytics-ndk", version.ref = "firebase-crashlytics" }
 firebase-dynamic-links = "com.google.firebase:firebase-dynamic-links-ktx:21.1.0"
 firebase-inappmessaging = "com.google.firebase:firebase-inappmessaging-display:20.3.5"
 firebase-messaging = "com.google.firebase:firebase-messaging:23.2.1"
 firebase-perf = { module = "com.google.firebase:firebase-perf", version.ref = "firebase-perf" }
-firebase-perf-gradlePlugin = "com.google.firebase:perf-plugin:1.4.2"
 firebase-perf-ktx = { module = "com.google.firebase:firebase-perf-ktx", version.ref = "firebase-perf" }
 godtoolsShared-analytics = { module = "org.cru.godtools.kotlin:analytics", version.ref = "godtoolsShared" }
 godtoolsShared-common = { module = "org.cru.godtools.kotlin:common", version.ref = "godtoolsShared" }
@@ -106,7 +103,6 @@ godtoolsShared-parser = { module = "org.cru.godtools.kotlin:parser", version.ref
 godtoolsShared-user-activity = { module = "org.cru.godtools.kotlin:user-activity", version.ref = "godtoolsShared" }
 google-auto-value = { module = "com.google.auto.value:auto-value", version.ref = "google-auto-value" }
 google-auto-value-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "google-auto-value" }
-google-services-gradlePlugin = "com.google.gms:google-services:4.4.0"
 gradleDownloadTask = "de.undercouch:gradle-download-task:5.5.0"
 gtoSupport-androidx-collection = { module = "org.ccci.gto.android:gto-support-androidx-collection", version.ref = "gtoSupport" }
 gtoSupport-androidx-compose = { module = "org.ccci.gto.android:gto-support-androidx-compose", version.ref = "gtoSupport" }
@@ -171,7 +167,7 @@ kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-te
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-kover-gradlePlugin = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kotlinKover" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlintGradle"}
+ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlintGradle" }
 leakcanary = "com.squareup.leakcanary:leakcanary-android:2.12"
 lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
 lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottie" }
@@ -218,6 +214,10 @@ common = ["kotlin-stdlib", "timber"]
 test-framework = ["junit", "androidx-test-junit", "mockk", "robolectric"]
 
 [plugins]
+firebase-appdistribution = { id = "com.google.firebase.appdistribution", version = "4.0.0" }
+firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.9" }
+firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" }
+google-services = { id = "com.google.gms.google-services", version = "4.4.0" }
 grgit = { id = "org.ajoberstar.grgit", version = "5.2.0" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
 ksp = { id = "com.google.devtools.ksp", version = "1.9.10-1.0.13" }