diff --git a/RNFBAnalytics.podspec b/RNFBAnalytics.podspec
index bfd727029b..637da320fa 100644
--- a/RNFBAnalytics.podspec
+++ b/RNFBAnalytics.podspec
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
   s.dependency          'React'
   s.dependency          'Firebase/Core', '~> 6.5.0'
   s.dependency          'RNFBApp'
-  s.static_framework    = true
+  s.static_framework    = false
 end
diff --git a/android/build.gradle b/android/build.gradle
index 4b7ed25b18..a8ff29c570 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.4.0'
+    classpath 'com.android.tools.build:gradle:3.4.2'
   }
 }
 
@@ -24,12 +24,8 @@ project.ext {
         buildTools: "28.0.3"
       ],
 
-      googlePlayServices: [
-        base: "16.1.0",
-      ],
-
       firebase          : [
-        analytics: "16.4.0"
+        bom: "21.1.0",
       ],
     ],
   ])
@@ -61,8 +57,8 @@ repositories {
 
 dependencies {
   api project(':@react-native-firebase_app')
-  implementation "com.google.firebase:firebase-analytics:${ReactNative.ext.getVersion("firebase", "analytics")}"
-  implementation "com.google.android.gms:play-services-base:${ReactNative.ext.getVersion("googlePlayServices", "base")}"
+  implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}")
+  implementation "com.google.firebase:firebase-analytics"
 }
 
 ReactNative.shared.applyPackageVersion()
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index c877ea65b7..a10588d9dc 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/e2e/analytics.e2e.js b/e2e/analytics.e2e.js
index 12eb571990..4609b34de3 100644
--- a/e2e/analytics.e2e.js
+++ b/e2e/analytics.e2e.js
@@ -1,4 +1,3 @@
-/* eslint-disable consistent-return */
 /*
  * Copyright (c) 2016-present Invertase Limited & Contributors
  *
@@ -91,7 +90,7 @@ describe('analytics()', () => {
       (() => {
         firebase.analytics().logEvent(13377331);
       }).should.throw(
-        `firebase.analytics().logEvent(*): First argument 'name' is required and must be a string value.`,
+        "firebase.analytics().logEvent(*): First argument 'name' is required and must be a string value.",
       );
     });
 
@@ -99,7 +98,7 @@ describe('analytics()', () => {
       (() => {
         firebase.analytics().logEvent('invertase_event', 'this should be an object');
       }).should.throw(
-        `firebase.analytics().logEvent(_, *): Second optional argument 'params' must be an object if provided.`,
+        "firebase.analytics().logEvent(_, *): Second optional argument 'params' must be an object if provided.",
       );
     });
 
diff --git a/ios/RNFBAnalytics.podspec b/ios/RNFBAnalytics.podspec
index 43d681f559..006bdd7e71 100644
--- a/ios/RNFBAnalytics.podspec
+++ b/ios/RNFBAnalytics.podspec
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
   s.dependency          'React'
   s.dependency          'Firebase/Core', '~> 6.5.0'
   s.dependency          'RNFBApp'
-  s.static_framework    = true
+  s.static_framework    = false
 end