diff --git a/ios/RNFirebase.xcodeproj/project.pbxproj b/ios/RNFirebase.xcodeproj/project.pbxproj
index da929dcf..92df426e 100644
--- a/ios/RNFirebase.xcodeproj/project.pbxproj
+++ b/ios/RNFirebase.xcodeproj/project.pbxproj
@@ -453,31 +453,15 @@
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"${BUILT_PRODUCTS_DIR}",
-					"${SRCROOT}/../../../ios/Pods/Crashlytics/iOS",
-					"${SRCROOT}/../../../ios/Pods/Fabric/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseAnalytics/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseAuth/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseCore/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseCrash/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseDatabase/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseDynamicLinks/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseFirestore/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseInstanceID/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseMessaging/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebasePerformance/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseRemoteConfig/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseStorage/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/Google-Mobile-Ads-SDK/Frameworks/frameworks",
+					"${BUILT_PRODUCTS_DIR}/**",
+					"${SRCROOT}/../../../ios/Pods/**",
 					"${SRCROOT}/../../../ios/Firebase/**",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../../react-native/React/**",
 					"${SRCROOT}/../../../ios/Firebase/**",
-					"${SRCROOT}/../../../ios/Pods/Headers/Public/Crashlytics",
-					"${SRCROOT}/../../../ios/Pods/Headers/Public/Fabric",
-					"${SRCROOT}/../../../ios/Pods/Firebase/**",
+					"${SRCROOT}/../../../ios/Pods/Headers/Public/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
@@ -498,31 +482,15 @@
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"${BUILT_PRODUCTS_DIR}",
-					"${SRCROOT}/../../../ios/Pods/Crashlytics/iOS",
-					"${SRCROOT}/../../../ios/Pods/Fabric/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseAnalytics/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseAuth/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseCore/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseCrash/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseDatabase/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseDynamicLinks/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseFirestore/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseInstanceID/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseMessaging/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebasePerformance/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseRemoteConfig/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/FirebaseStorage/Frameworks",
-					"${SRCROOT}/../../../ios/Pods/Google-Mobile-Ads-SDK/Frameworks/frameworks",
+					"${BUILT_PRODUCTS_DIR}/**",
+					"${SRCROOT}/../../../ios/Pods/**",
 					"${SRCROOT}/../../../ios/Firebase/**",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../../react-native/React/**",
 					"${SRCROOT}/../../../ios/Firebase/**",
-					"${SRCROOT}/../../../ios/Pods/Headers/Public/Crashlytics",
-					"${SRCROOT}/../../../ios/Pods/Headers/Public/Fabric",
-					"${SRCROOT}/../../../ios/Pods/Firebase/**",
+					"${SRCROOT}/../../../ios/Pods/Headers/Public/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
diff --git a/package-lock.json b/package-lock.json
index 9a078a16..554b27bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-firebase",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ef880bd8..55cf3c33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-firebase",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "author": "Invertase <contact@invertase.io> (http://invertase.io)",
   "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Admob, Analytics, Auth, Crash Reporting, Cloud Firestore, Database, Dynamic Links, Messaging (FCM), Remote Config, Storage and Performance.",
   "main": "dist/index.js",