diff --git a/docs/index.md b/docs/index.md
index 97e6fb4a..3ac583c3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,11 +9,11 @@ description: React Native Firebase version 6.x.x module index
 
 React Native Firebase requires the following platform versions: 
 
-| Platform                                                     | Minimum Version | 
-|--------------------------------------------------------------|-----------------|
-| React Native                                                 | 0.60.0          |
-| Android API                                                  | 16              |
-| iOS                                                          | 10.0            |
+| Platform                                                     | Minimum Version            | 
+|--------------------------------------------------------------|----------------------------|
+| React Native                                                 | {{ versions.reactnative }} |
+| Android API                                                  | {{ versions.android }}     |
+| iOS                                                          | {{ versions.ios }}         |
 
 ## Firebase Modules
 
@@ -21,10 +21,27 @@ Each Firebase module is published as it's own package on [NPM](https://www.npmjs
 individually installed using [`Yarn`](https://yarnpkg.com/lang/en/). Please refer to the quick start guide
 for installation instructions on each individual module page.
  
-> The main package that you interface with is App (@react-native-firebase/app)
+> The main package that you interface with is <Anchor version href="/app">App</Anchor> (`@react-native-firebase/app`)
 
 | Module                                                       | Downloads | Coverage |
 |--------------------------------------------------------------|-----------|----------|
 | <Anchor version href="/admob">AdMob</Anchor>                 |           |          |
 | <Anchor version href="/analytics">Analytics</Anchor>         |           |          |
-|                                                              |           |          |
+| <Anchor version href="/app">App</Anchor>                     |           |          |
+| <Anchor version href="/indexing">App Indexing</Anchor>       |           |          |
+| <Anchor version href="/invites">App Invites</Anchor>         |           |          |
+| <Anchor version href="/auth">Authentication</Anchor>         |           |          |
+| <Anchor version href="/firestore">Cloud Firestore</Anchor>   |           |          |
+| <Anchor version href="/functions">Cloud Functions</Anchor>   |           |          |
+| <Anchor version href="/messaging">Cloud Messaging</Anchor>   |           |          |
+| <Anchor version href="/storage">Cloud Storage</Anchor>       |           |          |
+| <Anchor version href="/crashlytics">Crashlytics</Anchor>     |           |          |
+| <Anchor version href="/links">Dynamic Links</Anchor>         |           |          |
+| <Anchor version href="/fiam">In-app Messaging</Anchor>       |           |          |
+| <Anchor version href="/iid">Instance ID</Anchor>             |           |          |
+| <Anchor version href="/mlkit">ML Kit</Anchor>                |           |          |
+| <Anchor version href="/notifications">Notifications</Anchor> |           |          |
+| <Anchor version href="/perf">Performance Monitoring</Anchor> |           |          |
+| <Anchor version href="/database">Realtime Database</Anchor>  |           |          |
+| <Anchor version href="/config">Remote Config</Anchor>        |           |          |
+| <Anchor version href="/utils">Utils</Anchor>                 |           |          |
diff --git a/docs/variables.yaml b/docs/variables.yaml
index 2daf8cc4..b1a75553 100644
--- a/docs/variables.yaml
+++ b/docs/variables.yaml
@@ -1,45 +1,4 @@
-android:
-  build:
-    tools: 3.1.3
-  fabric:
-    tools: 1.25.4
-    version: 2.9.4
-  firebase:
-    version: 16.0.3
-    ads: 15.0.1
-    analytics: 16.0.3
-    auth: 16.0.3
-    config: 16.0.0
-    core: 16.0.3
-    crash: 16.0.1
-    crashlytics: 2.9.5
-    database: 16.0.2
-    firestore: 17.1.0
-    functions: 16.1.0
-    invites: 16.0.3
-    messaging: 17.3.2
-    perf: 16.1.0
-    storage: 16.0.2
-    plugins: 1.1.1
-  gms:
-    google-services: 4.0.1
-    play-services-base: 15.0.1
-ios:
-  fabric:
-    tools: 1.7.11
-    version: 3.10.7
-  firebase:
-    ads: 5.9.0
-    auth: 5.9.0
-    config: 5.9.0
-    core: 5.9.0
-    crash: 5.9.0
-    crashlytics: 3.10.7
-    database: 5.9.0
-    firestore: 5.9.0
-    functions: 5.9.0
-    invites: 5.9.0
-    links: 5.9.0
-    messaging: 5.9.0
-    perf: 5.9.0
-    storage: 5.9.0
+versions:
+  reactnative: 0.60.0
+  android: 16
+  ios: 10.0