diff --git a/docs/getting-started/troubleshooting/android.mdx b/docs/getting-started/troubleshooting/android.mdx
index ad15af9f4..bed074025 100644
--- a/docs/getting-started/troubleshooting/android.mdx
+++ b/docs/getting-started/troubleshooting/android.mdx
@@ -24,7 +24,7 @@ On a terminal, run the following:
 adb shell am start -n <APP_PACKAGE>/com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity
 ```
 
-This will only work if you added `FlipperDiagnosticActivity` to your `AndroidManifest.xml`. See [getting started](./getting-started/android-native.mdx#diagnostics) for help.
+This will only work if you added `FlipperDiagnosticActivity` to your `AndroidManifest.xml`. See [getting started](../android-native.mdx#diagnostics) for help.
 
 ## Exception from call site #4 bootstrap method
 
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 9a710afab..38282a0ca 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -7,9 +7,7 @@
  * @format
  */
 
-// start-import-example
-const {fbContent, fbInternalOnly} = require('internaldocs-fb-helpers');
-// end-import-example
+const {fbContent, fbInternalOnly} = require('docusaurus-plugin-internaldocs-fb/internal');
 
 const repoUrl = 'https://github.com/facebook/flipper';
 const siteUrl = fbContent({
@@ -47,7 +45,7 @@ const siteConfig = {
       },
       items: [
         {
-          to: 'docs/features/index',
+          to: 'docs/features',
           label: 'Features',
           position: 'right',
         },
@@ -62,7 +60,7 @@ const siteConfig = {
           position: 'right',
         },
         {
-          to: 'docs/internals/index',
+          to: 'docs/internals',
           label: 'Under the Hood',
           position: 'right',
         },
@@ -102,7 +100,7 @@ const siteConfig = {
           items: [
             {
               label: 'Core Plugins',
-              to: 'docs/features/index',
+              to: 'docs/features',
             },
             {
               label: 'Community Plugins',
@@ -270,7 +268,7 @@ const siteConfig = {
           },
           {
             to: '/docs/getting-started',
-            from: ['/docs/fb/index'],
+            from: ['/docs/fb'],
           },
           {
             from: ['/docs/features/network-plugin'],
@@ -371,7 +369,16 @@ const siteConfig = {
               to: '/docs/features/plugins/mobile-config',
             },
           ]),
-        ],
+        ].map(x => ({
+          ...x,
+          from: x.from.reduce(
+            (acc, href) => {
+              acc.push(href, `${href}/index`);
+              return acc;
+            },
+            [],
+          )}),
+        ),
       },
     ],
   ],