diff --git a/.gitignore b/.gitignore
index 44c92faa6f..fbce50e9f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ build/
 crashlytics-build.properties
 com_crashlytics_export_strings.xml
 extras
+app/google-services.json
diff --git a/.travis.yml b/.travis.yml
index 82a4b942ad..14a44760d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,8 @@ before_script:
   - adb shell input keyevent 82 &
 
 script:
-   - ./gradlew clean testMadaniRelease feature:audio:testDebug -PdisableCrashlytics
-   - ./gradlew clean connectedMadaniDebugAndroidTest -PdisableCrashlytics
+   - ./gradlew clean testMadaniRelease feature:audio:testDebug -PdisableCrashlytics -PdisableFirebase
+   - ./gradlew clean connectedMadaniDebugAndroidTest -PdisableCrashlytics -PdisableFirebase
 
 branches:
   only:
diff --git a/app/build.gradle b/app/build.gradle
index 31b831f37d..73b64f3296 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,10 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'net.ltgt.errorprone'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.firebase.crashlytics'
+if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release") &&
+    !project.hasProperty("disableFirebase")) {
+  apply plugin: 'com.google.gms.google-services'
+}
 
 android {
   compileSdkVersion deps.android.build.compileSdkVersion
@@ -17,8 +21,8 @@ android {
   defaultConfig {
     minSdkVersion deps.android.build.minSdkVersion
     targetSdkVersion deps.android.build.targetSdkVersion
-    versionCode 3010
-    versionName "3.0.1"
+    versionCode 3020
+    versionName "3.0.2"
     testInstrumentationRunner "com.quran.labs.androidquran.core.QuranTestRunner"
     multiDexEnabled true
   }
diff --git a/build.gradle b/build.gradle
index 1c7b1e0900..f5e9a0f7ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,6 +48,7 @@ buildscript {
     classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     classpath "net.ltgt.gradle:gradle-errorprone-plugin:1.2.1"
+    classpath 'com.google.gms:google-services:4.3.4'
   }
 }