diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index 5db01d5737a3..6b4e220ac314 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -38,7 +38,9 @@
       "docset_name": "azuredotnet",
       "open_to_public_contributors": false,
       "monikers": [
-        "azure-dotnet"
+        "azure-dotnet",
+        "azure-dotnet-preview",
+        "azure-dotnet-legacy"
       ],
       "version": 0,
       "build_source_folder": ".",
diff --git a/api/overview/azure/messaging.eventhubs-readme.md b/api/overview/azure/messaging.eventhubs-readme.md
index eb6f639f1e2f..654c889ff277 100644
--- a/api/overview/azure/messaging.eventhubs-readme.md
+++ b/api/overview/azure/messaging.eventhubs-readme.md
@@ -11,7 +11,19 @@ ms.devlang: dotnet
 ms.service: eventhubs
 ---
 
-# Azure Event Hubs client library for .NET - Version 5.6.2 
+#  Azure Event Hubs client library for .NET (H1)
+
+::: moniker range="azure-dotnet-preview"
+ Azure Event Hubs client library for .NET - Preview 
+::: moniker-end
+
+::: moniker range="azure-dotnet"
+ Azure Event Hubs client library for .NET - Version 5.6.2 
+::: moniker-end
+
+::: moniker range="azure-dotnet-legacy"
+Azure Event Hubs client library for .NET - Legacy
+::: moniker-end
 
 
 Azure Event Hubs is a highly scalable publish-subscribe service that can ingest millions of events per second and stream them to multiple consumers. This lets you process and analyze the massive amounts of data produced by your connected devices and applications. Once Event Hubs has collected the data, you can retrieve, transform, and store it by using any real-time analytics provider or with batching/storage adapters.  If you would like to know more about Azure Event Hubs, you may wish to review: [What is Event Hubs](https://docs.microsoft.com/azure/event-hubs/event-hubs-about).
diff --git a/docfx.json b/docfx.json
index 67b71319f1fc..8789440d3c8d 100644
--- a/docfx.json
+++ b/docfx.json
@@ -12,26 +12,30 @@
           "**/includes/**"
         ],
         "src": "api",
-        "dest": "api"
+        "dest": "api",
+        "group": "all"
       },
       {
         "files": [
           "**/toc.yml"
         ],
         "src": "api",
-        "dest": "api/azure_ref_toc"
+        "dest": "api/azure_ref_toc",
+        "group": "all"
       },
       {
         "files": [
           "index.md"
-        ]
+        ],
+        "group": "all"
       },
       {
         "files": [
           "toc.yml"
         ],
         "src": "breadcrumb",
-        "dest": "azure_breadcrumb"
+        "dest": "azure_breadcrumb",
+        "group": "all"
       },
       {
         "files": [
@@ -42,7 +46,8 @@
           "**/includes/**"
         ],
         "src": "docs-ref-conceptual",
-        "dest": "azure"
+        "dest": "azure",
+        "group": "all"
       }
     ],
     "resource": [
@@ -55,14 +60,16 @@
         ],
         "exclude": [
           "**/obj/**"
-        ]
+        ],
+        "group": "all"
       }
     ],
     "overwrite": [
       {
         "files": [
           "api/overwrites/**/*.md"
-        ]
+        ],
+        "group": "all"
       }
     ],
     "globalMetadata": {
@@ -100,6 +107,9 @@
         }
       }
     },
+    "groups" : {
+      "all":{"moniker_range": "azure-dotnet  || azure-dotnet-preview || azure-dotnet-legacy" }
+    },
     "fileMetadata": {
       "ms.service": {
         "api/Azure.Communication*.yml": "azure-communication-services",
@@ -695,20 +705,6 @@
           "https://authoring-docs-microsoft.poolparty.biz/devrel/f0234678-3067-4edc-abf7-8142d54bb7d2"
         ]
       },
-      "version": {
-        "api/overview/azure/**/*.yml": [
-          "azure-dotnet",
-          "azure-dotnet-preview",
-          "azure-dotnet-legacy"
-        ]
-      },
-      "monikers": {
-        "api/overview/azure/**/*.yml": [
-          "azure-dotnet",
-          "azure-dotnet-preview",
-          "azure-dotnet-legacy"
-        ]
-      },
       "langs": {
         "api/**.yml": [
           "csharp",