diff --git a/CHANGELOG.md b/CHANGELOG.md
index f812735186..3756d6c6f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+### Features
+
+- **firestore:** support for `PersistentCacheIndexManager` ([#7910](https://github.com/invertase/react-native-firebase/issues/7910)) ([0b0de45](https://github.com/invertase/react-native-firebase/commit/0b0de45513cd3aab9f7037fd8468a63cf96aa62c))
+- **firestore:** support for second database ([#7949](https://github.com/invertase/react-native-firebase/issues/7949)) ([eec08a0](https://github.com/invertase/react-native-firebase/commit/eec08a06f41dd96d13778fbed2afcaaac238fca4))
+
+### Bug Fixes
+
+- **analytics:** update the typing for Item ([#7919](https://github.com/invertase/react-native-firebase/issues/7919)) ([c2c4576](https://github.com/invertase/react-native-firebase/commit/c2c457608c865f6d25e4b9b6689cbc00721de194))
+- **database:** fixes modular imports exports ([#7916](https://github.com/invertase/react-native-firebase/issues/7916)) ([7022204](https://github.com/invertase/react-native-firebase/commit/7022204616f6149e3327cbf2ab8a469f537a7b61))
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 ### Features
diff --git a/lerna.json b/lerna.json
index f7c133f1e0..34fddcf281 100644
--- a/lerna.json
+++ b/lerna.json
@@ -76,5 +76,5 @@
     "userUrlFormat": "{{host}}/{{user}}"
   },
   "ignoreChanges": ["**/docs/**", "**/.github/**", "**/e2e/**", "**/tests/**"],
-  "version": "20.3.0"
+  "version": "20.4.0"
 }
diff --git a/packages/analytics/CHANGELOG.md b/packages/analytics/CHANGELOG.md
index e2c9f01897..baa71efb86 100644
--- a/packages/analytics/CHANGELOG.md
+++ b/packages/analytics/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+### Bug Fixes
+
+- **analytics:** update the typing for Item ([#7919](https://github.com/invertase/react-native-firebase/issues/7919)) ([c2c4576](https://github.com/invertase/react-native-firebase/commit/c2c457608c865f6d25e4b9b6689cbc00721de194))
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 ### Bug Fixes
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
index ac4e1b41ba..6309b9e246 100644
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/analytics",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - The analytics module provides out of the box support with Google Analytics for Firebase. Integration with the Android & iOS allows for in-depth analytical insight reporting, such as device information, location, user actions and more.",
   "main": "lib/index.js",
@@ -22,7 +22,7 @@
     "analytics"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/app": "20.4.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/app-check/CHANGELOG.md b/packages/app-check/CHANGELOG.md
index 2bfbb780d3..10da078acb 100644
--- a/packages/app-check/CHANGELOG.md
+++ b/packages/app-check/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/app-check
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/app-check
diff --git a/packages/app-check/package.json b/packages/app-check/package.json
index 31ec6d9622..28e03f8c53 100644
--- a/packages/app-check/package.json
+++ b/packages/app-check/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app-check",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - App Check",
   "main": "lib/index.js",
@@ -25,7 +25,7 @@
     "appCheck"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0",
+    "@react-native-firebase/app": "20.4.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
diff --git a/packages/app-distribution/CHANGELOG.md b/packages/app-distribution/CHANGELOG.md
index e4aeaadc22..75b434ae90 100644
--- a/packages/app-distribution/CHANGELOG.md
+++ b/packages/app-distribution/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/app-distribution
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/app-distribution
diff --git a/packages/app-distribution/package.json b/packages/app-distribution/package.json
index 4ea85cad16..16955944cf 100644
--- a/packages/app-distribution/package.json
+++ b/packages/app-distribution/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app-distribution",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - App Distribution",
   "main": "lib/index.js",
@@ -22,7 +22,7 @@
     "app-distribution"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/app": "20.4.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index 195cd4fdd4..e966b47e04 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+### Features
+
+- **firestore:** support for second database ([#7949](https://github.com/invertase/react-native-firebase/issues/7949)) ([eec08a0](https://github.com/invertase/react-native-firebase/commit/eec08a06f41dd96d13778fbed2afcaaac238fca4))
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 ### Bug Fixes
diff --git a/packages/app/package.json b/packages/app/package.json
index 71898c9143..0564e00e5d 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@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, Functions, Messaging (FCM), Remote Config, Storage and more.",
   "main": "lib/index.js",
diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md
index 43cc18abf5..1bc678fcd8 100644
--- a/packages/auth/CHANGELOG.md
+++ b/packages/auth/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/auth
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 ### Features
diff --git a/packages/auth/package.json b/packages/auth/package.json
index e673c5012e..c5e17b373f 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/auth",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - The authentication module provides an easy-to-use API to integrate an authentication workflow into new and existing applications. React Native Firebase provides access to all Firebase authentication methods and identity providers.",
   "main": "lib/index.js",
@@ -27,7 +27,7 @@
     "plist": "^3.1.0"
   },
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0",
+    "@react-native-firebase/app": "20.4.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
diff --git a/packages/crashlytics/CHANGELOG.md b/packages/crashlytics/CHANGELOG.md
index ddd7ecfef3..44890effe4 100644
--- a/packages/crashlytics/CHANGELOG.md
+++ b/packages/crashlytics/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/crashlytics
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/crashlytics
diff --git a/packages/crashlytics/package.json b/packages/crashlytics/package.json
index 191f79e0de..585109100b 100644
--- a/packages/crashlytics/package.json
+++ b/packages/crashlytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/crashlytics",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Firebase Crashlytics is a lightweight, realtime crash reporter that helps you track, prioritize, and fix stability issues that erode your app quality. React Native Firebase provides automatic crash reporting for both native and JavaScript errors, including unhandled promise rejections.",
   "main": "lib/index.js",
@@ -29,7 +29,7 @@
     "crashlytics"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0",
+    "@react-native-firebase/app": "20.4.0",
     "expo": ">=47.0.0"
   },
   "dependencies": {
diff --git a/packages/database/CHANGELOG.md b/packages/database/CHANGELOG.md
index 5fba11f106..2300c035dd 100644
--- a/packages/database/CHANGELOG.md
+++ b/packages/database/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+### Bug Fixes
+
+- **database:** fixes modular imports exports ([#7916](https://github.com/invertase/react-native-firebase/issues/7916)) ([7022204](https://github.com/invertase/react-native-firebase/commit/7022204616f6149e3327cbf2ab8a469f537a7b61))
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/database
diff --git a/packages/database/package.json b/packages/database/package.json
index 382cf05ecf..3c11e5803b 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/database",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - The Firebase Realtime Database is a cloud-hosted database. Data is stored as JSON and synchronized in realtime to every connected client. React Native Firebase provides native integration with the Android & iOS Firebase SDKs, supporting both realtime data sync and offline capabilities.",
   "main": "lib/index.js",
@@ -25,7 +25,7 @@
     "realtome database"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/app": "20.4.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/dynamic-links/CHANGELOG.md b/packages/dynamic-links/CHANGELOG.md
index 1feb4cdbc0..7afc843bda 100644
--- a/packages/dynamic-links/CHANGELOG.md
+++ b/packages/dynamic-links/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/dynamic-links
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/dynamic-links
diff --git a/packages/dynamic-links/package.json b/packages/dynamic-links/package.json
index 0d43713ece..3767dfe040 100644
--- a/packages/dynamic-links/package.json
+++ b/packages/dynamic-links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/dynamic-links",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Dynamic Links",
   "main": "lib/index.js",
@@ -25,7 +25,7 @@
     "dynamic link"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0",
+    "@react-native-firebase/app": "20.4.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
diff --git a/packages/firestore/CHANGELOG.md b/packages/firestore/CHANGELOG.md
index 6aad6f8a74..202d605075 100644
--- a/packages/firestore/CHANGELOG.md
+++ b/packages/firestore/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+### Features
+
+- **firestore:** support for `PersistentCacheIndexManager` ([#7910](https://github.com/invertase/react-native-firebase/issues/7910)) ([0b0de45](https://github.com/invertase/react-native-firebase/commit/0b0de45513cd3aab9f7037fd8468a63cf96aa62c))
+- **firestore:** support for second database ([#7949](https://github.com/invertase/react-native-firebase/issues/7949)) ([eec08a0](https://github.com/invertase/react-native-firebase/commit/eec08a06f41dd96d13778fbed2afcaaac238fca4))
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/firestore
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
index 80836d8a7c..47b1629886 100644
--- a/packages/firestore/package.json
+++ b/packages/firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/firestore",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Cloud Firestore is a NoSQL cloud database to store and sync data between your React Native application and Firebase's database. The API matches the Firebase Web SDK whilst taking advantage of the native SDKs performance and offline capabilities.",
   "main": "lib/index.js",
@@ -27,7 +27,7 @@
     "firestore"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/app": "20.4.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/functions/CHANGELOG.md b/packages/functions/CHANGELOG.md
index 01724543ad..f0e3a8eab2 100644
--- a/packages/functions/CHANGELOG.md
+++ b/packages/functions/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/functions
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/functions
diff --git a/packages/functions/package.json b/packages/functions/package.json
index a278a84790..fdd0169ee1 100644
--- a/packages/functions/package.json
+++ b/packages/functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/functions",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Cloud Functions for Firebase lets you automatically run backend code in response to events triggered by Firebase features and HTTPS requests. React Native Firebase supports integration with production and locally emulated Cloud Functions with a simple API interface.\n\n",
   "main": "lib/index.js",
@@ -24,7 +24,7 @@
     "functions"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/app": "20.4.0"
   },
   "devDependencies": {
     "@react-native-firebase/private-tests-firebase-functions": "^0.0.1"
diff --git a/packages/in-app-messaging/CHANGELOG.md b/packages/in-app-messaging/CHANGELOG.md
index 85fc2a7e82..82a08a9e77 100644
--- a/packages/in-app-messaging/CHANGELOG.md
+++ b/packages/in-app-messaging/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/in-app-messaging
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/in-app-messaging
diff --git a/packages/in-app-messaging/package.json b/packages/in-app-messaging/package.json
index cc226a16e4..e92471dfac 100644
--- a/packages/in-app-messaging/package.json
+++ b/packages/in-app-messaging/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/in-app-messaging",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Firebase In-App Messaging helps you engage your app's active users by sending them targeted, contextual messages that encourage them to use key app features. React Native Firebase provides support for both native Android & iOS integration with a simple JavaScript API.",
   "main": "lib/index.js",
@@ -27,8 +27,8 @@
     "inAppMessaging"
   ],
   "peerDependencies": {
-    "@react-native-firebase/analytics": "20.3.0",
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/analytics": "20.4.0",
+    "@react-native-firebase/app": "20.4.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/installations/CHANGELOG.md b/packages/installations/CHANGELOG.md
index 3e9aad0b09..167f7022fd 100644
--- a/packages/installations/CHANGELOG.md
+++ b/packages/installations/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/installations
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/installations
diff --git a/packages/installations/package.json b/packages/installations/package.json
index f9d7bf6a8f..5b07f47d67 100644
--- a/packages/installations/package.json
+++ b/packages/installations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/installations",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Installations",
   "main": "lib/index.js",
@@ -22,7 +22,7 @@
     "installations"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/app": "20.4.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/messaging/CHANGELOG.md b/packages/messaging/CHANGELOG.md
index 50bdf9884a..705dc51457 100644
--- a/packages/messaging/CHANGELOG.md
+++ b/packages/messaging/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/messaging
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/messaging
diff --git a/packages/messaging/package.json b/packages/messaging/package.json
index 333111ccb6..241e5a1bd5 100644
--- a/packages/messaging/package.json
+++ b/packages/messaging/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/messaging",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - React Native Firebase provides native integration of Firebase Cloud Messaging (FCM) for both Android & iOS. FCM is a cost free service, allowing for server-device and device-device communication. The React Native Firebase Messaging module provides a simple JavaScript API to interact with FCM.",
   "main": "lib/index.js",
@@ -24,7 +24,7 @@
     "messaging"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0",
+    "@react-native-firebase/app": "20.4.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
diff --git a/packages/ml/CHANGELOG.md b/packages/ml/CHANGELOG.md
index ade4836696..954ff56f0f 100644
--- a/packages/ml/CHANGELOG.md
+++ b/packages/ml/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/ml
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/ml
diff --git a/packages/ml/package.json b/packages/ml/package.json
index c4011674bd..e63dd45232 100644
--- a/packages/ml/package.json
+++ b/packages/ml/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/ml",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Firebase ML brings the power of machine learning vision to your React Native application, supporting both Android & iOS.",
   "main": "lib/index.js",
@@ -26,7 +26,7 @@
     "image labeler"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/app": "20.4.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/perf/CHANGELOG.md b/packages/perf/CHANGELOG.md
index 133ca3bbc5..549c3e4a43 100644
--- a/packages/perf/CHANGELOG.md
+++ b/packages/perf/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/perf
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/perf
diff --git a/packages/perf/package.json b/packages/perf/package.json
index 3ff5280f35..7941c3430f 100644
--- a/packages/perf/package.json
+++ b/packages/perf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/perf",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - React Native Firebase provides native integration with Performance Monitoring to gain insight into key performance characteristics within your React Native application.",
   "main": "lib/index.js",
@@ -29,7 +29,7 @@
     "performance monitoring"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0",
+    "@react-native-firebase/app": "20.4.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
diff --git a/packages/remote-config/CHANGELOG.md b/packages/remote-config/CHANGELOG.md
index 9ce91771ad..2dc2ea7cd7 100644
--- a/packages/remote-config/CHANGELOG.md
+++ b/packages/remote-config/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+**Note:** Version bump only for package @react-native-firebase/remote-config
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/remote-config
diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json
index 2be505793d..9cc95e3b84 100644
--- a/packages/remote-config/package.json
+++ b/packages/remote-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/remote-config",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - React Native Firebase provides native integration with Remote Config, allowing you to change the appearance and/or functionality of your app without requiring an app update.",
   "main": "lib/index.js",
@@ -24,8 +24,8 @@
     "remote-config"
   ],
   "peerDependencies": {
-    "@react-native-firebase/analytics": "20.3.0",
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/analytics": "20.4.0",
+    "@react-native-firebase/app": "20.4.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/storage/CHANGELOG.md b/packages/storage/CHANGELOG.md
index f15cecb734..40e8a22b5c 100644
--- a/packages/storage/CHANGELOG.md
+++ b/packages/storage/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+### Features
+
+- **firestore:** support for second database ([#7949](https://github.com/invertase/react-native-firebase/issues/7949)) ([eec08a0](https://github.com/invertase/react-native-firebase/commit/eec08a06f41dd96d13778fbed2afcaaac238fca4))
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package @react-native-firebase/storage
diff --git a/packages/storage/package.json b/packages/storage/package.json
index ebc5ef58ab..38dca4aba7 100644
--- a/packages/storage/package.json
+++ b/packages/storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/storage",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - React Native Firebase provides native integration with Cloud Storage, providing support to upload and download files directly from your device and from your Firebase Cloud Storage bucket.",
   "main": "lib/index.js",
@@ -29,7 +29,7 @@
     "download"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.3.0"
+    "@react-native-firebase/app": "20.4.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/tests/CHANGELOG.md b/tests/CHANGELOG.md
index f72c929eb3..e9b95098d0 100644
--- a/tests/CHANGELOG.md
+++ b/tests/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
+
+### Features
+
+- **firestore:** support for second database ([#7949](https://github.com/invertase/react-native-firebase/issues/7949)) ([eec08a0](https://github.com/invertase/react-native-firebase/commit/eec08a06f41dd96d13778fbed2afcaaac238fca4))
+
 ## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
 
 **Note:** Version bump only for package react-native-firebase-tests
diff --git a/tests/package.json b/tests/package.json
index a41717dc73..cd8a4af918 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-firebase-tests",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "private": true,
   "scripts": {
     "build:clean": "rimraf dist && rimraf android/build && rimraf android/app/build && rimraf android/.gradle && rimraf ios/build && rimraf macos/build",
@@ -9,24 +9,24 @@
   },
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.24.0",
-    "@react-native-firebase/analytics": "20.3.0",
-    "@react-native-firebase/app": "20.3.0",
-    "@react-native-firebase/app-check": "20.3.0",
-    "@react-native-firebase/app-distribution": "20.3.0",
+    "@react-native-firebase/analytics": "20.4.0",
+    "@react-native-firebase/app": "20.4.0",
+    "@react-native-firebase/app-check": "20.4.0",
+    "@react-native-firebase/app-distribution": "20.4.0",
     "@react-native-firebase/app-types": "6.7.2",
-    "@react-native-firebase/auth": "20.3.0",
-    "@react-native-firebase/crashlytics": "20.3.0",
-    "@react-native-firebase/database": "20.3.0",
-    "@react-native-firebase/dynamic-links": "20.3.0",
-    "@react-native-firebase/firestore": "20.3.0",
-    "@react-native-firebase/functions": "20.3.0",
-    "@react-native-firebase/in-app-messaging": "20.3.0",
-    "@react-native-firebase/installations": "20.3.0",
-    "@react-native-firebase/messaging": "20.3.0",
-    "@react-native-firebase/ml": "20.3.0",
-    "@react-native-firebase/perf": "20.3.0",
-    "@react-native-firebase/remote-config": "20.3.0",
-    "@react-native-firebase/storage": "20.3.0",
+    "@react-native-firebase/auth": "20.4.0",
+    "@react-native-firebase/crashlytics": "20.4.0",
+    "@react-native-firebase/database": "20.4.0",
+    "@react-native-firebase/dynamic-links": "20.4.0",
+    "@react-native-firebase/firestore": "20.4.0",
+    "@react-native-firebase/functions": "20.4.0",
+    "@react-native-firebase/in-app-messaging": "20.4.0",
+    "@react-native-firebase/installations": "20.4.0",
+    "@react-native-firebase/messaging": "20.4.0",
+    "@react-native-firebase/ml": "20.4.0",
+    "@react-native-firebase/perf": "20.4.0",
+    "@react-native-firebase/remote-config": "20.4.0",
+    "@react-native-firebase/storage": "20.4.0",
     "postinstall-postinstall": "2.1.0",
     "react": "18.2.0",
     "react-native": "0.73.4",
diff --git a/yarn.lock b/yarn.lock
index ccf9a53737..76eb49f570 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5803,21 +5803,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native-firebase/analytics@npm:20.3.0, @react-native-firebase/analytics@workspace:packages/analytics":
+"@react-native-firebase/analytics@npm:20.4.0, @react-native-firebase/analytics@workspace:packages/analytics":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/analytics@workspace:packages/analytics"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/app-check@npm:20.3.0, @react-native-firebase/app-check@workspace:packages/app-check":
+"@react-native-firebase/app-check@npm:20.4.0, @react-native-firebase/app-check@workspace:packages/app-check":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/app-check@workspace:packages/app-check"
   dependencies:
     expo: "npm:^50.0.19"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
     expo: ">=47.0.0"
   peerDependenciesMeta:
     expo:
@@ -5825,11 +5825,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/app-distribution@npm:20.3.0, @react-native-firebase/app-distribution@workspace:packages/app-distribution":
+"@react-native-firebase/app-distribution@npm:20.4.0, @react-native-firebase/app-distribution@workspace:packages/app-distribution":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/app-distribution@workspace:packages/app-distribution"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
@@ -5840,7 +5840,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native-firebase/app@npm:20.3.0, @react-native-firebase/app@workspace:packages/app":
+"@react-native-firebase/app@npm:20.4.0, @react-native-firebase/app@workspace:packages/app":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/app@workspace:packages/app"
   dependencies:
@@ -5858,7 +5858,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/auth@npm:20.3.0, @react-native-firebase/auth@workspace:packages/auth":
+"@react-native-firebase/auth@npm:20.4.0, @react-native-firebase/auth@workspace:packages/auth":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/auth@workspace:packages/auth"
   dependencies:
@@ -5866,7 +5866,7 @@ __metadata:
     expo: "npm:^50.0.19"
     plist: "npm:^3.1.0"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
     expo: ">=47.0.0"
   peerDependenciesMeta:
     expo:
@@ -5874,14 +5874,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/crashlytics@npm:20.3.0, @react-native-firebase/crashlytics@workspace:packages/crashlytics":
+"@react-native-firebase/crashlytics@npm:20.4.0, @react-native-firebase/crashlytics@workspace:packages/crashlytics":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/crashlytics@workspace:packages/crashlytics"
   dependencies:
     expo: "npm:^50.0.19"
     stacktrace-js: "npm:^2.0.2"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
     expo: ">=47.0.0"
   peerDependenciesMeta:
     expo:
@@ -5889,21 +5889,21 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/database@npm:20.3.0, @react-native-firebase/database@workspace:packages/database":
+"@react-native-firebase/database@npm:20.4.0, @react-native-firebase/database@workspace:packages/database":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/database@workspace:packages/database"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/dynamic-links@npm:20.3.0, @react-native-firebase/dynamic-links@workspace:packages/dynamic-links":
+"@react-native-firebase/dynamic-links@npm:20.4.0, @react-native-firebase/dynamic-links@workspace:packages/dynamic-links":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/dynamic-links@workspace:packages/dynamic-links"
   dependencies:
     expo: "npm:^50.0.19"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
     expo: ">=47.0.0"
   peerDependenciesMeta:
     expo:
@@ -5911,48 +5911,48 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/firestore@npm:20.3.0, @react-native-firebase/firestore@workspace:packages/firestore":
+"@react-native-firebase/firestore@npm:20.4.0, @react-native-firebase/firestore@workspace:packages/firestore":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/firestore@workspace:packages/firestore"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/functions@npm:20.3.0, @react-native-firebase/functions@workspace:packages/functions":
+"@react-native-firebase/functions@npm:20.4.0, @react-native-firebase/functions@workspace:packages/functions":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/functions@workspace:packages/functions"
   dependencies:
     "@react-native-firebase/private-tests-firebase-functions": "npm:^0.0.1"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/in-app-messaging@npm:20.3.0, @react-native-firebase/in-app-messaging@workspace:packages/in-app-messaging":
+"@react-native-firebase/in-app-messaging@npm:20.4.0, @react-native-firebase/in-app-messaging@workspace:packages/in-app-messaging":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/in-app-messaging@workspace:packages/in-app-messaging"
   peerDependencies:
-    "@react-native-firebase/analytics": 20.3.0
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/analytics": 20.4.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/installations@npm:20.3.0, @react-native-firebase/installations@workspace:packages/installations":
+"@react-native-firebase/installations@npm:20.4.0, @react-native-firebase/installations@workspace:packages/installations":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/installations@workspace:packages/installations"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/messaging@npm:20.3.0, @react-native-firebase/messaging@workspace:packages/messaging":
+"@react-native-firebase/messaging@npm:20.4.0, @react-native-firebase/messaging@workspace:packages/messaging":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/messaging@workspace:packages/messaging"
   dependencies:
     expo: "npm:^50.0.19"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
     expo: ">=47.0.0"
   peerDependenciesMeta:
     expo:
@@ -5960,21 +5960,21 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/ml@npm:20.3.0, @react-native-firebase/ml@workspace:packages/ml":
+"@react-native-firebase/ml@npm:20.4.0, @react-native-firebase/ml@workspace:packages/ml":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/ml@workspace:packages/ml"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/perf@npm:20.3.0, @react-native-firebase/perf@workspace:packages/perf":
+"@react-native-firebase/perf@npm:20.4.0, @react-native-firebase/perf@workspace:packages/perf":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/perf@workspace:packages/perf"
   dependencies:
     expo: "npm:^50.0.19"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
     expo: ">=47.0.0"
   peerDependenciesMeta:
     expo:
@@ -5989,20 +5989,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native-firebase/remote-config@npm:20.3.0, @react-native-firebase/remote-config@workspace:packages/remote-config":
+"@react-native-firebase/remote-config@npm:20.4.0, @react-native-firebase/remote-config@workspace:packages/remote-config":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/remote-config@workspace:packages/remote-config"
   peerDependencies:
-    "@react-native-firebase/analytics": 20.3.0
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/analytics": 20.4.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
-"@react-native-firebase/storage@npm:20.3.0, @react-native-firebase/storage@workspace:packages/storage":
+"@react-native-firebase/storage@npm:20.4.0, @react-native-firebase/storage@workspace:packages/storage":
   version: 0.0.0-use.local
   resolution: "@react-native-firebase/storage@workspace:packages/storage"
   peerDependencies:
-    "@react-native-firebase/app": 20.3.0
+    "@react-native-firebase/app": 20.4.0
   languageName: unknown
   linkType: soft
 
@@ -19374,24 +19374,24 @@ __metadata:
   dependencies:
     "@firebase/rules-unit-testing": "npm:^3.0.3"
     "@react-native-async-storage/async-storage": "npm:^1.24.0"
-    "@react-native-firebase/analytics": "npm:20.3.0"
-    "@react-native-firebase/app": "npm:20.3.0"
-    "@react-native-firebase/app-check": "npm:20.3.0"
-    "@react-native-firebase/app-distribution": "npm:20.3.0"
+    "@react-native-firebase/analytics": "npm:20.4.0"
+    "@react-native-firebase/app": "npm:20.4.0"
+    "@react-native-firebase/app-check": "npm:20.4.0"
+    "@react-native-firebase/app-distribution": "npm:20.4.0"
     "@react-native-firebase/app-types": "npm:6.7.2"
-    "@react-native-firebase/auth": "npm:20.3.0"
-    "@react-native-firebase/crashlytics": "npm:20.3.0"
-    "@react-native-firebase/database": "npm:20.3.0"
-    "@react-native-firebase/dynamic-links": "npm:20.3.0"
-    "@react-native-firebase/firestore": "npm:20.3.0"
-    "@react-native-firebase/functions": "npm:20.3.0"
-    "@react-native-firebase/in-app-messaging": "npm:20.3.0"
-    "@react-native-firebase/installations": "npm:20.3.0"
-    "@react-native-firebase/messaging": "npm:20.3.0"
-    "@react-native-firebase/ml": "npm:20.3.0"
-    "@react-native-firebase/perf": "npm:20.3.0"
-    "@react-native-firebase/remote-config": "npm:20.3.0"
-    "@react-native-firebase/storage": "npm:20.3.0"
+    "@react-native-firebase/auth": "npm:20.4.0"
+    "@react-native-firebase/crashlytics": "npm:20.4.0"
+    "@react-native-firebase/database": "npm:20.4.0"
+    "@react-native-firebase/dynamic-links": "npm:20.4.0"
+    "@react-native-firebase/firestore": "npm:20.4.0"
+    "@react-native-firebase/functions": "npm:20.4.0"
+    "@react-native-firebase/in-app-messaging": "npm:20.4.0"
+    "@react-native-firebase/installations": "npm:20.4.0"
+    "@react-native-firebase/messaging": "npm:20.4.0"
+    "@react-native-firebase/ml": "npm:20.4.0"
+    "@react-native-firebase/perf": "npm:20.4.0"
+    "@react-native-firebase/remote-config": "npm:20.4.0"
+    "@react-native-firebase/storage": "npm:20.4.0"
     "@react-native/babel-preset": "npm:^0.74.84"
     "@react-native/metro-config": "npm:^0.74.84"
     axios: "npm:^1.5.1"