diff --git a/developer-docs/docs.json b/developer-docs/docs.json
index de0f70bc5..76d447b3b 100644
--- a/developer-docs/docs.json
+++ b/developer-docs/docs.json
@@ -36,6 +36,9 @@
               "Agents",
               "Canned Responses",
               "Contacts",
+              "Contact Labels",
+              "Conversation Assignments",
+              "Conversation Labels",
               "Conversations",
               "Custom Attributes",
               "Custom Filters",
diff --git a/swagger/index.yml b/swagger/index.yml
index fa3bbc8ca..e27425d41 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -38,9 +38,9 @@ tags:
   - name: Accounts
     description: Account management APIs
   - name: Account Users
-    description: Account Users management APIs
+    description: Account user management APIs
   - name: AgentBots
-    description: Bot management APIs
+    description: Bot integrations
   - name: Users
     description: User management APIs
   - name: Account AgentBots
@@ -51,6 +51,12 @@ tags:
     description: Pre-defined responses for common queries
   - name: Contacts
     description: Contact management APIs
+  - name: Contact Labels
+    description: Manage contact labels
+  - name: Conversation Assignments
+    description: Manage conversation assignments
+  - name: Conversation Labels
+    description: Manage conversation labels
   - name: Conversations
     description: Conversation management APIs
   - name: Custom Attributes
@@ -76,11 +82,11 @@ tags:
   - name: Help Center
     description: Knowledge base management
   - name: Contacts API
-    description: Public APIs for contacts
+    description: Public contact APIs
   - name: Conversations API
-    description: Public APIs for conversations
+    description: Public conversation APIs
   - name: Messages API
-    description: Public APIs for messages
+    description: Public message APIs
   - name: CSAT Survey Page
     description: Customer satisfaction survey
 x-tagGroups:
@@ -96,6 +102,9 @@ x-tagGroups:
       - Agents
       - Canned Responses
       - Contacts
+      - Contact Labels
+      - Conversation Assignments
+      - Conversation Labels
       - Conversations
       - Custom Attributes
       - Custom Filters
diff --git a/swagger/paths/application/contacts/labels.yml b/swagger/paths/application/contacts/labels.yml
index 61be4a545..a764e36b2 100644
--- a/swagger/paths/application/contacts/labels.yml
+++ b/swagger/paths/application/contacts/labels.yml
@@ -9,7 +9,7 @@ parameters:
 
 get:
   tags:
-    - Contacts
+    - Contact Labels
   operationId: list-all-labels-of-a-contact
   summary: List Labels
   description: Lists all the labels of a contact
@@ -37,7 +37,7 @@ get:
 
 post:
   tags:
-    - Contacts
+    - Contact Labels
   operationId: contact-add-labels
   summary: Add Labels
   description: Add labels to a contact. Note that this API would overwrite the existing list of labels associated to the conversation.
diff --git a/swagger/paths/application/conversation/assignments.yml b/swagger/paths/application/conversation/assignments.yml
index 50fdacbf0..49b7022db 100644
--- a/swagger/paths/application/conversation/assignments.yml
+++ b/swagger/paths/application/conversation/assignments.yml
@@ -1,5 +1,5 @@
 tags:
-  - Conversations
+  - Conversation Assignments
 operationId: assign-a-conversation
 summary: Assign Conversation
 description: Assign a conversation to an agent or a team
diff --git a/swagger/paths/application/conversation/labels/create.yml b/swagger/paths/application/conversation/labels/create.yml
index 6df685ccd..461bd3eac 100644
--- a/swagger/paths/application/conversation/labels/create.yml
+++ b/swagger/paths/application/conversation/labels/create.yml
@@ -1,5 +1,5 @@
 tags:
-  - Conversations
+  - Conversation Labels
 operationId: conversation-add-labels
 summary: Add Labels
 security:
diff --git a/swagger/paths/application/conversation/labels/index.yml b/swagger/paths/application/conversation/labels/index.yml
index 5c8b3e597..518910cc6 100644
--- a/swagger/paths/application/conversation/labels/index.yml
+++ b/swagger/paths/application/conversation/labels/index.yml
@@ -1,5 +1,5 @@
 tags:
-  - Conversations
+  - Conversation Labels
 operationId: list-all-labels-of-a-conversation
 summary: List Labels
 security:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 56b3b6afd..80c493c01 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -2881,7 +2881,7 @@
       ],
       "get": {
         "tags": [
-          "Contacts"
+          "Contact Labels"
         ],
         "operationId": "list-all-labels-of-a-contact",
         "summary": "List Labels",
@@ -2928,7 +2928,7 @@
       },
       "post": {
         "tags": [
-          "Contacts"
+          "Contact Labels"
         ],
         "operationId": "contact-add-labels",
         "summary": "Add Labels",
@@ -4862,7 +4862,7 @@
       ],
       "post": {
         "tags": [
-          "Conversations"
+          "Conversation Assignments"
         ],
         "operationId": "assign-a-conversation",
         "summary": "Assign Conversation",
@@ -4946,7 +4946,7 @@
       ],
       "get": {
         "tags": [
-          "Conversations"
+          "Conversation Labels"
         ],
         "operationId": "list-all-labels-of-a-conversation",
         "summary": "List Labels",
@@ -4993,7 +4993,7 @@
       },
       "post": {
         "tags": [
-          "Conversations"
+          "Conversation Labels"
         ],
         "operationId": "conversation-add-labels",
         "summary": "Add Labels",
@@ -11929,11 +11929,11 @@
     },
     {
       "name": "Account Users",
-      "description": "Account Users management APIs"
+      "description": "Account user management APIs"
     },
     {
       "name": "AgentBots",
-      "description": "Bot management APIs"
+      "description": "Bot integrations"
     },
     {
       "name": "Users",
@@ -11955,6 +11955,18 @@
       "name": "Contacts",
       "description": "Contact management APIs"
     },
+    {
+      "name": "Contact Labels",
+      "description": "Manage contact labels"
+    },
+    {
+      "name": "Conversation Assignments",
+      "description": "Manage conversation assignments"
+    },
+    {
+      "name": "Conversation Labels",
+      "description": "Manage conversation labels"
+    },
     {
       "name": "Conversations",
       "description": "Conversation management APIs"
@@ -12005,15 +12017,15 @@
     },
     {
       "name": "Contacts API",
-      "description": "Public APIs for contacts"
+      "description": "Public contact APIs"
     },
     {
       "name": "Conversations API",
-      "description": "Public APIs for conversations"
+      "description": "Public conversation APIs"
     },
     {
       "name": "Messages API",
-      "description": "Public APIs for messages"
+      "description": "Public message APIs"
     },
     {
       "name": "CSAT Survey Page",
@@ -12037,6 +12049,9 @@
         "Agents",
         "Canned Responses",
         "Contacts",
+        "Contact Labels",
+        "Conversation Assignments",
+        "Conversation Labels",
         "Conversations",
         "Custom Attributes",
         "Custom Filters",
diff --git a/swagger/tag_groups/application.yml b/swagger/tag_groups/application.yml
index d99d1b12f..85d96c5b7 100644
--- a/swagger/tag_groups/application.yml
+++ b/swagger/tag_groups/application.yml
@@ -20,6 +20,12 @@ tags:
     description: Manage canned responses
   - name: Contacts
     description: Manage contacts
+  - name: Contact Labels
+    description: Manage contact labels
+  - name: Conversation Assignments
+    description: Manage conversation assignments
+  - name: Conversation Labels
+    description: Manage conversation labels
   - name: Conversations
     description: Manage conversations
   - name: Custom Attributes
diff --git a/swagger/tag_groups/application_swagger.json b/swagger/tag_groups/application_swagger.json
index 20e34b990..3f496e143 100644
--- a/swagger/tag_groups/application_swagger.json
+++ b/swagger/tag_groups/application_swagger.json
@@ -1362,7 +1362,7 @@
       ],
       "get": {
         "tags": [
-          "Contacts"
+          "Contact Labels"
         ],
         "operationId": "list-all-labels-of-a-contact",
         "summary": "List Labels",
@@ -1409,7 +1409,7 @@
       },
       "post": {
         "tags": [
-          "Contacts"
+          "Contact Labels"
         ],
         "operationId": "contact-add-labels",
         "summary": "Add Labels",
@@ -3193,7 +3193,7 @@
       ],
       "post": {
         "tags": [
-          "Conversations"
+          "Conversation Assignments"
         ],
         "operationId": "assign-a-conversation",
         "summary": "Assign Conversation",
@@ -3277,7 +3277,7 @@
       ],
       "get": {
         "tags": [
-          "Conversations"
+          "Conversation Labels"
         ],
         "operationId": "list-all-labels-of-a-conversation",
         "summary": "List Labels",
@@ -3324,7 +3324,7 @@
       },
       "post": {
         "tags": [
-          "Conversations"
+          "Conversation Labels"
         ],
         "operationId": "conversation-add-labels",
         "summary": "Add Labels",
@@ -10234,6 +10234,18 @@
       "name": "Contacts",
       "description": "Contact management APIs"
     },
+    {
+      "name": "Contact Labels",
+      "description": "Manage contact labels"
+    },
+    {
+      "name": "Conversation Assignments",
+      "description": "Manage conversation assignments"
+    },
+    {
+      "name": "Conversation Labels",
+      "description": "Manage conversation labels"
+    },
     {
       "name": "Conversations",
       "description": "Conversation management APIs"
@@ -10300,6 +10312,9 @@
         "Agents",
         "Canned Responses",
         "Contacts",
+        "Contact Labels",
+        "Conversation Assignments",
+        "Conversation Labels",
         "Conversations",
         "Custom Attributes",
         "Custom Filters",
diff --git a/swagger/tag_groups/client_swagger.json b/swagger/tag_groups/client_swagger.json
index d63d4c3dc..3c59a7f4f 100644
--- a/swagger/tag_groups/client_swagger.json
+++ b/swagger/tag_groups/client_swagger.json
@@ -4895,15 +4895,15 @@
   "tags": [
     {
       "name": "Contacts API",
-      "description": "Public APIs for contacts"
+      "description": "Public contact APIs"
     },
     {
       "name": "Conversations API",
-      "description": "Public APIs for conversations"
+      "description": "Public conversation APIs"
     },
     {
       "name": "Messages API",
-      "description": "Public APIs for messages"
+      "description": "Public message APIs"
     }
   ],
   "x-tagGroups": [
@@ -4923,6 +4923,9 @@
         "Agents",
         "Canned Responses",
         "Contacts",
+        "Contact Labels",
+        "Conversation Assignments",
+        "Conversation Labels",
         "Conversations",
         "Custom Attributes",
         "Custom Filters",
diff --git a/swagger/tag_groups/other_swagger.json b/swagger/tag_groups/other_swagger.json
index 9d78d9825..c0f65e20d 100644
--- a/swagger/tag_groups/other_swagger.json
+++ b/swagger/tag_groups/other_swagger.json
@@ -4308,6 +4308,9 @@
         "Agents",
         "Canned Responses",
         "Contacts",
+        "Contact Labels",
+        "Conversation Assignments",
+        "Conversation Labels",
         "Conversations",
         "Custom Attributes",
         "Custom Filters",
diff --git a/swagger/tag_groups/platform_swagger.json b/swagger/tag_groups/platform_swagger.json
index 26b96db93..330bd8142 100644
--- a/swagger/tag_groups/platform_swagger.json
+++ b/swagger/tag_groups/platform_swagger.json
@@ -5085,11 +5085,11 @@
     },
     {
       "name": "Account Users",
-      "description": "Account Users management APIs"
+      "description": "Account user management APIs"
     },
     {
       "name": "AgentBots",
-      "description": "Bot management APIs"
+      "description": "Bot integrations"
     },
     {
       "name": "Users",
@@ -5113,6 +5113,9 @@
         "Agents",
         "Canned Responses",
         "Contacts",
+        "Contact Labels",
+        "Conversation Assignments",
+        "Conversation Labels",
         "Conversations",
         "Custom Attributes",
         "Custom Filters",