diff --git a/app/build.gradle b/app/build.gradle
index 6fff959..9d91e95 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,14 +30,14 @@ android {
 
     buildTypes {
         debug {
-            manifestPlaceholders = [crashlyticsCollectionEnabled:"false"]
+            manifestPlaceholders = [firebaseCollectionEnabled:"false"]
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         release {
             signingConfig signingConfigs.signingconf
             minifyEnabled true
             shrinkResources true
-            manifestPlaceholders = [crashlyticsCollectionEnabled:"true"]
+            manifestPlaceholders = [firebaseCollectionEnabled:"true"]
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -68,6 +68,7 @@ dependencies {
     implementation 'com.github.GrenderG:Toasty:1.5.0'
     implementation 'com.github.parse-community.Parse-SDK-Android:parse:1.26.0'
     implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.firebase:firebase-analytics-ktx' // BOM versioning
     implementation 'com.google.firebase:firebase-crashlytics-ktx' // BOM versioning
     implementation 'com.itextpdf:itextpdf:5.5.13.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 853ab09..94ad25e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,10 +27,6 @@
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="firebase_analytics_collection_enabled"
-            android:value="true" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
@@ -41,9 +37,13 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
+        <meta-data
+            android:name="firebase_analytics_collection_enabled"
+            android:value="${firebaseCollectionEnabled}" />
+
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
-            android:value="${crashlyticsCollectionEnabled}" />
+            android:value="${firebaseCollectionEnabled}" />
     </application>
 
 </manifest>
\ No newline at end of file