diff --git a/docfx.json b/docfx.json
index 4f9ec3fafacf..174f9312775f 100644
--- a/docfx.json
+++ b/docfx.json
@@ -1,6 +1,19 @@
 {
   "build": {
     "content": [
+      {
+        "files": [
+          "overview/azure/**/*.yml",
+          "overview/azure/**/*.md"
+        ],
+        "exclude": [
+          "**/toc.yml",
+          "**/includes/**"
+        ],
+        "src": "api",
+        "dest": "api",
+        "group": "all-monikers"
+      },
       {
         "files": [
           "**/*.yml",
@@ -700,14 +713,7 @@
         ]
       },
       "version": {
-        "api/overview/azure/**/*.yml": [
-          "azure-dotnet",
-          "azure-dotnet-preview",
-          "azure-dotnet-legacy"
-        ]
-      },
-      "monikers": {
-        "api/overview/azure/**/*.yml": [
+        "api/overview/azure/**/*": [
           "azure-dotnet",
           "azure-dotnet-preview",
           "azure-dotnet-legacy"
@@ -800,6 +806,12 @@
     },
     "markdownEngineName": "markdig",
     "dest": "_site",
+    "groups": {
+      "all-monikers": {
+        "dest": "all",
+        "moniker_range": "azure-dotnet || azure-dotnet-preview || azure-dotnet-legacy"
+      }
+    },
     "template": [
       "docs.html"
     ],
@@ -809,4 +821,4 @@
     "lruSize": 0,
     "debug": true
   }
-}
\ No newline at end of file
+}