diff --git a/spec/updated/csource-registrations-spec.json b/spec/updated/csource-registrations-spec.json
index 56f14046bbcff124eeb156c3a62ccc6cac0d9bc6..65976a72f4aa2123a557600e157ab9cad4ed3ff7 100644
--- a/spec/updated/csource-registrations-spec.json
+++ b/spec/updated/csource-registrations-spec.json
@@ -13,6 +13,7 @@
       "get": {
         "description": "Retrieve a set of context sources which matches a specific query from an NGSI-LD system",
         "operationId": "queryCsources",
+        "tags": ["Context Sources"],
         "parameters": [
           {
             "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/spec/updated/entities-spec.json#/components/parameters/id"
@@ -76,6 +77,7 @@
       "post": {
         "description": "Registers a new context source within an NGSI-LD system",
         "operationId": "registerCsource",
+        "tags": ["Context Sources"],
         "requestBody": {
           "required": true,
           "content": {
diff --git a/spec/updated/csource-subscription-by-id-spec.json b/spec/updated/csource-subscription-by-id-spec.json
index 568a3c604fd9f04c146285ac44bbe4a72ec09bdc..148e5dc9f26275ce883ac81b65417a098939532c 100644
--- a/spec/updated/csource-subscription-by-id-spec.json
+++ b/spec/updated/csource-subscription-by-id-spec.json
@@ -23,6 +23,7 @@
       "get": {
          "description": "Retrieves a specific Subscription from an NGSI-LD system",
          "operationId": "retrieveSubscription",
+         "tags": ["Context Sources"],
         "parameters": [
           {
             "$ref": "#/components/parameters/subscriptionId"
@@ -69,6 +70,7 @@
       "patch": {
         "description": "Updates a specific context source discovery Subscription within an NGSI-LD system",
         "operationId": "updateCSourceSubscription",
+        "tags": ["Context Sources"]
         "parameters": [
           {
             "$ref": "#/components/parameters/subscriptionId"
@@ -111,8 +113,9 @@
         }
       },
       "delete": {
-        "description": "Removes a specific Subscription from an NGSI-LD system",
-        "operationId": "removeSubscription",
+        "description": "Removes a specific Context Source Subscription from an NGSI-LD system",
+        "operationId": "removeCSourceSubscription",
+        "tags": ["Context Sources"]
         "parameters": [
           {
             "$ref": "#/components/parameters/subscriptionId"
diff --git a/spec/updated/csource-subscriptions-spec.json b/spec/updated/csource-subscriptions-spec.json
index 04c1643a76e6e53006a70d2dd1e9d14437603b74..42ecc21e8a03a3f842e1449fd0769cdb06ac59ef 100644
--- a/spec/updated/csource-subscriptions-spec.json
+++ b/spec/updated/csource-subscriptions-spec.json
@@ -23,6 +23,7 @@
       "get": {
         "description": "Retrieves the context source discovery subscriptions available in an NGSI-LD system",
         "operationId": "retrieveCSourceSubscriptions",
+        "tags": ["Context Sources"],
         "parameters": [
           {
             "$ref": "#/components/parameters/limit"
@@ -59,6 +60,7 @@
       "post": {
         "description": "Creates a context source discovery Subscription within an NGSI-LD system",
         "operationId": "createCSourceSubscription",
+        "tags": ["Context Sources"]
         "requestBody": {
           "required": true,
           "content": {
diff --git a/spec/updated/entities-spec.json b/spec/updated/entities-spec.json
index 6adf2ca4d11a8aa184394d398bfdf7e3486e13f8..fa5750e34e595b59e008e7ea2bb66362f513560e 100644
--- a/spec/updated/entities-spec.json
+++ b/spec/updated/entities-spec.json
@@ -130,6 +130,7 @@
       "get": {
         "description": "Retrieve a set of entities which matches a specific query from an NGSI-LD system",
         "operationId": "queryEntities",
+        "tags": ["Context Information"],
         "parameters": [
           {
             "$ref": "#/components/parameters/id"
@@ -199,6 +200,7 @@
       "post": {
         "description": "Create a new Entity within an NGSI-LD system",
         "operationId": "createEntity",
+        "tags": ["Context Information"]
         "requestBody": {
           "required": true,
           "content": {
diff --git a/spec/updated/entity-attrs-spec.json b/spec/updated/entity-attrs-spec.json
index 908cbea4ee52b8df8ce5c6bb80e80185bd99f47f..3e8ad39d5f5b2d4f2d701231b9c5d5b4dbb3aa71 100644
--- a/spec/updated/entity-attrs-spec.json
+++ b/spec/updated/entity-attrs-spec.json
@@ -44,6 +44,7 @@
       "post": {
         "description": "Append new Entity attributes to an existing Entity within an NGSI-LD system",
         "operationId": "appendEntityAttrs",
+        "tags": ["Context Information"],
         "parameters": [
           {
             "$ref": "#/components/parameters/entityId"
@@ -101,6 +102,7 @@
       "patch": {
         "description": "Update existing Entity attributes within an NGSI-LD system",
         "operationId": "updateEntityAttrs",
+        "tags": ["Context Information"],
         "parameters": [
           {
             "$ref": "#/components/parameters/entityId"
@@ -157,6 +159,7 @@
       "patch": {
         "description": "Update existing Entity attributes within an NGSI-LD system",
         "operationId": "partialAttrUpdate",
+        "tags": ["Context Information"],
         "parameters": [
           {
             "$ref": "#/components/parameters/entityId"
@@ -204,6 +207,7 @@
       "delete": {
         "description": "Removes an existing Entity attribute within an NGSI-LD system",
         "operationId": "removeEntityAttr",
+        "tags": ["Context Information"],
         "parameters": [
           {
             "$ref": "#/components/parameters/entityId"
diff --git a/spec/updated/entity-by-id-spec.json b/spec/updated/entity-by-id-spec.json
index b31a79f530e61a5ea07afe2a00f34ae55259632f..dfec25efe2b40a178889df8818f7b9cdfe6e8f99 100644
--- a/spec/updated/entity-by-id-spec.json
+++ b/spec/updated/entity-by-id-spec.json
@@ -42,6 +42,7 @@
       "get": {
         "description": "Retrieve an specific Entity from an NGSI-LD system. It's possible to specify the Entity attributes to be retrieved by using query parameters",
         "operationId": "retrieveEntityById",
+        "tags": ["Context Information"],
         "parameters": [
           {
             "$ref": "#/components/parameters/entityId"
@@ -97,6 +98,7 @@
       "delete": {
         "description": "Removes an specific Entity from an NGSI-LD system",
         "operationId": "removeEntityById",
+        "tags": ["Context Information"],
         "parameters": [
           {
             "$ref": "#/components/parameters/entityId"
diff --git a/spec/updated/entity-operations-spec.json b/spec/updated/entity-operations-spec.json
index fb6d38faa4cce25236b0b12e329c06bf4caf8b66..d70e822cdb4f15f479c19b0c835340c6084ccfc8 100644
--- a/spec/updated/entity-operations-spec.json
+++ b/spec/updated/entity-operations-spec.json
@@ -10,6 +10,7 @@
       "post": {
         "description": "Batch Entity creation",
         "operationId": "batchEntityCreation",
+        "tags": ["Batch Operations"],
         "requestBody": {
           "required": true,
           "content": {
@@ -48,6 +49,7 @@
       "post": {
         "description": "Batch Entity update",
         "operationId": "batchEntityUpdate",
+        "tags": ["Batch Operations"],
         "parameters": [
           {
             "name": "options",
@@ -99,6 +101,7 @@
       "post": {
         "description": "Batch Entity upsert",
         "operationId": "batchEntityUpsert",
+        "tags": ["Batch Operations"],
         "parameters": [
           {
             "name": "options",
@@ -151,6 +154,7 @@
       "post": {
         "description": "Batch Entity delete",
         "operationId": "batchEntityDelete",
+        "tags": ["Batch Operations"],
         "requestBody": {
           "required": true,
           "content": {
diff --git a/spec/updated/subscription-by-id-spec.json b/spec/updated/subscription-by-id-spec.json
index ae6fa8ed571034108a3e43faf19a453a75402917..533a1d799781781a6cfb56a390bbc1ebb3bf6bed 100644
--- a/spec/updated/subscription-by-id-spec.json
+++ b/spec/updated/subscription-by-id-spec.json
@@ -23,6 +23,7 @@
       "get": {
          "description": "Retrieves a specific Subscription from an NGSI-LD system",
          "operationId": "retrieveSubscription",
+         "tags": ["Context Subscriptions"],
         "parameters": [
           {
             "$ref": "#/components/parameters/subscriptionId"
@@ -69,6 +70,7 @@
       "patch": {
         "description": "Updates a specific Subscription within an NGSI-LD system",
         "operationId": "updateSubscription",
+        "tags": ["Subscriptions"],
         "parameters": [
           {
             "$ref": "#/components/parameters/subscriptionId"
@@ -113,6 +115,7 @@
       "delete": {
         "description": "Removes a specific Subscription from an NGSI-LD system",
         "operationId": "removeSubscription",
+        "tags": ["Subscriptions"],
         "parameters": [
           {
             "$ref": "#/components/parameters/subscriptionId"
diff --git a/spec/updated/subscriptions-spec.json b/spec/updated/subscriptions-spec.json
index b7f0356b8ae40c61162e2be8288811a9ac543e87..3e738138785e8cf7a6dda4fd6325f8d7e5cd60b7 100644
--- a/spec/updated/subscriptions-spec.json
+++ b/spec/updated/subscriptions-spec.json
@@ -23,6 +23,9 @@
       "get": {
         "description": "Retrieves the subscriptions available in an NGSI-LD system",
         "operationId": "retrieveSubscriptions",
+        "tags":[
+          "Subscriptions"
+        ],
         "parameters": [
           {
             "$ref": "#/components/parameters/limit"
@@ -59,6 +62,9 @@
       "post": {
         "description": "Creates a new Subscription within an NGSI-LD system",
         "operationId": "createSubscription",
+        "tags":[
+          "Subscriptions"
+        ],
         "requestBody": {
           "required": true,
           "content": {