diff --git a/schema/EntityList.json b/schema/EntityList.json
index 6c4ed683a80b3c62b1db3d13a256a43e5ace55af..94d1c479a0a2fee78f89f70c29922ded6ac82eac 100644
--- a/schema/EntityList.json
+++ b/schema/EntityList.json
@@ -3,8 +3,15 @@
   "id": "https://uri.etsi.org/ngsi-ld/schema/EntityList.json",
   "title": "NGSI-LD EntityList",
   "description": "NGSI-LD EntityList",
-  "type": "array",
-  "items": {
-    "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#"
-  }
+  "definitions": {
+    "EntityList": {
+      "type": "array",
+      "items": {
+        "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#/definitions/Entity"
+      }
+    }
+  },
+  "allOf": [{
+    "$ref": "#/definitions/EntityList"
+  }]
 }
diff --git a/schema/subscriptions/Notification.json b/schema/subscriptions/Notification.json
index d73ed76b283b63c36ca5922c5ef805163f159106..6d27e502977ccc07c84cc848063f043b1f957c88 100644
--- a/schema/subscriptions/Notification.json
+++ b/schema/subscriptions/Notification.json
@@ -27,7 +27,7 @@
     "data": {
       "type": "array",
       "items": {
-        "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#"
+        "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#/definitions/Entity"
       },
       "minItems": 1
     }
diff --git a/spec/updated/entities-spec.json b/spec/updated/entities-spec.json
index 346e4160eff3bff8832a315c68976e5d30789d70..836905b49f77b2b3ae2a06b94a9e0d103ef69afb 100644
--- a/spec/updated/entities-spec.json
+++ b/spec/updated/entities-spec.json
@@ -191,7 +191,7 @@
           "content": {
             "application/json;application/ld+json": {
               "schema": {
-                "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#"
+                "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#/definitions/Entity"
               }
             }
           }