diff --git a/.gitignore b/.gitignore
index 97ee845d5..cff88b0fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,10 @@ android/keystores/
 android/app/release/
 android/app/google-services.json
 
+#ios
+ios/rwallet/GoogleService-Info.plist
+/ios/rwallet/GoogleService-Info.plist
+
 # node.js
 #
 node_modules/
diff --git a/README.md b/README.md
index 17945d83f..c5acc02c3 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This is a multi-cryptocurrency wallet application. Supports both english and spa
 ## Prerequisite
 
 ### To run on Android
-1. In order to run this App in Android Simulator, **Android Studio** needs to be installed with Android SKD 10 (Api level 29). Please refer to [https://developer.android.com/studio](https://developer.android.com/studio)
+1. In order to run this App in Android Simulator, **Android Studio** needs to be installed with Android SKD 11 (Api level 30). Please refer to [https://developer.android.com/studio](https://developer.android.com/studio)
 1. Open Android Studio, create a device via `Tools > AVD Manager > Create Virtual Device`. After downloading required dependencies, start the device by clicking on Play icon.
 1. Now we are testing if you can invoke `adb` in terminial. This is for running rWallet Android App on Android virtual device.
     1. Since we already have Android Studio installed we can add `platform-tools` to path
@@ -21,11 +21,6 @@ This is a multi-cryptocurrency wallet application. Supports both english and spa
         List of devices attached
         emulator-5554	device
         ```
-       
-**Note:** When  `syncing project with gradle files` using Android SKD 11, it throws the following error:
-```
-No variants found for ':@imstar15_react-native-firebase'. Check build files to ensure at least one variant exists. at:
-```
 
 ### To run on iOS Devices
 1. XCode needs to be installed (v11.x). iOS simulator will be installed along with XCode.
diff --git a/android/build.gradle b/android/build.gradle
index 1d6e6571d..df72a18e1 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,11 +2,11 @@
 
 buildscript {
     ext {
-        minSdkVersion = 16
-        compileSdkVersion = 29
-        buildToolsVersion = "29.0.2"
-        targetSdkVersion = 29
-        supportLibVersion = "29.0.0"
+        minSdkVersion     = 16
+        targetSdkVersion  = 30
+        compileSdkVersion = 30
+        buildToolsVersion = "30.0.2"
+        supportLibVersion = "30.0.0"
     }
     repositories {
         google()
@@ -14,7 +14,7 @@ buildscript {
     }
     dependencies {
         classpath("com.android.tools.build:gradle:3.4.0")
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.gms:google-services:4.3.8'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/ios/rwallet/AppDelegate.m b/ios/rwallet/AppDelegate.m
index 1143423cf..b1df7b578 100644
--- a/ios/rwallet/AppDelegate.m
+++ b/ios/rwallet/AppDelegate.m
@@ -19,6 +19,10 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+  if ([FIRApp defaultApp] == nil) {
+    [FIRApp configure];
+  }
+  [RNFirebaseNotifications configure];
   RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
   RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
                                                    moduleName:@"rwallet"
@@ -33,8 +37,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   [self.window makeKeyAndVisible];
   
   
-  [FIRApp configure];
-  [RNFirebaseNotifications configure];
   
   return YES;
 }
diff --git a/ios/rwallet/GoogleService-Info.plist b/ios/rwallet/GoogleService-Info.plist
deleted file mode 100644
index 1d09e6c88..000000000
--- a/ios/rwallet/GoogleService-Info.plist
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>1015605870697-5rplra6b6eovje44u6cfbsdr27g3pce9.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.1015605870697-5rplra6b6eovje44u6cfbsdr27g3pce9</string>
-	<key>ANDROID_CLIENT_ID</key>
-	<string>1015605870697-10ic72m9vsjojr3ln7gdlsrmqhtek5u3.apps.googleusercontent.com</string>
-	<key>API_KEY</key>
-	<string>AIzaSyA3gMHYFj-zkjj7JiEa-rEdbG9C-x8Fzns</string>
-	<key>GCM_SENDER_ID</key>
-	<string>1015605870697</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.rsk.rwallet.reactnative</string>
-	<key>PROJECT_ID</key>
-	<string>rwallet-40420</string>
-	<key>STORAGE_BUCKET</key>
-	<string>rwallet-40420.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:1015605870697:ios:d3e7b8ab79cfbbf1b922f8</string>
-	<key>DATABASE_URL</key>
-	<string>https://rwallet-40420.firebaseio.com</string>
-</dict>
-</plist>
\ No newline at end of file