diff --git a/swagger.yaml b/swagger.yaml
index a19ed110..69f9dd15 100644
--- a/swagger.yaml
+++ b/swagger.yaml
@@ -25,7 +25,9 @@ paths:
   /status:
     get:
       description: |
-        Gets Mainflux server status
+        Gets Mainflux server status.
+      tags:
+        - status
       responses:
         '200':
           description: Server is running
@@ -36,6 +38,8 @@ paths:
     get:
       description: |
         Gets all of the existing `Device` objects.
+      tags:
+        - devices
       parameters:
         - name: X-Auth-Token
           in: header
@@ -59,6 +63,8 @@ paths:
       description: |
         Creates `Device` object.
         Returns newly created Device object.
+      tags:
+        - devices
       parameters:
         - name: X-Auth-Token
           in: header
@@ -79,6 +85,8 @@ paths:
     get:
       description: |
         Gets `Device` object from the database by `deviceUuid`.
+      tags:
+        - devices
       parameters:
         - name: X-Auth-Token
           in: header
@@ -103,6 +111,8 @@ paths:
     put:
       description: |
         Updates Thing object from the database.
+      tags:
+        - devices
       parameters:
         - name: X-Auth-Token
           in: header
@@ -132,6 +142,8 @@ paths:
     delete:
       description: |
         Deletes Thing object from the database.
+      tags:
+        - devices
       parameters:
         - name: X-Auth-Token
           in: header