diff --git a/docfx.json b/docfx.json
index 60a55f6c18d83..22216c256e04d 100644
--- a/docfx.json
+++ b/docfx.json
@@ -236,9 +236,9 @@
         "**/com.azure.resourcemanager.videoanalyzer**.yml": "azure-video-analyzer",
         "**/com.microsoft.aad.adal**.yml": "active-directory",
         "**/com.azure.resourcemanager.synapse**.yml": "synapse-analytics",
-        "**/com.microsoft.applicationinsights**.yml": "application-insights",
+        "**/com.microsoft.applicationinsights**.yml": "azure-monitor",
         "**/com.microsoft.azure.cognitiveservices**.yml": "cognitive-services",
-        "**/com.microsoft.azure.applicationinsights**.yml": "application-insights",
+        "**/com.microsoft.azure.applicationinsights**.yml": "azure-monitor",
         "**/com.microsoft.azure.batch**.yml": "batch",
         "**/com.microsoft.azure.cosmosdb**.yml": "cosmos-db",
         "**/com.microsoft.azure.datalake.store**.yml": "data-lake-store",
@@ -250,9 +250,9 @@
         "**/com.microsoft.azure.eventprocessorhost**.yml": "event-hubs",
         "**/com.microsoft.azure.functions**.yml": "azure-functions",
         "**/com.microsoft.azure.keyvault**.yml": "key-vault",
-        "**/com.microsoft.azure.loganalytics**.yml": "application-insights",
+        "**/com.microsoft.azure.loganalytics**.yml": "azure-monitor",
         "**/com.microsoft.azure.management.appservice**.yml": "app-service",
-        "**/com.microsoft.azure.management.applicationinsights**.yml": "application-insights",
+        "**/com.microsoft.azure.management.applicationinsights**.yml": "azure-monitor",
         "**/com.microsoft.azure.management.appplatform.v2020_07_01**.yml": "spring-cloud",
         "**/com.microsoft.azure.management.batch**.yml": "batch",
         "**/com.microsoft.azure.management.cdn**.yml": "cdn",
@@ -313,6 +313,12 @@
         "**/system.fabric**.yml": "service-fabric",
         "**/tools.com.microsoft.azure.sdk.iot**.yml": "iot-hub"
       },
+      "ms.subservice": {
+        "**/com.microsoft.applicationinsights**.yml": "application-insights",
+        "**/com.microsoft.azure.applicationinsights**.yml": "application-insights",
+        "**/com.microsoft.azure.loganalytics**.yml": "application-insights",
+        "**/com.microsoft.azure.management.applicationinsights**.yml": "application-insights"
+      },
       "searchScope": {
         "**/com.microsoft.azure.cosmosdb**.yml": [ "Azure Cosmos DB", "Azure", "Azure Java" ],
         "**/com.microsoft.azure.documentdb**.yml": [ "Azure Cosmos DB", "Azure", "Azure Java" ],