diff --git a/spec/updated/subscription-by-id-spec.json b/spec/updated/subscription-by-id-spec.json
index 533a1d799781781a6cfb56a390bbc1ebb3bf6bed..ea163c250cf1f50f035ef4310e32c339e7fcb3aa 100644
--- a/spec/updated/subscription-by-id-spec.json
+++ b/spec/updated/subscription-by-id-spec.json
@@ -23,7 +23,7 @@
       "get": {
          "description": "Retrieves a specific Subscription from an NGSI-LD system",
          "operationId": "retrieveSubscription",
-         "tags": ["Context Subscriptions"],
+         "tags": ["Context Subscription"],
         "parameters": [
           {
             "$ref": "#/components/parameters/subscriptionId"
@@ -70,7 +70,7 @@
       "patch": {
         "description": "Updates a specific Subscription within an NGSI-LD system",
         "operationId": "updateSubscription",
-        "tags": ["Subscriptions"],
+        "tags": ["Context Subscription"],
         "parameters": [
           {
             "$ref": "#/components/parameters/subscriptionId"
@@ -115,7 +115,7 @@
       "delete": {
         "description": "Removes a specific Subscription from an NGSI-LD system",
         "operationId": "removeSubscription",
-        "tags": ["Subscriptions"],
+        "tags": ["Context Subscription"],
         "parameters": [
           {
             "$ref": "#/components/parameters/subscriptionId"
diff --git a/spec/updated/subscriptions-spec.json b/spec/updated/subscriptions-spec.json
index 3e738138785e8cf7a6dda4fd6325f8d7e5cd60b7..669845b342f05e87203d3f19a19832c34c71bb95 100644
--- a/spec/updated/subscriptions-spec.json
+++ b/spec/updated/subscriptions-spec.json
@@ -24,7 +24,7 @@
         "description": "Retrieves the subscriptions available in an NGSI-LD system",
         "operationId": "retrieveSubscriptions",
         "tags":[
-          "Subscriptions"
+          "Context Subscription"
         ],
         "parameters": [
           {
@@ -63,7 +63,7 @@
         "description": "Creates a new Subscription within an NGSI-LD system",
         "operationId": "createSubscription",
         "tags":[
-          "Subscriptions"
+          "Context Subscription"
         ],
         "requestBody": {
           "required": true,
diff --git a/spec/updated/temporal/temporal-entity-by-id-spec.json b/spec/updated/temporal/temporal-entity-by-id-spec.json
index c54d3bbe5d7330aa011c7de6147d07dff1654b4d..07e14f0f1508980b1668fcec884ede32059ee33c 100644
--- a/spec/updated/temporal/temporal-entity-by-id-spec.json
+++ b/spec/updated/temporal/temporal-entity-by-id-spec.json
@@ -11,6 +11,7 @@
       "get": {
         "description": "Retrieve the temporal representation of an specific Entity from an NGSI-LD system. It's possible to specify the Entity attributes to be retrieved by using query parameters",
         "operationId": "retrieveEntityTemporalById",
+        "tags": ["Temporal Evolution"],
         "parameters": [
           {
             "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/spec/updated/entity-by-id-spec.json#/components/parameters/entityId"
@@ -81,6 +82,7 @@
       "delete": {
         "description": "Removes the temporal representation of an Entity from an NGSI-LD system",
         "operationId": "removeEntityTemporalById",
+        "tags": ["Temporal Evolution"],
         "parameters": [
           {
             "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/spec/updated/entity-by-id-spec.json#/components/parameters/entityId"