diff --git a/schema/ContextSourceRegistration.json b/schema/ContextSourceRegistration.json
index 38379cd81809e071657c020656bfecf686b9bce1..0b668bd0e4681c7e19d1a3700ae6c502df4397c3 100644
--- a/schema/ContextSourceRegistration.json
+++ b/schema/ContextSourceRegistration.json
@@ -80,7 +80,7 @@
       }
     },
     "location": {
-      "$ref": "http://json-schema.org/geojson/geometry.json#"
+      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#"
     },
     "expires": {
       "type": "string",
diff --git a/schema/Entity.json b/schema/Entity.json
index 781beb2f9919381f2d6157de39f710978d3539ec..3a54945f9848295d2b221e2a0a44880f47b29d4e 100644
--- a/schema/Entity.json
+++ b/schema/Entity.json
@@ -103,7 +103,7 @@
           "const": "GeoProperty"
         },
         "value": {
-          "$ref": "http://json-schema.org/geojson/geometry.json#"
+          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#"
         },
         "observedAt": {
           "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/observedAt"