diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index 004f40fc7a..ef7f454d15 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -12,7 +12,8 @@
       "monikers": [],
       "open_to_public_contributors": true,
       "type_mapping": {
-        "Conceptual": "Content"
+        "Conceptual": "Content",
+        "ZonePivotGroups": "Toc"
       },
       "build_entry_point": "docs"
     }
diff --git a/docfx.json b/docfx.json
index 556c12acfb..8c1d7139b9 100644
--- a/docfx.json
+++ b/docfx.json
@@ -7,14 +7,9 @@
           "**/*.yml"
         ],
         "exclude": [
-          "iot-edge/**",
-          "ai-services/document-intelligence/**",
           "**/_themes/**",
           "**/includes/**",
-          "**/obj/**",
-          "**/*.graffle",
-          "machine-learning/**",
-          "machine-learning/v1/**"
+          "**/obj/**"
         ],
         "src": "articles",
         "dest": "."
@@ -25,6 +20,13 @@
         ],
         "src": "breadcrumb/azure-compute",
         "dest": "breadcrumb/azure-compute"
+      },
+      {
+        "files": [
+          "zone-pivot-groups.yml"
+        ],
+        "src": "zone-pivots",
+        "dest": "zone-pivots/azure-compute"
       }
     ],
     "resource": [
@@ -37,12 +39,8 @@
           "**/*.svg"
         ],
         "exclude": [
-          "iot-edge/**",
-          "ai-services/document-intelligence/**",
           "**/_themes/**",
-          "**/obj/**",
-          "machine-learning/**",
-          "machine-learning/v1/**"
+          "**/obj/**"
         ],
         "src": "articles",
         "dest": "."
@@ -140,7 +138,8 @@
         "Certification"
       ],
       "uhfHeaderId": "azure",
-      "ms.suite": "office"
+      "ms.suite": "office",
+      "zone_pivot_group_filename": "zone-pivots/azure-compute/zone-pivot-groups.json"
     },
     "fileMetadata": {
       "author": {
@@ -243,7 +242,7 @@
     "overwrite": [],
     "externalReference": [],
     "template": [],
-	"rules": {
+	  "rules": {
       "sensitive-language-ma": {
         "exclude": [
           "articles/virtual-machines/workloads/sap/dbms-guide-ha-ibm.md",
diff --git a/zone-pivots/zone-pivot-groups.yml b/zone-pivots/zone-pivot-groups.yml
new file mode 100644
index 0000000000..45c162af8a
--- /dev/null
+++ b/zone-pivots/zone-pivot-groups.yml
@@ -0,0 +1,10 @@
+### YamlMime:ZonePivotGroups
+groups:
+- id: empty
+  title: empty
+  prompt: empty
+  pivots:
+  - id: empty1
+    title: empty1
+  - id: empty2
+    title: empty2