diff --git a/swagger/paths/contact/conversations.yml b/swagger/paths/contact/conversations.yml
index 8664a39be..525ef56d6 100644
--- a/swagger/paths/contact/conversations.yml
+++ b/swagger/paths/contact/conversations.yml
@@ -1,5 +1,7 @@
 get:
-  tags: [Contact]
+  tags:
+    - Contact
+  operationId: contactConversations
   summary: Conversations
   parameters:
     - name: id
diff --git a/swagger/paths/contact/crud.yml b/swagger/paths/contact/crud.yml
index f7addbe61..eee353a74 100644
--- a/swagger/paths/contact/crud.yml
+++ b/swagger/paths/contact/crud.yml
@@ -1,5 +1,7 @@
 get:
-  tags: [Contact]
+  tags:
+    - Contact
+  operationId: contactDetails
   summary: Show Contact
   parameters:
     - name: id
@@ -18,7 +20,9 @@ get:
       description: Access denied
 
 put:
-  tags: [Contact]
+  tags:
+    - Contact
+  operationId: contactUpdate
   summary: Update Contact
   parameters:
     - name: id
diff --git a/swagger/paths/contact/list_create.yml b/swagger/paths/contact/list_create.yml
index 700b510aa..eed02018f 100644
--- a/swagger/paths/contact/list_create.yml
+++ b/swagger/paths/contact/list_create.yml
@@ -1,5 +1,7 @@
 get:
-  tags: [Contact]
+  tags:
+    - Contact
+  operationId: contactList
   description: Listing all the contacts with pagination
   summary: List Contacts
   parameters:
@@ -17,7 +19,9 @@ get:
         $ref: '#/definitions/bad_request_error'
 
 post:
-  tags: [Contact]
+  tags:
+    - Contact
+  operationId: contactCreate
   description: Create New Contact
   parameters:
     - name: data
diff --git a/swagger/paths/conversation/assignments.yml b/swagger/paths/conversation/assignments.yml
index 6e1e23e6a..5f64d894d 100644
--- a/swagger/paths/conversation/assignments.yml
+++ b/swagger/paths/conversation/assignments.yml
@@ -1,5 +1,7 @@
 post:
-  tags: [Conversation]
+  tags:
+    - Conversation
+  operationId: conversationAssignment
   summary: Assign Conversation
   description: Assign a conversation to an agent
   parameters:
diff --git a/swagger/paths/conversation/crud.yml b/swagger/paths/conversation/crud.yml
index 26e759600..cff9c21f8 100644
--- a/swagger/paths/conversation/crud.yml
+++ b/swagger/paths/conversation/crud.yml
@@ -1,5 +1,7 @@
 get:
-  tags: [Conversation]
+  tags:
+    - Conversation
+  operationId: conversationDetails
   summary: Conversation Details
   description: Get all details regarding a conversation with all messages in the conversation
   parameters:
diff --git a/swagger/paths/conversation/labels.yml b/swagger/paths/conversation/labels.yml
index 20c4c0b42..491fb0b20 100644
--- a/swagger/paths/conversation/labels.yml
+++ b/swagger/paths/conversation/labels.yml
@@ -1,5 +1,7 @@
 get:
-  tags: [Conversation]
+  tags:
+    - Conversation
+  operationId: conversationLabelsList
   summary: List Labels
   description: Lists all the labels of a conversation
   parameters:
@@ -19,9 +21,11 @@ get:
       description: Access denied
 
 post:
-  tags: [Conversation]
-  summary: Add Label
-  description: Creates a new label and associates it with the conversation
+  tags:
+    - Conversation
+  operationId: conversationAddLabels
+  summary: Add Labels
+  description: Creates new labels and associates it with the conversation
   parameters:
     - name: id
       in: path
diff --git a/swagger/paths/conversation/list.yml b/swagger/paths/conversation/list.yml
index f119245df..b85b26a2a 100644
--- a/swagger/paths/conversation/list.yml
+++ b/swagger/paths/conversation/list.yml
@@ -1,5 +1,7 @@
 get:
-  tags: [Conversation]
+  tags:
+    - Conversation
+  operationId: conversationList
   description: List all the conversations with pagination
   summary: Conversations List
   parameters:
diff --git a/swagger/paths/conversation/messages.yml b/swagger/paths/conversation/messages.yml
index 33747af55..7c57130ad 100644
--- a/swagger/paths/conversation/messages.yml
+++ b/swagger/paths/conversation/messages.yml
@@ -1,5 +1,7 @@
 post:
-  tags: [Conversation]
+  tags:
+    - Conversation
+  operationId: conversationNewMessage
   summary: Create New Message
   description: All the agent replies are created as new messages through this endpoint
   parameters:
diff --git a/swagger/paths/conversation/toggle_status.yml b/swagger/paths/conversation/toggle_status.yml
index c6fc5f48d..e1dd74bf5 100644
--- a/swagger/paths/conversation/toggle_status.yml
+++ b/swagger/paths/conversation/toggle_status.yml
@@ -1,5 +1,7 @@
 post:
-  tags: [Conversation]
+  tags:
+    - Conversation
+  operationId: conversationToggleStatus
   summary: Toggle Status
   description: Toggles the status of the conversation between open and resolved
   parameters:
diff --git a/swagger/paths/conversation/update_last_seen.yml b/swagger/paths/conversation/update_last_seen.yml
index 1814a380f..ee5a9bf14 100644
--- a/swagger/paths/conversation/update_last_seen.yml
+++ b/swagger/paths/conversation/update_last_seen.yml
@@ -1,5 +1,7 @@
 post:
-  tags: [Conversation]
+  tags:
+    - Conversation
+  operationId: conversationUpdateLastSeen
   summary: Update Last Seen
   description: Updates the last seen of the conversation so that conversations will have the bubbles in the agents screen
   parameters:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index f34817430..fcfd814bf 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -21,6 +21,7 @@
         "tags": [
           "Contact"
         ],
+        "operationId": "contactList",
         "description": "Listing all the contacts with pagination",
         "summary": "List Contacts",
         "parameters": [
@@ -49,6 +50,7 @@
         "tags": [
           "Contact"
         ],
+        "operationId": "contactCreate",
         "description": "Create New Contact",
         "parameters": [
           {
@@ -81,6 +83,7 @@
         "tags": [
           "Contact"
         ],
+        "operationId": "contactDetails",
         "summary": "Show Contact",
         "parameters": [
           {
@@ -110,6 +113,7 @@
         "tags": [
           "Contact"
         ],
+        "operationId": "contactUpdate",
         "summary": "Update Contact",
         "parameters": [
           {
@@ -149,6 +153,7 @@
         "tags": [
           "Contact"
         ],
+        "operationId": "contactConversations",
         "summary": "Conversations",
         "parameters": [
           {
@@ -180,6 +185,7 @@
         "tags": [
           "Conversation"
         ],
+        "operationId": "conversationList",
         "description": "List all the conversations with pagination",
         "summary": "Conversations List",
         "parameters": [
@@ -210,6 +216,7 @@
         "tags": [
           "Conversation"
         ],
+        "operationId": "conversationDetails",
         "summary": "Conversation Details",
         "description": "Get all details regarding a conversation with all messages in the conversation",
         "parameters": [
@@ -242,6 +249,7 @@
         "tags": [
           "Conversation"
         ],
+        "operationId": "conversationToggleStatus",
         "summary": "Toggle Status",
         "description": "Toggles the status of the conversation between open and resolved",
         "parameters": [
@@ -274,6 +282,7 @@
         "tags": [
           "Conversation"
         ],
+        "operationId": "conversationUpdateLastSeen",
         "summary": "Update Last Seen",
         "description": "Updates the last seen of the conversation so that conversations will have the bubbles in the agents screen",
         "parameters": [
@@ -303,6 +312,7 @@
         "tags": [
           "Conversation"
         ],
+        "operationId": "conversationLabelsList",
         "summary": "List Labels",
         "description": "Lists all the labels of a conversation",
         "parameters": [
@@ -333,8 +343,9 @@
         "tags": [
           "Conversation"
         ],
-        "summary": "Add Label",
-        "description": "Creates a new label and associates it with the conversation",
+        "operationId": "conversationAddLabels",
+        "summary": "Add Labels",
+        "description": "Creates new labels and associates it with the conversation",
         "parameters": [
           {
             "name": "id",
@@ -382,6 +393,7 @@
         "tags": [
           "Conversation"
         ],
+        "operationId": "conversationAssignment",
         "summary": "Assign Conversation",
         "description": "Assign a conversation to an agent",
         "parameters": [
@@ -427,6 +439,7 @@
         "tags": [
           "Conversation"
         ],
+        "operationId": "conversationNewMessage",
         "summary": "Create New Message",
         "description": "All the agent replies are created as new messages through this endpoint",
         "parameters": [