diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4d8475a8c62bf..8d5f0c490f4cd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -192,12 +192,35 @@
 # ServiceLabel: %Commerce %Service Attention
 #/<NotInRepo>/            @ms-premp @qiaozha
 
-# PRLabel: %Communication
-/sdk/communication/                                     @acsdevx-msft
+# PRLabel: %Communication - Calling Server
+/sdk/communication/Azure.Communication.CallingServer/   @Azure/acs-identity-sdk @petrsvihlik @AikoBB @maximrytych-ms @martinbarnas-ms
+
+# PRLabel: %Communication - Chat
+/sdk/communication/Azure.Communication.Chat/   @Azure/acs-identity-sdk @petrsvihlik @AikoBB @maximrytych-ms @martinbarnas-ms
+
+# PRLabel: %Communication - Common
+/sdk/communication/Azure.Communication.Common/          @Azure/acs-identity-sdk @petrsvihlik @AikoBB @maximrytych-ms @martinbarnas-ms
+
+# PRLabel: %Communication - Identity
+/sdk/communication/Azure.Communication.Identity/        @Azure/acs-identity-sdk @petrsvihlik @AikoBB @maximrytych-ms @martinbarnas-ms
+
+# PRLabel: %Communication - Network Traversal
+/sdk/communication/Azure.Communication.NetworkTraversal/ @Azure/acs-identity-sdk @petrsvihlik @AikoBB @maximrytych-ms @martinbarnas-ms
+
+# PRLabel: %Communication - Phone Numbers
 /sdk/communication/Azure.Communication.PhoneNumbers/    @miguhern @whisper6284 @lucasrsant @RoyHerrod @danielav7
+
+# PRLabel: %Communication - Short Codes
+/sdk/communication/Azure.Communication.ShortCodes/      @Azure/acs-identity-sdk @petrsvihlik @AikoBB @maximrytych-ms @martinbarnas-ms
+
+# PRLabel: %Communication - SMS
 /sdk/communication/Azure.Communication.Sms/             @RoyHerrod @arifibrahim4
-/sdk/communication/Azure.Communication.Identity/        @Azure/acs-identity-sdk @petrsvihlik @AikoBB @maximrytych-ms @martinbarnas-ms
-/sdk/communication/Azure.Communication.Common/          @Azure/acs-identity-sdk @petrsvihlik @AikoBB @maximrytych-ms @martinbarnas-ms
+
+# PRLabel: %Communication - Resource Manager
+/sdk/communication/Azure.ResourceManager.Communication/
+
+# PRLabel: %Communication
+/sdk/communication/                                     @acsdevx-msft
 
 # ServiceLabel: %Compute %Service Attention
 # PRLabel: %Compute
diff --git a/.github/fabricbot.json b/.github/fabricbot.json
index b4c49fe5c4759..18d1dbea62758 100644
--- a/.github/fabricbot.json
+++ b/.github/fabricbot.json
@@ -1012,6 +1012,60 @@
           "pathFilter": [
             "/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/"
           ]
+        },
+        {
+          "label": "Communication - Calling Server",
+          "pathFilter": [
+            "/sdk/communication/Azure.Communication.CallingServer/"
+          ]
+        },
+        {
+          "label": "Communication - Chat",
+          "pathFilter": [
+            "/sdk/communication/Azure.Communication.Chat/"
+          ]
+        },
+        {
+          "label": "Communication - Common",
+          "pathFilter": [
+            "/sdk/communication/Azure.Communication.Common/"
+          ]
+        },
+        {
+          "label": "Communication - Identity",
+          "pathFilter": [
+            "/sdk/communication/Azure.Communication.Identity/"
+          ]
+        },
+        {
+          "label": "Communication - Network Traversal",
+          "pathFilter": [
+            "/sdk/communication/Azure.Communication.NetworkTraversal/"
+          ]
+        },
+        {
+          "label": "Communication - Phone Numbers",
+          "pathFilter": [
+            "/sdk/communication/Azure.Communication.PhoneNumbers/"
+          ]
+        },
+        {
+          "label": "Communication - Short Codes",
+          "pathFilter": [
+            "/sdk/communication/Azure.Communication.ShortCodes/"
+          ]
+        },
+        {
+          "label": "Communication - SMS",
+          "pathFilter": [
+            "/sdk/communication/Azure.Communication.Sms/"
+          ]
+        },
+        {
+          "label": "Communication - Resource Manager",
+          "pathFilter": [
+            "/sdk/communication/Azure.ResourceManager.Communication/"
+          ]
         }
       ],
       "taskName": "Auto PR based on folder paths "
@@ -4037,4 +4091,4 @@
       ]
     }
   }
-]
+]
\ No newline at end of file