diff --git a/bin/_jsonref2json.py b/bin/_jsonref2json.py
index a2b9df228..8b569a9ec 100755
--- a/bin/_jsonref2json.py
+++ b/bin/_jsonref2json.py
@@ -14,7 +14,7 @@
 #   "$comment": "version: ga4gh-beacon-cohort-v2.0.0",
 #   "$schema": "https://json-schema.org/draft/2020-12/schema",
 #   "additionalProperties": true,
-#   "definitions": {
+#   "$defs": {
 #     "CohortCriteria": {
 #       "description": "THIS IS NOT OK",
 #       "properties": {
@@ -30,7 +30,7 @@
 #     "inclusionCriteria": {
 #       "description": "THIS IS OK",
 #       "type": "object",
-#       "$ref": "#/definitions/CohortCriteria"
+#       "$ref": "#/$defs/CohortCriteria"
 #     }
 #   }
 # }
diff --git a/bin/adhoc/beaconCommonComponents.json b/bin/adhoc/beaconCommonComponents.json
index 371d5b058..4f1890224 100644
--- a/bin/adhoc/beaconCommonComponents.json
+++ b/bin/adhoc/beaconCommonComponents.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "definitions": {
+    "$defs": {
         "$schema": {
             "$comment": "TO REVIEW: adding a `format` or `regex` attribute that validates correctly against a file path (relative).",
             "description": "Refers to the JSON Schema which describes the set of valid attributes for this particular document type. This attribute is mostly used in schemas that should be tested in Beacon implementations.",
@@ -83,7 +83,7 @@
             "description": "A handover is a typed link for attaching actionable links to results, non purely informational, requests. The goal of the handovers is to list the different actions available, e.g.:\n* a link to a request access page * linking to a file for download, e.g. a VCF file\nAnother common scenario is to provide a fast summary response (e.g. BeconCountResponse) and to provide access to different endpoints for the entities matched by the query using temporary access tokens in the handover URLs.",
             "properties": {
                 "handoverType": {
-                    "$ref": "#/definitions/HandoverType"
+                    "$ref": "#/$defs/HandoverType"
                 },
                 "note": {
                     "description": "An optional text including considerations on the handover link provided.",
@@ -148,7 +148,7 @@
         "ListOfHandovers": {
             "description": "Set of handovers to be added in one section the response.",
             "items": {
-                "$ref": "#/definitions/Handover",
+                "$ref": "#/$defs/Handover",
                 "description": "Requested schema to be used for individuals in the response."
             },
             "type": "array"
@@ -156,7 +156,7 @@
         "ListOfSchemas": {
             "description": "Set of schemas to be used in the response to a request.",
             "items": {
-                "$ref": "#/definitions/SchemasPerEntity"
+                "$ref": "#/$defs/SchemasPerEntity"
             },
             "type": "array"
         },
@@ -182,22 +182,22 @@
             "description": "Pagination to apply or that has been applied on the results.",
             "properties": {
                 "currentPage": {
-                    "$ref": "#/definitions/PageToken",
+                    "$ref": "#/$defs/PageToken",
                     "description": "Token of the returned page. To be used only in the response to allow the client to check if the returned page is the one requested."
                 },
                 "limit": {
-                    "$ref": "#/definitions/Limit"
+                    "$ref": "#/$defs/Limit"
                 },
                 "nextPage": {
-                    "$ref": "#/definitions/PageToken",
+                    "$ref": "#/$defs/PageToken",
                     "description": "Token of the next page. Used to navigate forward. If empty, it is assumed that no more pages are available"
                 },
                 "previousPage": {
-                    "$ref": "#/definitions/PageToken",
+                    "$ref": "#/$defs/PageToken",
                     "description": "Token of the previous page. Used to navigate backwards. If empty, it is assumed that the current page is the first one."
                 },
                 "skip": {
-                    "$ref": "#/definitions/Skip"
+                    "$ref": "#/$defs/Skip"
                 }
             },
             "type": "object"
diff --git a/bin/adhoc/ontologyTerm.json b/bin/adhoc/ontologyTerm.json
index 1b94438f2..15746e939 100644
--- a/bin/adhoc/ontologyTerm.json
+++ b/bin/adhoc/ontologyTerm.json
@@ -3,7 +3,7 @@
     "additionalProperties": true,
     "properties": {
         "id": {
-            "$ref": "./beaconCommonComponents.json#/definitions/CURIE"
+            "$ref": "./beaconCommonComponents.json#/$defs/CURIE"
         },
         "label": {
             "description": "The text that describes the term. By default it could be the preferred text of the term, but is it acceptable to customize it for a clearer description and understanding of the term in an specific context.",
diff --git a/bin/beacon_yaml2md.pl b/bin/beacon_yaml2md.pl
index 96e59c17f..b4b825d32 100755
--- a/bin/beacon_yaml2md.pl
+++ b/bin/beacon_yaml2md.pl
@@ -729,9 +729,9 @@ sub add_properties_vrs {
     my ( $property, $data ) = @_;
     my %url = (
         'SequenceExpression' =>
-'https://raw.githubusercontent.com/ga4gh/vrs/1.2/schema/vrs.json#/definitions/',
+'https://raw.githubusercontent.com/ga4gh/vrs/1.2/schema/vrs.json#/$defs/',
         'CopyNumber' =>
-'https://raw.githubusercontent.com/ga4gh/vrs/1.2/schema/vrs.json#/definitions/'
+'https://raw.githubusercontent.com/ga4gh/vrs/1.2/schema/vrs.json#/$defs/'
     );
     if ( exists $url{$property} ) {
         $data->{properties} =
diff --git a/bin/deref_schemas/biosamples/defaultSchema.json b/bin/deref_schemas/biosamples/defaultSchema.json
index 1b5ffc61b..a00ae0a8c 100644
--- a/bin/deref_schemas/biosamples/defaultSchema.json
+++ b/bin/deref_schemas/biosamples/defaultSchema.json
@@ -357,7 +357,7 @@
                             },
                             {
                                 "$schema": "https://json-schema.org/draft/2020-12/schema",
-                                "definitions": {
+                                "$defs": {
                                     "TypedQuantity": {
                                         "properties": {
                                             "quantity": {
@@ -1479,7 +1479,7 @@
             "description": "List of phenotypic abnormalities of the sample. RECOMMENDED.",
             "items": {
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
-                "definitions": {},
+                "$defs": {},
                 "description": "Used to describe a phenotype that characterizes the subject or biosample.",
                 "properties": {
                     "evidence": {
diff --git a/bin/deref_schemas/cohorts/defaultSchema.json b/bin/deref_schemas/cohorts/defaultSchema.json
index f9721426c..96aa2913c 100644
--- a/bin/deref_schemas/cohorts/defaultSchema.json
+++ b/bin/deref_schemas/cohorts/defaultSchema.json
@@ -2,7 +2,7 @@
     "$comment": "version: ga4gh-beacon-cohort-v2.0.0",
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "CohortCriteria": {
             "description": "Criteria used for defining the cohort. It is assumed that all cohort participants will match or NOT match such criteria.",
             "properties": {
@@ -525,7 +525,7 @@
                     "description": "Phenotypic condition(s) in cohort inclusion criteria",
                     "items": {
                         "$schema": "https://json-schema.org/draft/2020-12/schema",
-                        "definitions": {},
+                        "$defs": {},
                         "description": "Used to describe a phenotype that characterizes the subject or biosample.",
                         "properties": {
                             "evidence": {
@@ -2369,7 +2369,7 @@
                     "description": "Phenotypic condition(s) in cohort inclusion criteria",
                     "items": {
                         "$schema": "https://json-schema.org/draft/2020-12/schema",
-                        "definitions": {},
+                        "$defs": {},
                         "description": "Used to describe a phenotype that characterizes the subject or biosample.",
                         "properties": {
                             "evidence": {
@@ -3418,7 +3418,7 @@
                     "description": "Phenotypic condition(s) in cohort inclusion criteria",
                     "items": {
                         "$schema": "https://json-schema.org/draft/2020-12/schema",
-                        "definitions": {},
+                        "$defs": {},
                         "description": "Used to describe a phenotype that characterizes the subject or biosample.",
                         "properties": {
                             "evidence": {
diff --git a/bin/deref_schemas/datasets/defaultSchema.json b/bin/deref_schemas/datasets/defaultSchema.json
index 75c3ff69c..91b8ed620 100644
--- a/bin/deref_schemas/datasets/defaultSchema.json
+++ b/bin/deref_schemas/datasets/defaultSchema.json
@@ -16,7 +16,7 @@
             "description": "Data use conditions applying to this dataset.",
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "additionalProperties": true,
-            "definitions": {
+            "$defs": {
                 "DUODataUse": {
                     "allOf": [
                         {
diff --git a/bin/deref_schemas/genomicVariations/defaultSchema.json b/bin/deref_schemas/genomicVariations/defaultSchema.json
index 8bb046adb..e6aad1848 100644
--- a/bin/deref_schemas/genomicVariations/defaultSchema.json
+++ b/bin/deref_schemas/genomicVariations/defaultSchema.json
@@ -2,7 +2,7 @@
     "$comment": "version: ga4gh-beacon-variant-v2.0.0",
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "CaseLevelVariant": {
             "description": "",
             "properties": {
diff --git a/bin/deref_schemas/individuals/defaultSchema.json b/bin/deref_schemas/individuals/defaultSchema.json
index cbe33523a..da94f0d4a 100644
--- a/bin/deref_schemas/individuals/defaultSchema.json
+++ b/bin/deref_schemas/individuals/defaultSchema.json
@@ -1035,7 +1035,7 @@
                             },
                             {
                                 "$schema": "https://json-schema.org/draft/2020-12/schema",
-                                "definitions": {
+                                "$defs": {
                                     "TypedQuantity": {
                                         "properties": {
                                             "quantity": {
@@ -1812,7 +1812,7 @@
             "items": {
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "additionalProperties": true,
-                "definitions": {
+                "$defs": {
                     "pedigreeMember": {
                         "examples": [
                             {
@@ -2401,7 +2401,7 @@
         "phenotypicFeatures": {
             "items": {
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
-                "definitions": {},
+                "$defs": {},
                 "description": "Used to describe a phenotype that characterizes the subject or biosample.",
                 "properties": {
                     "evidence": {
diff --git a/bin/transform_json2md.sh b/bin/transform_json2md.sh
index ce73254fc..f4c782785 100755
--- a/bin/transform_json2md.sh
+++ b/bin/transform_json2md.sh
@@ -43,7 +43,7 @@ Fixing errors in JSON
 EOT
 
 # For mysteriorous reasons ontologyTerm.json (within CURIE) only works (jsonref2json.js) with $ref: url
-sed -i "s#\./beaconCommonComponents.json\#/definitions/CURIE#$adhoc_url/beaconCommonComponents.json\#/definitions/CURIE#" $fwk_dir/common/ontologyTerm.json
+sed -i "s#\./beaconCommonComponents.json\#/$defs/CURIE#$adhoc_url/beaconCommonComponents.json\#/$defs/CURIE#" $fwk_dir/common/ontologyTerm.json
 
 cat<<EOT
 ====================================
diff --git a/framework/json/common/beaconCommonComponents.json b/framework/json/common/beaconCommonComponents.json
index a6b922664..2a791a3c4 100644
--- a/framework/json/common/beaconCommonComponents.json
+++ b/framework/json/common/beaconCommonComponents.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "definitions": {
+    "$defs": {
         "$schema": {
             "$comment": "TO REVIEW: adding a `format` or `regex` attribute that validates correctly against a file path (relative).",
             "description": "Refers to the JSON Schema which describes the set of valid attributes for this particular document type. This attribute is mostly used in schemas that should be tested in Beacon implementations.",
@@ -88,7 +88,7 @@
             "description": "A handover is a typed link for attaching actionable links to results, non purely informational, requests. The goal of the handovers is to list the different actions available, e.g.:\n* a link to a request access page * linking to a file for download, e.g. a VCF file\nAnother common scenario is to provide a fast summary response (e.g. BeconCountResponse) and to provide access to different endpoints for the entities matched by the query using temporary access tokens in the handover URLs.",
             "properties": {
                 "handoverType": {
-                    "$ref": "#/definitions/HandoverType"
+                    "$ref": "#/$defs/HandoverType"
                 },
                 "note": {
                     "description": "An optional text including considerations on the handover link provided.",
@@ -157,7 +157,7 @@
         "ListOfHandovers": {
             "description": "Set of handovers to be added in one section the response.",
             "items": {
-                "$ref": "#/definitions/Handover",
+                "$ref": "#/$defs/Handover",
                 "description": "Requested schema to be used for individuals in the response."
             },
             "type": "array"
@@ -165,7 +165,7 @@
         "ListOfSchemas": {
             "description": "Set of schemas to be used in the response to a request.",
             "items": {
-                "$ref": "#/definitions/SchemasPerEntity"
+                "$ref": "#/$defs/SchemasPerEntity"
             },
             "type": "array"
         },
@@ -191,22 +191,22 @@
             "description": "Pagination to apply or that has been applied on the results.",
             "properties": {
                 "currentPage": {
-                    "$ref": "#/definitions/PageToken",
+                    "$ref": "#/$defs/PageToken",
                     "description": "Token of the returned page. To be used only in the response to allow the client to check if the returned page is the one requested."
                 },
                 "limit": {
-                    "$ref": "#/definitions/Limit"
+                    "$ref": "#/$defs/Limit"
                 },
                 "nextPage": {
-                    "$ref": "#/definitions/PageToken",
+                    "$ref": "#/$defs/PageToken",
                     "description": "Token of the next page. Used to navigate forward. If empty, it is assumed that no more pages are available"
                 },
                 "previousPage": {
-                    "$ref": "#/definitions/PageToken",
+                    "$ref": "#/$defs/PageToken",
                     "description": "Token of the previous page. Used to navigate backwards. If empty, it is assumed that the current page is the first one."
                 },
                 "skip": {
-                    "$ref": "#/definitions/Skip"
+                    "$ref": "#/$defs/Skip"
                 }
             },
             "type": "object"
diff --git a/framework/json/common/ontologyTerm.json b/framework/json/common/ontologyTerm.json
index 6d092cf08..0a351caa0 100644
--- a/framework/json/common/ontologyTerm.json
+++ b/framework/json/common/ontologyTerm.json
@@ -4,7 +4,7 @@
     "description": "Definition of an ontology term.",
     "properties": {
         "id": {
-            "$ref": "./beaconCommonComponents.json#/definitions/CURIE"
+            "$ref": "./beaconCommonComponents.json#/$defs/CURIE"
         },
         "label": {
             "description": "The text that describes the term. By default it could be the preferred text of the term, but is it acceptable to customize it for a clearer description and understanding of the term in an specific context.",
diff --git a/framework/json/configuration/beaconConfigurationSchema.json b/framework/json/configuration/beaconConfigurationSchema.json
index 02d54a3a0..5d5e3a771 100644
--- a/framework/json/configuration/beaconConfigurationSchema.json
+++ b/framework/json/configuration/beaconConfigurationSchema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "EntryTypes": {
             "additionalProperties": {
                 "$ref": "./entryTypeDefinition.json",
@@ -15,10 +15,10 @@
     "description": "Files complaint with this schema are the configuration ones. The details returned in `service-info` are mirroring the ones in this configuration file.",
     "properties": {
         "$schema": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/$schema"
+            "$ref": "../common/beaconCommonComponents.json#/$defs/$schema"
         },
         "entryTypes": {
-            "$ref": "#/definitions/EntryTypes"
+            "$ref": "#/$defs/EntryTypes"
         },
         "maturityAttributes": {
             "description": "Declares the level of maturity of the Beacon instance.",
@@ -39,7 +39,7 @@
             "description": "Configuration of the security aspects of the Beacon. By default, a Beacon that does not declare the configuration settings would return `boolean` (true/false) responses, and only if the user is authenticated and explicitly authorized to access the Beacon resources. Although this is the safest set of settings, it is not recommended unless the Beacon shares very sensitive information. Non sensitive Beacons should preferably opt for a `record` and `PUBLIC` combination.",
             "properties": {
                 "defaultGranularity": {
-                    "$ref": "../common/beaconCommonComponents.json#/definitions/Granularity",
+                    "$ref": "../common/beaconCommonComponents.json#/$defs/Granularity",
                     "description": "Default granularity. Some responses could return higher detail, but this would be the granularity by default."
                 },
                 "securityLevels": {
diff --git a/framework/json/configuration/beaconMapSchema.json b/framework/json/configuration/beaconMapSchema.json
index 47fec6701..e5de82468 100644
--- a/framework/json/configuration/beaconMapSchema.json
+++ b/framework/json/configuration/beaconMapSchema.json
@@ -1,12 +1,12 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "Endpoint": {
             "properties": {
                 "endpoints": {
                     "additionalProperties": {
-                        "$ref": "#/definitions/RelatedEndpoint"
+                        "$ref": "#/$defs/RelatedEndpoint"
                     },
                     "description": "Optional. A list describing additional endpoints implemented by this Beacon instance for that entry type. Additional details on the endpoint parameters, supported HTTP verbs, etc. could be obtained by parsing the OpenAPI definition referenced in the `openAPIEndpointsDefinition` attribute.",
                     "minProperties": 0,
@@ -64,11 +64,11 @@
     "description": "Map of a Beacon, its entry types and endpoints. It isconceptually similar to a website sitemap.",
     "properties": {
         "$schema": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/$schema"
+            "$ref": "../common/beaconCommonComponents.json#/$defs/$schema"
         },
         "endpointSets": {
             "additionalProperties": {
-                "$ref": "#/definitions/Endpoint"
+                "$ref": "#/$defs/Endpoint"
             },
             "description": "List of enpoints included in this Beacon instance. This is list is meant to inform Beacon clients, e.g. a Beacon Network, about the available endpoints, it is not used to generate any automatic list, but could be used for Beacon validation purposes.",
             "minProperties": 1,
diff --git a/framework/json/configuration/entryTypeDefinition.json b/framework/json/configuration/entryTypeDefinition.json
index 27d425770..5411405ba 100644
--- a/framework/json/configuration/entryTypeDefinition.json
+++ b/framework/json/configuration/entryTypeDefinition.json
@@ -4,7 +4,7 @@
     "description": "Definition of an element or scope of the element, to describe each type of entry type included in a beacon. The `id` attribute is the key that should be used in other parts of the data model to allow Beacon clients to identify the different parts (e.g. endpoints, filtering terms, request parameters, etc.) that are relvant for an entry type.",
     "properties": {
         "$schema": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/$schema"
+            "$ref": "../common/beaconCommonComponents.json#/$defs/$schema"
         },
         "aCollectionOf": {
             "description": "If the entry type is a collection of other entities, (e.g. a Dataset is a collection of Records), then this attribute must list the entities that can be included. One _collection_ can include more than one entry type  (e.g. a Dataset in teh Beacon cdefault model could include Individuals, Biosamples, GenomicVariations, Analyses amnd Runs). In such cases in each individual response (e.g. `resultSetsResponse` of collections of type \"dataset\") will contain entries of a single entry type (e.g. biosamples) even if a dataset may contain records of multiple types.",
@@ -47,7 +47,7 @@
             "type": "string"
         },
         "nonFilteredQueriesAllowed": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/NonFilteredQueriesAllowed"
+            "$ref": "../common/beaconCommonComponents.json#/$defs/NonFilteredQueriesAllowed"
         },
         "ontologyTermForThisType": {
             "$ref": "../common/ontologyTerm.json",
diff --git a/framework/json/configuration/entryTypesSchema.json b/framework/json/configuration/entryTypesSchema.json
index 7e6c47285..32e457ef2 100644
--- a/framework/json/configuration/entryTypesSchema.json
+++ b/framework/json/configuration/entryTypesSchema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "EntryTypes": {
             "additionalProperties": {
                 "$ref": "./entryTypeDefinition.json",
@@ -14,7 +14,7 @@
     "description": "Schema for the Enrty Types list.",
     "properties": {
         "entryTypes": {
-            "$ref": "#/definitions/EntryTypes",
+            "$ref": "#/$defs/EntryTypes",
             "description": "List of entry types."
         }
     },
diff --git a/framework/json/configuration/filteringTermsSchema.json b/framework/json/configuration/filteringTermsSchema.json
index 462e04b2f..e6ad349c1 100644
--- a/framework/json/configuration/filteringTermsSchema.json
+++ b/framework/json/configuration/filteringTermsSchema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "FilterTerm": {
             "properties": {
                 "ftType": {
@@ -52,7 +52,7 @@
         "filteringTerms": {
             "description": "List of filtering terms that could be used to filter this concept in this instance of Beacon.",
             "items": {
-                "$ref": "#/definitions/FilterTerm"
+                "$ref": "#/$defs/FilterTerm"
             },
             "minItems": 0,
             "type": "array"
diff --git a/framework/json/endpoints.json b/framework/json/endpoints.json
index e394ad28f..5f7fe9da4 100644
--- a/framework/json/endpoints.json
+++ b/framework/json/endpoints.json
@@ -5,7 +5,7 @@
                 "in": "query",
                 "name": "limit",
                 "schema": {
-                    "$ref": "./common/beaconCommonComponents.json#/definitions/Limit"
+                    "$ref": "./common/beaconCommonComponents.json#/$defs/Limit"
                 }
             },
             "requestedSchema": {
@@ -22,7 +22,7 @@
                 "in": "query",
                 "name": "skip",
                 "schema": {
-                    "$ref": "./common/beaconCommonComponents.json#/definitions/Skip"
+                    "$ref": "./common/beaconCommonComponents.json#/$defs/Skip"
                 }
             }
         },
diff --git a/framework/json/requests/beaconRequestBody.json b/framework/json/requests/beaconRequestBody.json
index 8b6116bf7..c7c4ae739 100644
--- a/framework/json/requests/beaconRequestBody.json
+++ b/framework/json/requests/beaconRequestBody.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "definitions": {
+    "$defs": {
         "BeaconQuery": {
             "description": "Parameters to limit the list of returned results.",
             "properties": {
@@ -9,10 +9,10 @@
                     "description": "Ontology based filters. Using CURIE syntax is encouraged."
                 },
                 "includeResultsetResponses": {
-                    "$ref": "../common/beaconCommonComponents.json#/definitions/IncludeResultsetResponses"
+                    "$ref": "../common/beaconCommonComponents.json#/$defs/IncludeResultsetResponses"
                 },
                 "pagination": {
-                    "$ref": "../common/beaconCommonComponents.json#/definitions/Pagination",
+                    "$ref": "../common/beaconCommonComponents.json#/$defs/Pagination",
                     "description": "Pagination parameters applied to response documents, in case of record level granularity."
                 },
                 "requestParameters": {
@@ -20,11 +20,11 @@
                     "description": "Parameters used for the entry type specific query elements."
                 },
                 "requestedGranularity": {
-                    "$ref": "../common/beaconCommonComponents.json#/definitions/Granularity",
+                    "$ref": "../common/beaconCommonComponents.json#/$defs/Granularity",
                     "description": "Requested granularity for the response. Beacons do not have to respond with the requested granularity, e.g. may respond with count results although record level granularity had been requested but indicate the granularity of the response in the response's metadata."
                 },
                 "testMode": {
-                    "$ref": "../common/beaconCommonComponents.json#/definitions/TestMode",
+                    "$ref": "../common/beaconCommonComponents.json#/$defs/TestMode",
                     "description": "Used for indicating that a request or response is done in a test context."
                 }
             },
@@ -34,14 +34,14 @@
     "description": "Schema for the Beacon request. It is named `RequestBody` to keep the same nomenclature used by OpenAPI v3, but it actually contains the definition of the whole HTTP POST request payload.",
     "properties": {
         "$schema": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/$schema"
+            "$ref": "../common/beaconCommonComponents.json#/$defs/$schema"
         },
         "meta": {
             "$ref": "./beaconRequestMeta.json",
             "description": "Information relevant for building the response."
         },
         "query": {
-            "$ref": "#/definitions/BeaconQuery"
+            "$ref": "#/$defs/BeaconQuery"
         }
     },
     "required": [
diff --git a/framework/json/requests/beaconRequestMeta.json b/framework/json/requests/beaconRequestMeta.json
index 79b6a6e87..36e0d46fc 100644
--- a/framework/json/requests/beaconRequestMeta.json
+++ b/framework/json/requests/beaconRequestMeta.json
@@ -3,14 +3,14 @@
     "description": "Meta section of the Beacon request. It includes request context details relevant for the Beacon server when processing the request.",
     "properties": {
         "$schema": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/$schema"
+            "$ref": "../common/beaconCommonComponents.json#/$defs/$schema"
         },
         "apiVersion": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/ApiVersion",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/ApiVersion",
             "description": "API version expected by the client to be supported by the server and used in the response format."
         },
         "requestedSchemas": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/ListOfSchemas",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/ListOfSchemas",
             "description": "Set of schemas to be used in the response."
         }
     },
diff --git a/framework/json/requests/filteringTerms.json b/framework/json/requests/filteringTerms.json
index 3c0550f7f..3d5575924 100644
--- a/framework/json/requests/filteringTerms.json
+++ b/framework/json/requests/filteringTerms.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "AlphanumericFilter": {
             "description": "Filter results based on operators and values applied to alphanumeric fields.",
             "properties": {
@@ -64,13 +64,13 @@
         "FilteringTerm": {
             "anyOf": [
                 {
-                    "$ref": "#/definitions/OntologyFilter"
+                    "$ref": "#/$defs/OntologyFilter"
                 },
                 {
-                    "$ref": "#/definitions/AlphanumericFilter"
+                    "$ref": "#/$defs/AlphanumericFilter"
                 },
                 {
-                    "$ref": "#/definitions/CustomFilter"
+                    "$ref": "#/$defs/CustomFilter"
                 }
             ]
         },
@@ -112,7 +112,7 @@
     },
     "description": "Filtering terms are the main means to select subsets of records from a Beacon response. While the name implies the application to a generated response, in practice implementations may apply them at the query stage. Note: In the processing of Beacon v2.0 requests multiple filters are assumed to be chained by the logical AND operator.",
     "items": {
-        "$ref": "#/definitions/FilteringTerm"
+        "$ref": "#/$defs/FilteringTerm"
     },
     "title": "Filtering Term Element",
     "type": "array"
diff --git a/framework/json/responses/beaconBooleanResponse.json b/framework/json/responses/beaconBooleanResponse.json
index 7aae7ffe6..8491ca4bd 100644
--- a/framework/json/responses/beaconBooleanResponse.json
+++ b/framework/json/responses/beaconBooleanResponse.json
@@ -3,11 +3,11 @@
     "description": "Complete definition for a minimal response that provides *only* a `Boolean` exists true|false answer.",
     "properties": {
         "beaconHandovers": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/ListOfHandovers",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/ListOfHandovers",
             "description": "List of handovers that apply to the whole response, not to any resultset or result in particular."
         },
         "info": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/Info",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/Info",
             "description": "Additional details that could be of interest. Provided to clearly enclose any attribute that is not part of the Beacon specification."
         },
         "meta": {
diff --git a/framework/json/responses/beaconCollectionsResponse.json b/framework/json/responses/beaconCollectionsResponse.json
index 61f294744..6728e3342 100644
--- a/framework/json/responses/beaconCollectionsResponse.json
+++ b/framework/json/responses/beaconCollectionsResponse.json
@@ -4,11 +4,11 @@
     "description": "Beacon response that includes details about the collections in this Beacon.",
     "properties": {
         "beaconHandovers": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/ListOfHandovers",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/ListOfHandovers",
             "description": "List of handovers that apply to the whole response, not to any resultset or result in particular."
         },
         "info": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/Info",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/Info",
             "description": "Additional details that could be of interest. Provided to clearly enclose any attribute that is not part of the Beacon specification."
         },
         "meta": {
diff --git a/framework/json/responses/beaconCountResponse.json b/framework/json/responses/beaconCountResponse.json
index 7c5b1ad46..9222ae90d 100644
--- a/framework/json/responses/beaconCountResponse.json
+++ b/framework/json/responses/beaconCountResponse.json
@@ -3,11 +3,11 @@
     "description": "Complete definition for a response that does not include record level details but provides `Boolean` and `count` information.",
     "properties": {
         "beaconHandovers": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/ListOfHandovers",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/ListOfHandovers",
             "description": "List of handovers that apply to the whole response, not to any resultset or result in particular."
         },
         "info": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/Info",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/Info",
             "description": "Additional details that could be of interest. Provided to clearly enclose any attribute that is not part of the Beacon specification."
         },
         "meta": {
diff --git a/framework/json/responses/beaconEntryTypesResponse.json b/framework/json/responses/beaconEntryTypesResponse.json
index 2c2cc5514..d7edbcb79 100644
--- a/framework/json/responses/beaconEntryTypesResponse.json
+++ b/framework/json/responses/beaconEntryTypesResponse.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "description": "Response including a list of Entry types definitions.",
+    "description": "Response including a list of Entry types $defs.",
     "properties": {
         "meta": {
             "$ref": "./sections/beaconInformationalResponseMeta.json",
diff --git a/framework/json/responses/beaconErrorResponse.json b/framework/json/responses/beaconErrorResponse.json
index 07da8d70c..db7b0c0f0 100644
--- a/framework/json/responses/beaconErrorResponse.json
+++ b/framework/json/responses/beaconErrorResponse.json
@@ -4,7 +4,7 @@
     "description": "An unsuccessful operation.",
     "properties": {
         "error": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/BeaconError"
+            "$ref": "../common/beaconCommonComponents.json#/$defs/BeaconError"
         },
         "meta": {
             "$ref": "./sections/beaconResponseMeta.json"
diff --git a/framework/json/responses/beaconResultsetsResponse.json b/framework/json/responses/beaconResultsetsResponse.json
index 159fadaab..8efe9617a 100644
--- a/framework/json/responses/beaconResultsetsResponse.json
+++ b/framework/json/responses/beaconResultsetsResponse.json
@@ -4,11 +4,11 @@
     "description": "Beacon response that includes record level details, grouped in Resultsets.",
     "properties": {
         "beaconHandovers": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/ListOfHandovers",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/ListOfHandovers",
             "description": "List of handovers that apply to the whole response, not to any resultset or result in particular."
         },
         "info": {
-            "$ref": "../common/beaconCommonComponents.json#/definitions/Info",
+            "$ref": "../common/beaconCommonComponents.json#/$defs/Info",
             "description": "Additional details that could be of interest. Provided to clearly enclose any attribute that is not part of the Beacon specification."
         },
         "meta": {
diff --git a/framework/json/responses/ga4gh-service-info-1-0-0-schema.json b/framework/json/responses/ga4gh-service-info-1-0-0-schema.json
index 326fd13ea..2cdc9586d 100644
--- a/framework/json/responses/ga4gh-service-info-1-0-0-schema.json
+++ b/framework/json/responses/ga4gh-service-info-1-0-0-schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "definitions": {
+    "$defs": {
         "ServiceType": {
             "description": "Type of a GA4GH service",
             "properties": {
@@ -90,7 +90,7 @@
             "type": "object"
         },
         "type": {
-            "$ref": "#/definitions/ServiceType"
+            "$ref": "#/$defs/ServiceType"
         },
         "updatedAt": {
             "description": "Timestamp describing when the service was last updated (RFC 3339 format)",
diff --git a/framework/json/responses/sections/beaconBooleanResponseSection.json b/framework/json/responses/sections/beaconBooleanResponseSection.json
index 80c8d0cb0..12b5a01af 100644
--- a/framework/json/responses/sections/beaconBooleanResponseSection.json
+++ b/framework/json/responses/sections/beaconBooleanResponseSection.json
@@ -3,7 +3,7 @@
     "description": "Boolean (true/false) response section.",
     "properties": {
         "exists": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/Exists"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/Exists"
         }
     },
     "required": [
diff --git a/framework/json/responses/sections/beaconCountResponseSection.json b/framework/json/responses/sections/beaconCountResponseSection.json
index 6a9e95e86..a23871775 100644
--- a/framework/json/responses/sections/beaconCountResponseSection.json
+++ b/framework/json/responses/sections/beaconCountResponseSection.json
@@ -3,10 +3,10 @@
     "description": "Payload definition for the \"count\" response.",
     "properties": {
         "exists": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/Exists"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/Exists"
         },
         "numTotalResults": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/NumTotalResults",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/NumTotalResults",
             "description": "Total number of results."
         }
     },
diff --git a/framework/json/responses/sections/beaconFilteringTermsResults.json b/framework/json/responses/sections/beaconFilteringTermsResults.json
index 1755fb582..b71185b7f 100644
--- a/framework/json/responses/sections/beaconFilteringTermsResults.json
+++ b/framework/json/responses/sections/beaconFilteringTermsResults.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "FilteringTerm": {
             "description": "Entities can be filtered using this term.",
             "properties": {
@@ -103,13 +103,13 @@
     "properties": {
         "filteringTerms": {
             "items": {
-                "$ref": "#/definitions/FilteringTerm"
+                "$ref": "#/$defs/FilteringTerm"
             },
             "type": "array"
         },
         "resources": {
             "items": {
-                "$ref": "#/definitions/Resource"
+                "$ref": "#/$defs/Resource"
             },
             "type": "array"
         }
diff --git a/framework/json/responses/sections/beaconInfoResults.json b/framework/json/responses/sections/beaconInfoResults.json
index 9b431df0b..104b676c7 100644
--- a/framework/json/responses/sections/beaconInfoResults.json
+++ b/framework/json/responses/sections/beaconInfoResults.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "BeaconOrganization": {
             "description": "Organization owning the Beacon.",
             "properties": {
@@ -22,7 +22,7 @@
                     "type": "string"
                 },
                 "info": {
-                    "$ref": "../../common/beaconCommonComponents.json#/definitions/Info",
+                    "$ref": "../../common/beaconCommonComponents.json#/$defs/Info",
                     "description": "Additional unspecified metadata about the host Organization."
                 },
                 "logoUrl": {
@@ -55,7 +55,7 @@
             "type": "string"
         },
         "apiVersion": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/ApiVersion"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/ApiVersion"
         },
         "createDateTime": {
             "description": "The date/time the Beacon was created (ISO 8601 format).",
@@ -83,10 +83,10 @@
             "type": "string"
         },
         "id": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/BeaconId"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/BeaconId"
         },
         "info": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/Info",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/Info",
             "description": "Additional unspecified metadata about the Beacon service."
         },
         "name": {
@@ -94,7 +94,7 @@
             "type": "string"
         },
         "organization": {
-            "$ref": "#/definitions/BeaconOrganization"
+            "$ref": "#/$defs/BeaconOrganization"
         },
         "updateDateTime": {
             "description": "The time the Beacon was updated in (ISO 8601 format).",
@@ -105,7 +105,7 @@
             "type": "string"
         },
         "version": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/ApiVersion",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/ApiVersion",
             "description": "TODO: This is a legacy use / duplication?"
         },
         "welcomeUrl": {
diff --git a/framework/json/responses/sections/beaconInformationalResponseMeta.json b/framework/json/responses/sections/beaconInformationalResponseMeta.json
index 5031198c8..c3fd53353 100644
--- a/framework/json/responses/sections/beaconInformationalResponseMeta.json
+++ b/framework/json/responses/sections/beaconInformationalResponseMeta.json
@@ -5,13 +5,13 @@
     "description": "Meta information about the response.",
     "properties": {
         "apiVersion": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/ApiVersion"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/ApiVersion"
         },
         "beaconId": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/BeaconId"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/BeaconId"
         },
         "returnedSchemas": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/ListOfSchemas"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/ListOfSchemas"
         }
     },
     "required": [
diff --git a/framework/json/responses/sections/beaconReceivedRequestSummary.json b/framework/json/responses/sections/beaconReceivedRequestSummary.json
index 56ad90674..c0abbad4d 100644
--- a/framework/json/responses/sections/beaconReceivedRequestSummary.json
+++ b/framework/json/responses/sections/beaconReceivedRequestSummary.json
@@ -3,18 +3,18 @@
     "description": "Section of the response that summarize the request received as it has been interpreted by the Beacon server. This summary can help to identify differences between the incoming request and its interpretation or processing, e.g. in the response granularity or pagination. The required properties include those that should be part of every request.",
     "properties": {
         "apiVersion": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/ApiVersion",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/ApiVersion",
             "description": "API version expected by the client to be supported by the server and used in the response format."
         },
         "filters": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/Filters",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/Filters",
             "description": "Filters as submitted in the request."
         },
         "includeResultsetResponses": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/IncludeResultsetResponses"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/IncludeResultsetResponses"
         },
         "pagination": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/Pagination",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/Pagination",
             "description": "Pagination as requested for the results."
         },
         "requestParameters": {
@@ -22,17 +22,17 @@
             "description": "Dictionary of request parameters received in the `RequestBody` or as part of a GET request."
         },
         "requestedGranularity": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/Granularity",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/Granularity",
             "description": "Requested granularity for the response which may differe from the response's actual granularity."
         },
         "requestedSchemas": {
             "$comment": "TODO: Add the format attribute as a uri.",
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/ListOfSchemas",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/ListOfSchemas",
             "description": "Set of schemas to be used in the response to a request. `minItems: 0` is used to confirm that an empty array is acceptable here.",
             "minItems": 0
         },
         "testMode": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/TestMode",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/TestMode",
             "description": "Used for indicating that a request was received in a test context."
         }
     },
diff --git a/framework/json/responses/sections/beaconResponseMeta.json b/framework/json/responses/sections/beaconResponseMeta.json
index b2206fe2e..85eff8f95 100644
--- a/framework/json/responses/sections/beaconResponseMeta.json
+++ b/framework/json/responses/sections/beaconResponseMeta.json
@@ -3,24 +3,24 @@
     "description": "Information about the response that could be relevant for the Beacon client in order to interpret the results.",
     "properties": {
         "apiVersion": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/ApiVersion"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/ApiVersion"
         },
         "beaconId": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/BeaconId"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/BeaconId"
         },
         "receivedRequestSummary": {
             "$ref": "./beaconReceivedRequestSummary.json"
         },
         "returnedGranularity": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/Granularity",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/Granularity",
             "description": "Granularity of the Beacon response which may differ from the requested one. For details see the prototype definition."
         },
         "returnedSchemas": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/ListOfSchemas",
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/ListOfSchemas",
             "description": "The `returnedSchemas` parameter indicates that the request has been interpreted for the indicated entity. This helps to disambiguate between negative responses due to e.g. no hit on a well understood request and failures to interpret or answer the request due to a missing entity. "
         },
         "testMode": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/TestMode"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/TestMode"
         }
     },
     "required": [
diff --git a/framework/json/responses/sections/beaconResultsets.json b/framework/json/responses/sections/beaconResultsets.json
index a54e43030..a24c3b0ae 100644
--- a/framework/json/responses/sections/beaconResultsets.json
+++ b/framework/json/responses/sections/beaconResultsets.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "ResultsetInstance": {
             "additionalProperties": true,
             "properties": {
@@ -29,7 +29,7 @@
                     "type": "integer"
                 },
                 "resultsHandovers": {
-                    "$ref": "../../common/beaconCommonComponents.json#/definitions/ListOfHandovers",
+                    "$ref": "../../common/beaconCommonComponents.json#/$defs/ListOfHandovers",
                     "description": "List of handovers that apply to this resultset, not to the whole Beacon or to a result in particular."
                 },
                 "setType": {
@@ -51,11 +51,11 @@
     "description": "Sets of results to be returned as query response.",
     "properties": {
         "$schema": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/$schema"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/$schema"
         },
         "resultSets": {
             "items": {
-                "$ref": "#/definitions/ResultsetInstance"
+                "$ref": "#/$defs/ResultsetInstance"
             },
             "minItems": 0,
             "type": "array"
diff --git a/framework/json/responses/sections/beaconSummaryResponseSection.json b/framework/json/responses/sections/beaconSummaryResponseSection.json
index cc64e55d8..9e19e647c 100644
--- a/framework/json/responses/sections/beaconSummaryResponseSection.json
+++ b/framework/json/responses/sections/beaconSummaryResponseSection.json
@@ -3,10 +3,10 @@
     "description": "Beacon results summary section.",
     "properties": {
         "exists": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/Exists"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/Exists"
         },
         "numTotalResults": {
-            "$ref": "../../common/beaconCommonComponents.json#/definitions/NumTotalResults"
+            "$ref": "../../common/beaconCommonComponents.json#/$defs/NumTotalResults"
         }
     },
     "required": [
diff --git a/models/json/beacon-v2-default-model/analyses/defaultSchema.json b/models/json/beacon-v2-default-model/analyses/defaultSchema.json
index e2fd84089..a082caa73 100644
--- a/models/json/beacon-v2-default-model/analyses/defaultSchema.json
+++ b/models/json/beacon-v2-default-model/analyses/defaultSchema.json
@@ -38,7 +38,7 @@
             "type": "string"
         },
         "info": {
-            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Info"
+            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/$defs/Info"
         },
         "pipelineName": {
             "description": "Analysis pipeline and version if a standardized pipeline was used",
diff --git a/models/json/beacon-v2-default-model/analyses/endpoints.json b/models/json/beacon-v2-default-model/analyses/endpoints.json
index 570d7201d..ba4a2dd09 100644
--- a/models/json/beacon-v2-default-model/analyses/endpoints.json
+++ b/models/json/beacon-v2-default-model/analyses/endpoints.json
@@ -25,13 +25,13 @@
                 }
             },
             "includeResultsetResponses": {
-                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/IncludeResultsetResponses"
+                "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/IncludeResultsetResponses"
             },
             "limit": {
                 "in": "query",
                 "name": "limit",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Limit"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Limit"
                 }
             },
             "requestedSchema": {
@@ -48,7 +48,7 @@
                 "in": "query",
                 "name": "skip",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Skip"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Skip"
                 }
             }
         },
diff --git a/models/json/beacon-v2-default-model/biosamples/defaultSchema.json b/models/json/beacon-v2-default-model/biosamples/defaultSchema.json
index c1a2d65da..392f5988a 100644
--- a/models/json/beacon-v2-default-model/biosamples/defaultSchema.json
+++ b/models/json/beacon-v2-default-model/biosamples/defaultSchema.json
@@ -82,7 +82,7 @@
             "type": "string"
         },
         "info": {
-            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Info"
+            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/$defs/Info"
         },
         "measurements": {
             "description": "List of measurements of the sample.",
diff --git a/models/json/beacon-v2-default-model/biosamples/endpoints.json b/models/json/beacon-v2-default-model/biosamples/endpoints.json
index 533d5ceda..d508457e9 100644
--- a/models/json/beacon-v2-default-model/biosamples/endpoints.json
+++ b/models/json/beacon-v2-default-model/biosamples/endpoints.json
@@ -29,13 +29,13 @@
                 }
             },
             "includeResultsetResponses": {
-                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/IncludeResultsetResponses"
+                "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/IncludeResultsetResponses"
             },
             "limit": {
                 "in": "query",
                 "name": "limit",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Limit"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Limit"
                 }
             },
             "requestedSchema": {
@@ -52,7 +52,7 @@
                 "in": "query",
                 "name": "skip",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Skip"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Skip"
                 }
             }
         },
@@ -63,13 +63,13 @@
                         "schema": {
                             "oneOf": [
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconBooleanResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCountResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconResultsetsResponse.json"
                                 }
                             ]
                         }
@@ -119,7 +119,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json"
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json"
                     }
                 },
                 "tags": [
@@ -133,7 +133,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -144,7 +144,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -162,7 +162,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -182,7 +182,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -193,7 +193,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -222,7 +222,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -242,7 +242,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -253,7 +253,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -282,7 +282,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -302,7 +302,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -313,7 +313,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -342,14 +342,14 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconResultsetsResponse.json"
                                 }
                             }
                         },
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -369,7 +369,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -380,14 +380,14 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconResultsetsResponse.json"
                                 }
                             }
                         },
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
diff --git a/models/json/beacon-v2-default-model/cohorts/defaultSchema.json b/models/json/beacon-v2-default-model/cohorts/defaultSchema.json
index 95541595a..a7a7f3152 100644
--- a/models/json/beacon-v2-default-model/cohorts/defaultSchema.json
+++ b/models/json/beacon-v2-default-model/cohorts/defaultSchema.json
@@ -2,7 +2,7 @@
     "$comment": "version: ga4gh-beacon-cohort-v2.0.0",
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "CohortCriteria": {
             "description": "Criteria used for defining the cohort. It is assumed that all cohort participants will match or NOT match such criteria.",
             "properties": {
@@ -20,21 +20,21 @@
                 "ethnicities": {
                     "description": "Ethnias in cohort inclusion criteria",
                     "items": {
-                        "$ref": "../common/commonDefinitions.json#/definitions/Ethnicity"
+                        "$ref": "../common/commonDefinitions.json#/$defs/Ethnicity"
                     },
                     "type": "array"
                 },
                 "genders": {
                     "description": "Gender(s) in cohort inclusion criteria",
                     "items": {
-                        "$ref": "../common/commonDefinitions.json#/definitions/Sex"
+                        "$ref": "../common/commonDefinitions.json#/$defs/Sex"
                     },
                     "type": "array"
                 },
                 "locations": {
                     "description": "Geographic location(s) in cohort inclusion criteria",
                     "items": {
-                        "$ref": "../common/commonDefinitions.json#/definitions/GeographicLocation"
+                        "$ref": "../common/commonDefinitions.json#/$defs/GeographicLocation"
                     },
                     "type": "array"
                 },
@@ -52,7 +52,7 @@
             "description": "TBD",
             "properties": {
                 "eventAgeRange": {
-                    "$ref": "#/definitions/DataAvailabilityAndDistribution",
+                    "$ref": "#/$defs/DataAvailabilityAndDistribution",
                     "description": "Individual age range, obtained from individual level info of the cohort members"
                 },
                 "eventCases": {
@@ -72,7 +72,7 @@
                     "type": "integer"
                 },
                 "eventDataTypes": {
-                    "$ref": "#/definitions/DataAvailabilityAndDistribution",
+                    "$ref": "#/$defs/DataAvailabilityAndDistribution",
                     "description": "Aggregated data type information available for each cohort data type as declared in `cohortDataTypes`, and obtained from individual level info of the cohort members",
                     "type": "object"
                 },
@@ -87,19 +87,19 @@
                     "type": "string"
                 },
                 "eventDiseases": {
-                    "$ref": "#/definitions/DataAvailabilityAndDistribution",
+                    "$ref": "#/$defs/DataAvailabilityAndDistribution",
                     "description": "Aggregated information of disease/condition(s) obtained from individual level info of the cohort members"
                 },
                 "eventEthnicities": {
-                    "$ref": "#/definitions/DataAvailabilityAndDistribution",
+                    "$ref": "#/$defs/DataAvailabilityAndDistribution",
                     "description": "Aggregated information of ethnicity obtained from individual level info of the cohort members"
                 },
                 "eventGenders": {
-                    "$ref": "#/definitions/DataAvailabilityAndDistribution",
+                    "$ref": "#/$defs/DataAvailabilityAndDistribution",
                     "description": "Aggregated information of gender(s) obtained from individual level info of the cohort members"
                 },
                 "eventLocations": {
-                    "$ref": "#/definitions/DataAvailabilityAndDistribution",
+                    "$ref": "#/$defs/DataAvailabilityAndDistribution",
                     "description": "Aggregated information of geographic location obtained from individual level info of the cohort members"
                 },
                 "eventNum": {
@@ -113,7 +113,7 @@
                     "type": "integer"
                 },
                 "eventPhenotypes": {
-                    "$ref": "#/definitions/DataAvailabilityAndDistribution",
+                    "$ref": "#/$defs/DataAvailabilityAndDistribution",
                     "description": "Aggregated information of phenotype(s) obtained from individual level info of the cohort members"
                 },
                 "eventSize": {
@@ -211,7 +211,7 @@
     "description": "A cohort available in the beacon.",
     "properties": {
         "cohortDataTypes": {
-            "$ref": "#/definitions/DataTypesArray"
+            "$ref": "#/$defs/DataTypesArray"
         },
         "cohortDesign": {
             "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/ontologyTerm.json",
@@ -252,12 +252,12 @@
         "collectionEvents": {
             "description": "TBD",
             "items": {
-                "$ref": "#/definitions/CollectionEvent"
+                "$ref": "#/$defs/CollectionEvent"
             },
             "type": "array"
         },
         "exclusionCriteria": {
-            "$ref": "#/definitions/CohortCriteria",
+            "$ref": "#/$defs/CohortCriteria",
             "description": "Exclusion criteria used for defining the cohort. It is assumed that NONE of the cohort participants will match such criteria.",
             "type": "object"
         },
@@ -269,7 +269,7 @@
             "type": "string"
         },
         "inclusionCriteria": {
-            "$ref": "#/definitions/CohortCriteria",
+            "$ref": "#/$defs/CohortCriteria",
             "description": "Inclusion criteria used for defining the cohort. It is assumed that all cohort participants will match such criteria.",
             "type": "object"
         },
diff --git a/models/json/beacon-v2-default-model/cohorts/endpoints.json b/models/json/beacon-v2-default-model/cohorts/endpoints.json
index 1e36b7462..cbaaa6f6b 100644
--- a/models/json/beacon-v2-default-model/cohorts/endpoints.json
+++ b/models/json/beacon-v2-default-model/cohorts/endpoints.json
@@ -28,7 +28,7 @@
                 "in": "query",
                 "name": "limit",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Limit"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Limit"
                 }
             },
             "requestedSchema": {
@@ -45,7 +45,7 @@
                 "in": "query",
                 "name": "skip",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Skip"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Skip"
                 }
             }
         },
@@ -56,13 +56,13 @@
                         "schema": {
                             "oneOf": [
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconBooleanResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCountResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCollectionsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCollectionsResponse.json"
                                 }
                             ]
                         }
@@ -76,13 +76,13 @@
                         "schema": {
                             "oneOf": [
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconBooleanResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCountResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconResultsetsResponse.json"
                                 }
                             ]
                         }
@@ -129,7 +129,7 @@
                         "$ref": "#/components/responses/CollectionsResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json"
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json"
                     }
                 },
                 "tags": [
@@ -143,7 +143,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -154,7 +154,7 @@
                         "$ref": "#/components/responses/CollectionsResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -177,7 +177,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -197,7 +197,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -208,7 +208,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -234,14 +234,14 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconFilteringTermsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconFilteringTermsResponse.json"
                                 }
                             }
                         },
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -261,7 +261,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -272,14 +272,14 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconFilteringTermsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconFilteringTermsResponse.json"
                                 }
                             }
                         },
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -308,7 +308,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -328,7 +328,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -339,7 +339,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
diff --git a/models/json/beacon-v2-default-model/common/commonDefinitions.json b/models/json/beacon-v2-default-model/common/commonDefinitions.json
index 197e950ad..453d15499 100644
--- a/models/json/beacon-v2-default-model/common/commonDefinitions.json
+++ b/models/json/beacon-v2-default-model/common/commonDefinitions.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "definitions": {
+    "$defs": {
         "Ethnicity": {
             "$ref": "../../../../framework/json/common/ontologyTerm.json",
             "description": "Ethnic background of the individual. Recommended is the use of a value from NCIT Race (NCIT:C17049) ontology term descendants, e.g. NCIT:C126531 (Latin American). A geographic ancestral origin category that is assigned to a population group based mainly on physical characteristics that are thought to be distinct and inherent. [ NCI ]",
diff --git a/models/json/beacon-v2-default-model/common/complexValue.json b/models/json/beacon-v2-default-model/common/complexValue.json
index fd9993392..4da8cfa48 100644
--- a/models/json/beacon-v2-default-model/common/complexValue.json
+++ b/models/json/beacon-v2-default-model/common/complexValue.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "definitions": {
+    "$defs": {
         "TypedQuantity": {
             "properties": {
                 "quantity": {
@@ -35,7 +35,7 @@
         "typedQuantities": {
             "description": "List of quantities required to fully describe the complex value",
             "items": {
-                "$ref": "#/definitions/TypedQuantity"
+                "$ref": "#/$defs/TypedQuantity"
             },
             "type": "array"
         }
diff --git a/models/json/beacon-v2-default-model/common/dataUseConditions.json b/models/json/beacon-v2-default-model/common/dataUseConditions.json
index 4c4548a9b..a41566a23 100644
--- a/models/json/beacon-v2-default-model/common/dataUseConditions.json
+++ b/models/json/beacon-v2-default-model/common/dataUseConditions.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "DUODataUse": {
             "allOf": [
                 {
@@ -64,7 +64,7 @@
     "properties": {
         "duoDataUse": {
             "items": {
-                "$ref": "#/definitions/DUODataUse"
+                "$ref": "#/$defs/DUODataUse"
             },
             "minItems": 1,
             "type": "array"
diff --git a/models/json/beacon-v2-default-model/common/disease.json b/models/json/beacon-v2-default-model/common/disease.json
index d50bbfdfa..c3b0041cd 100644
--- a/models/json/beacon-v2-default-model/common/disease.json
+++ b/models/json/beacon-v2-default-model/common/disease.json
@@ -58,7 +58,7 @@
             "type": "string"
         },
         "severity": {
-            "$ref": "./commonDefinitions.json#/definitions/SeverityLevel",
+            "$ref": "./commonDefinitions.json#/$defs/SeverityLevel",
             "examples": [
                 {
                     "id": "HP:0012828",
diff --git a/models/json/beacon-v2-default-model/common/exposure.json b/models/json/beacon-v2-default-model/common/exposure.json
index 6fd27fd63..9e139e0ca 100644
--- a/models/json/beacon-v2-default-model/common/exposure.json
+++ b/models/json/beacon-v2-default-model/common/exposure.json
@@ -33,7 +33,7 @@
             ]
         },
         "unit": {
-            "$ref": "../common/commonDefinitions.json#/definitions/Unit",
+            "$ref": "../common/commonDefinitions.json#/$defs/Unit",
             "description": "Unit of the exposure. Recommended from NCIT Unit of Category ontology term (NCIT:C42568) descendants."
         },
         "value": {
diff --git a/models/json/beacon-v2-default-model/common/pedigree.json b/models/json/beacon-v2-default-model/common/pedigree.json
index 2b769f09e..93924fa61 100644
--- a/models/json/beacon-v2-default-model/common/pedigree.json
+++ b/models/json/beacon-v2-default-model/common/pedigree.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "pedigreeMember": {
             "examples": [
                 {
@@ -110,7 +110,7 @@
         "members": {
             "description": "List of members of the pedigree. If the current pedigree definition is attached to the proband, it contains the whole list of pedigree members, including the proband. If the definition is attached to an individual different than the proband, it only contains two entries: one that describes that member, e.g. the proband mother or father, and one that points to the proband.",
             "items": {
-                "$ref": "#/definitions/pedigreeMember"
+                "$ref": "#/$defs/pedigreeMember"
             },
             "minItems": 1,
             "type": "array"
diff --git a/models/json/beacon-v2-default-model/common/phenotypicFeature.json b/models/json/beacon-v2-default-model/common/phenotypicFeature.json
index edcf1581f..526a988f0 100644
--- a/models/json/beacon-v2-default-model/common/phenotypicFeature.json
+++ b/models/json/beacon-v2-default-model/common/phenotypicFeature.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "definitions": {},
+    "$defs": {},
     "description": "Used to describe a phenotype that characterizes the subject or biosample.",
     "properties": {
         "evidence": {
@@ -61,7 +61,7 @@
             "description": "Age or time at which the feature resolved or abated."
         },
         "severity": {
-            "$ref": "./commonDefinitions.json#/definitions/SeverityLevel",
+            "$ref": "./commonDefinitions.json#/$defs/SeverityLevel",
             "examples": [
                 {
                     "id": "HP:0012828",
diff --git a/models/json/beacon-v2-default-model/common/quantity.json b/models/json/beacon-v2-default-model/common/quantity.json
index 1a9969704..c3af5dc07 100644
--- a/models/json/beacon-v2-default-model/common/quantity.json
+++ b/models/json/beacon-v2-default-model/common/quantity.json
@@ -9,7 +9,7 @@
             "example": {}
         },
         "unit": {
-            "$ref": "./commonDefinitions.json#/definitions/Unit"
+            "$ref": "./commonDefinitions.json#/$defs/Unit"
         },
         "value": {
             "description": "The value of the quantity in the units",
diff --git a/models/json/beacon-v2-default-model/common/referenceRange.json b/models/json/beacon-v2-default-model/common/referenceRange.json
index 2f538934c..70b45e102 100644
--- a/models/json/beacon-v2-default-model/common/referenceRange.json
+++ b/models/json/beacon-v2-default-model/common/referenceRange.json
@@ -18,7 +18,7 @@
             "type": "number"
         },
         "unit": {
-            "$ref": "./commonDefinitions.json#/definitions/Unit",
+            "$ref": "./commonDefinitions.json#/$defs/Unit",
             "description": "The kind of unit.",
             "examples": [
                 {
diff --git a/models/json/beacon-v2-default-model/common/timeElement.json b/models/json/beacon-v2-default-model/common/timeElement.json
index a6c00035c..22b26e3f4 100644
--- a/models/json/beacon-v2-default-model/common/timeElement.json
+++ b/models/json/beacon-v2-default-model/common/timeElement.json
@@ -13,7 +13,7 @@
             "$ref": "./gestationalAge.json"
         },
         {
-            "$ref": "./commonDefinitions.json#/definitions/Timestamp"
+            "$ref": "./commonDefinitions.json#/$defs/Timestamp"
         },
         {
             "$ref": "./timeInterval.json"
diff --git a/models/json/beacon-v2-default-model/common/timeInterval.json b/models/json/beacon-v2-default-model/common/timeInterval.json
index 1d4a2a475..94f8b9862 100644
--- a/models/json/beacon-v2-default-model/common/timeInterval.json
+++ b/models/json/beacon-v2-default-model/common/timeInterval.json
@@ -5,13 +5,13 @@
     "description": "Time interval with start and end defined as ISO8601 time stamps.",
     "properties": {
         "end": {
-            "$ref": "./commonDefinitions.json#/definitions/Timestamp",
+            "$ref": "./commonDefinitions.json#/$defs/Timestamp",
             "examples": [
                 "2022-03-10T15:25:07Z"
             ]
         },
         "start": {
-            "$ref": "./commonDefinitions.json#/definitions/Timestamp",
+            "$ref": "./commonDefinitions.json#/$defs/Timestamp",
             "examples": [
                 "1999-08-05T17:21:00+01:00",
                 "2002-09-21T02:37:00-08:00"
diff --git a/models/json/beacon-v2-default-model/datasets/defaultSchema.json b/models/json/beacon-v2-default-model/datasets/defaultSchema.json
index 41acb023d..3efa64e7d 100644
--- a/models/json/beacon-v2-default-model/datasets/defaultSchema.json
+++ b/models/json/beacon-v2-default-model/datasets/defaultSchema.json
@@ -5,7 +5,7 @@
     "description": "A dataset available in the beacon",
     "properties": {
         "createDateTime": {
-            "$ref": "../common/commonDefinitions.json#/definitions/Timestamp",
+            "$ref": "../common/commonDefinitions.json#/$defs/Timestamp",
             "description": "The time the dataset was created (ISO 8601 format)",
             "examples": [
                 "2017-01-17T20:33:40Z"
@@ -37,7 +37,7 @@
             "type": "string"
         },
         "info": {
-            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Info"
+            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/$defs/Info"
         },
         "name": {
             "description": "Name of the dataset",
@@ -47,7 +47,7 @@
             "type": "string"
         },
         "updateDateTime": {
-            "$ref": "../common/commonDefinitions.json#/definitions/Timestamp",
+            "$ref": "../common/commonDefinitions.json#/$defs/Timestamp",
             "description": "The time the dataset was updated in (ISO 8601 format)",
             "examples": [
                 "2017-01-17T20:33:40Z"
diff --git a/models/json/beacon-v2-default-model/datasets/endpoints.json b/models/json/beacon-v2-default-model/datasets/endpoints.json
index 3fdc832a4..67b50ab04 100644
--- a/models/json/beacon-v2-default-model/datasets/endpoints.json
+++ b/models/json/beacon-v2-default-model/datasets/endpoints.json
@@ -26,7 +26,7 @@
                 "in": "query",
                 "name": "limit",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Limit"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Limit"
                 }
             },
             "requestedSchema": {
@@ -43,7 +43,7 @@
                 "in": "query",
                 "name": "skip",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Skip"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Skip"
                 }
             }
         },
@@ -54,13 +54,13 @@
                         "schema": {
                             "oneOf": [
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconBooleanResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCountResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCollectionsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCollectionsResponse.json"
                                 }
                             ]
                         }
@@ -74,13 +74,13 @@
                         "schema": {
                             "oneOf": [
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconBooleanResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCountResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconResultsetsResponse.json"
                                 }
                             ]
                         }
@@ -127,7 +127,7 @@
                         "$ref": "#/components/responses/CollectionsResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json"
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json"
                     }
                 },
                 "tags": [
@@ -141,7 +141,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -152,7 +152,7 @@
                         "$ref": "#/components/responses/CollectionsResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -175,7 +175,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -195,7 +195,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -206,7 +206,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -235,7 +235,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -255,7 +255,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -266,7 +266,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -292,14 +292,14 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconFilteringTermsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconFilteringTermsResponse.json"
                                 }
                             }
                         },
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -319,7 +319,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -330,14 +330,14 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconFilteringTermsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconFilteringTermsResponse.json"
                                 }
                             }
                         },
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -366,7 +366,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -386,7 +386,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -397,7 +397,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -426,7 +426,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -446,7 +446,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -457,7 +457,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
diff --git a/models/json/beacon-v2-default-model/endpoints.json b/models/json/beacon-v2-default-model/endpoints.json
index 9c72ad0ef..986e1fafb 100644
--- a/models/json/beacon-v2-default-model/endpoints.json
+++ b/models/json/beacon-v2-default-model/endpoints.json
@@ -5,7 +5,7 @@
                 "in": "query",
                 "name": "limit",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Limit"
+                    "$ref": "../../../framework/json/common/beaconCommonComponents.json#/$defs/Limit"
                 }
             },
             "requestedSchema": {
@@ -22,7 +22,7 @@
                 "in": "query",
                 "name": "skip",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Skip"
+                    "$ref": "../../../framework/json/common/beaconCommonComponents.json#/$defs/Skip"
                 }
             }
         },
@@ -31,7 +31,7 @@
                 "content": {
                     "application/json": {
                         "schema": {
-                            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconInfoResponse.json",
+                            "$ref": "../../../framework/json/responses/beaconInfoResponse.json",
                             "description": "Response of a request for information about a Beacon"
                         }
                     }
@@ -63,7 +63,7 @@
                         "$ref": "#/components/responses/infoOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -86,7 +86,7 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconConfigurationResponse.json",
+                                    "$ref": "../../../framework/json/responses/beaconConfigurationResponse.json",
                                     "description": "Response of a request for information about a Beacon"
                                 }
                             }
@@ -94,7 +94,7 @@
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -113,7 +113,7 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconEntryTypesResponse.json",
+                                    "$ref": "../../../framework/json/responses/beaconEntryTypesResponse.json",
                                     "description": "Response of a request for information about a Beacon"
                                 }
                             }
@@ -121,7 +121,7 @@
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -136,10 +136,10 @@
                 "operationId": "getFilteringTerms",
                 "responses": {
                     "200": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconFilteringTermsResponse.json"
+                        "$ref": "../../../framework/json/responses/beaconFilteringTermsResponse.json"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -165,7 +165,7 @@
                         "$ref": "#/components/responses/infoOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -189,7 +189,7 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconMapResponse.json",
+                                    "$ref": "../../../framework/json/responses/beaconMapResponse.json",
                                     "description": "Response of a request for information about a Beacon"
                                 }
                             }
@@ -197,7 +197,7 @@
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -215,7 +215,7 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/ga4gh-service-info-1-0-0-schema.json"
+                                    "$ref": "../../../framework/json/responses/ga4gh-service-info-1-0-0-schema.json"
                                 }
                             }
                         },
diff --git a/models/json/beacon-v2-default-model/genomicVariations/defaultSchema.json b/models/json/beacon-v2-default-model/genomicVariations/defaultSchema.json
index fc3b7f047..91517e564 100644
--- a/models/json/beacon-v2-default-model/genomicVariations/defaultSchema.json
+++ b/models/json/beacon-v2-default-model/genomicVariations/defaultSchema.json
@@ -2,7 +2,7 @@
     "$comment": "version: ga4gh-beacon-variant-v2.0.0",
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "additionalProperties": true,
-    "definitions": {
+    "$defs": {
         "CaseLevelVariant": {
             "description": "",
             "properties": {
@@ -56,7 +56,7 @@
                 },
                 "clinicalInterpretations": {
                     "items": {
-                        "$ref": "#/definitions/PhenoClinicEffect"
+                        "$ref": "#/$defs/PhenoClinicEffect"
                     },
                     "type": "array"
                 },
@@ -76,7 +76,7 @@
                 },
                 "phenotypicEffects": {
                     "items": {
-                        "$ref": "#/definitions/PhenoClinicEffect"
+                        "$ref": "#/$defs/PhenoClinicEffect"
                     },
                     "type": "array"
                 },
@@ -115,7 +115,7 @@
             "properties": {
                 "frequencies": {
                     "items": {
-                        "$ref": "#/definitions/PopulationFrequency"
+                        "$ref": "#/$defs/PopulationFrequency"
                     },
                     "minItems": 1,
                     "type": "array"
@@ -274,7 +274,7 @@
                     "type": "string"
                 },
                 "location": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh/vrs/main/schema/vrs.json#/definitions/Location"
+                    "$ref": "https://raw.githubusercontent.com/ga4gh/vrs/main/schema/vrs.json#/$defs/Location"
                 },
                 "referenceBases": {
                     "description": "Reference bases for this variant (starting from `start`). * Accepted values: IUPAC codes for nucleotides (e.g. `https://www.bioinformatics.org/sms/iupac.html`). * N is a wildcard, that denotes the position of any base, and can be used\n  as a standalone base of any type or within a partially known sequence.\n* an *empty value* is used in the case of insertions with the maximally\n  trimmed, inserted sequence being indicated in `AlternateBases`.",
@@ -340,7 +340,7 @@
                 "genomicFeatures": {
                     "description": "List of Genomic feature(s) affected by the variant.",
                     "items": {
-                        "$ref": "#/definitions/GenomicFeature"
+                        "$ref": "#/$defs/GenomicFeature"
                     },
                     "type": "array"
                 },
@@ -368,7 +368,7 @@
             "description": "List of annotated effects on disease or phenotypes.",
             "properties": {
                 "annotatedWith": {
-                    "$ref": "#/definitions/SoftwareTool"
+                    "$ref": "#/$defs/SoftwareTool"
                 },
                 "category": {
                     "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/ontologyTerm.json",
@@ -508,13 +508,13 @@
             "properties": {
                 "clinicalInterpretations": {
                     "items": {
-                        "$ref": "#/definitions/PhenoClinicEffect"
+                        "$ref": "#/$defs/PhenoClinicEffect"
                     },
                     "type": "array"
                 },
                 "phenotypicEffects": {
                     "items": {
-                        "$ref": "#/definitions/PhenoClinicEffect"
+                        "$ref": "#/$defs/PhenoClinicEffect"
                     },
                     "type": "array"
                 }
@@ -527,21 +527,21 @@
         "caseLevelData": {
             "description": "caseLevelData reports about the variation instances observed in individual analyses.",
             "items": {
-                "$ref": "#/definitions/CaseLevelVariant"
+                "$ref": "#/$defs/CaseLevelVariant"
             },
             "type": "array"
         },
         "frequencyInPopulations": {
             "items": {
-                "$ref": "#/definitions/FrequencyInPopulations"
+                "$ref": "#/$defs/FrequencyInPopulations"
             },
             "type": "array"
         },
         "identifiers": {
-            "$ref": "#/definitions/Identifiers"
+            "$ref": "#/$defs/Identifiers"
         },
         "molecularAttributes": {
-            "$ref": "#/definitions/MolecularAttributes"
+            "$ref": "#/$defs/MolecularAttributes"
         },
         "variantInternalId": {
             "description": "Reference to the **internal** variant ID. This represents the primary key/identifier of that variant **inside** a given Beacon instance. Different Beacon instances may use identical id values, referring to unrelated variants. Public identifiers such as the GA4GH Variant Representation Id (VRSid) MUST be returned in the `identifiers` section. A Beacon instance can, of course, use the VRSid as their own internal id but still MUST represent this then in the `identifiers` section.",
@@ -552,18 +552,18 @@
             "type": "string"
         },
         "variantLevelData": {
-            "$ref": "#/definitions/VariantLevelData"
+            "$ref": "#/$defs/VariantLevelData"
         },
         "variation": {
             "oneOf": [
                 {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh/vrs/1.2/schema/vrs.json#/definitions/MolecularVariation"
+                    "$ref": "https://raw.githubusercontent.com/ga4gh/vrs/1.2/schema/vrs.json#/$defs/MolecularVariation"
                 },
                 {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh/vrs/1.2/schema/vrs.json#/definitions/SystemicVariation"
+                    "$ref": "https://raw.githubusercontent.com/ga4gh/vrs/1.2/schema/vrs.json#/$defs/SystemicVariation"
                 },
                 {
-                    "$ref": "#/definitions/LegacyVariation"
+                    "$ref": "#/$defs/LegacyVariation"
                 }
             ]
         }
diff --git a/models/json/beacon-v2-default-model/genomicVariations/endpoints.json b/models/json/beacon-v2-default-model/genomicVariations/endpoints.json
index e9101f04f..acf6cac6a 100644
--- a/models/json/beacon-v2-default-model/genomicVariations/endpoints.json
+++ b/models/json/beacon-v2-default-model/genomicVariations/endpoints.json
@@ -81,13 +81,13 @@
                 }
             },
             "includeResultsetResponses": {
-                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/IncludeResultsetResponses"
+                "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/IncludeResultsetResponses"
             },
             "limit": {
                 "in": "query",
                 "name": "limit",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Limit"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Limit"
                 }
             },
             "referenceBases": {
@@ -118,8 +118,7 @@
                 "in": "query",
                 "name": "skip",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Skip"
-                }
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Skip"
             },
             "start": {
                 "in": "query",
@@ -161,13 +160,13 @@
                         "schema": {
                             "oneOf": [
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconBooleanResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCountResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconResultsetsResponse.json"
                                 }
                             ]
                         }
@@ -250,7 +249,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json"
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json"
                     }
                 },
                 "tags": [
@@ -264,7 +263,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -275,7 +274,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -293,7 +292,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -313,7 +312,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -324,7 +323,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -353,7 +352,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -373,7 +372,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -384,7 +383,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -413,7 +412,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -433,7 +432,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -444,7 +443,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
diff --git a/models/json/beacon-v2-default-model/genomicVariations/requestParameters.json b/models/json/beacon-v2-default-model/genomicVariations/requestParameters.json
index e469211f4..7ddbcc837 100644
--- a/models/json/beacon-v2-default-model/genomicVariations/requestParameters.json
+++ b/models/json/beacon-v2-default-model/genomicVariations/requestParameters.json
@@ -3,7 +3,7 @@
     "g_variant": {
         "properties": {
             "alternateBases": {
-                "$ref": "./requestParametersComponents.json#/definitions/AlternateBases"
+                "$ref": "./requestParametersComponents.json#/$defs/AlternateBases"
             },
             "aminoacidChange": {
                 "description": "Aminoacid alteration of interest. Format 1 letter",
@@ -14,7 +14,7 @@
                 "type": "string"
             },
             "assemblyId": {
-                "$ref": "./requestParametersComponents.json#/definitions/Assembly"
+                "$ref": "./requestParametersComponents.json#/$defs/Assembly"
             },
             "end": {
                 "description": "Precise or bracketing the end of the variants of interest: * (0-based, exclusive) - see `start` * for bracket queries, provide 2 values (e.g. [111,222]).",
@@ -43,13 +43,13 @@
                 "type": "string"
             },
             "mateName": {
-                "$ref": "./requestParametersComponents.json#/definitions/RefSeqId"
+                "$ref": "./requestParametersComponents.json#/$defs/RefSeqId"
             },
             "referenceBases": {
-                "$ref": "./requestParametersComponents.json#/definitions/ReferenceBases"
+                "$ref": "./requestParametersComponents.json#/$defs/ReferenceBases"
             },
             "referenceName": {
-                "$ref": "./requestParametersComponents.json#/definitions/RefSeqId"
+                "$ref": "./requestParametersComponents.json#/$defs/RefSeqId"
             },
             "start": {
                 "description": "Precise or fuzzy start coordinate position(s), allele locus (0-based, inclusive). * `start` only:\n  - for single positions, e.g. the start of a specified sequence\nalteration where the size is given through the specified `alternateBases`\n  - typical use are queries for SNV and small InDels\n  - the use of `start` without an `end` parameter requires the use of\n`alternateBases`\n* 1 value each in both `start` and `end`:\n  - for searching any variant falling fully or partially within the range\n    between `start` and `end` (a.k.a. \"range query\")\n  - additional use of `variantType` OR `alternateBases` can limit the\n    scope of the query\n  - by convention, partial overlaps of variants with the indicated genomic\n    range are accepted; for specific overlap requirements the 4-parameter\n    \"Bracket Queries\" should be employed\n* 2 values in both `start` and `end` for constructing a \"Bracket Query\":\n  - can be used to match any contiguous genomic interval, e.g. for querying\n    imprecise positions\n  - identifies all structural variants starting between `start[0]` and `start[1]`,\n    and ending between `end[0]` <-> `end[1]`\n  - single or double sided precise matches can be achieved by setting\n    `start[1]=start[0]+1` and `end[1]=end[0]+1`",
diff --git a/models/json/beacon-v2-default-model/genomicVariations/requestParametersComponents.json b/models/json/beacon-v2-default-model/genomicVariations/requestParametersComponents.json
index 60ff1da6e..4fab6770c 100644
--- a/models/json/beacon-v2-default-model/genomicVariations/requestParametersComponents.json
+++ b/models/json/beacon-v2-default-model/genomicVariations/requestParametersComponents.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "definitions": {
+    "$defs": {
         "AlternateBases": {
             "description": "Alternate bases for this variant (starting from `start`). * Accepted values: `[ACGTN]*` * The current specification supports allelic variants, **not** genotype queries\n  (i.e. multiple co-occurring alleles).\n* N is a wildcard, that denotes the position of any base,\n  and can be used as a standalone base of any type or within a partially known\n  sequence. As example, a query of `ANNT` the Ns can take take any form of [ACGT]\n  and will match `ANNT`, `ACNT`, `ACCT`, `ACGT` ... and so forth.\n* an *empty value* is used in the case of deletions with the maximally trimmed,\n  deleted sequence being indicated in `ReferenceBases`\n* Categorical variant queries, e.g. such *not* being represented through\n  sequence & position, make use of the `variantType` parameter.",
             "pattern": "^([ACGTUNRYSWKMBDHV\\-\\.]*)$",
@@ -30,5 +30,5 @@
             "type": "string"
         }
     },
-    "description": "Component definitions used in `requestParameters`."
+    "description": "Component $defs used in `requestParameters`."
 }
\ No newline at end of file
diff --git a/models/json/beacon-v2-default-model/individuals/defaultSchema.json b/models/json/beacon-v2-default-model/individuals/defaultSchema.json
index 69f989a65..e5b6876a6 100644
--- a/models/json/beacon-v2-default-model/individuals/defaultSchema.json
+++ b/models/json/beacon-v2-default-model/individuals/defaultSchema.json
@@ -12,7 +12,7 @@
             "type": "array"
         },
         "ethnicity": {
-            "$ref": "../common/commonDefinitions.json#/definitions/Ethnicity",
+            "$ref": "../common/commonDefinitions.json#/$defs/Ethnicity",
             "description": "Ethnic background of the individual. Value from NCIT Race (NCIT:C17049) ontology term descendants, e.g. NCIT:C126531 (Latin American). A geographic ancestral origin category that is assigned to a population group based mainly on physical characteristics that are thought to be distinct and inherent. [ NCI ] "
         },
         "exposures": {
@@ -22,7 +22,7 @@
             "type": "array"
         },
         "geographicOrigin": {
-            "$ref": "../common/commonDefinitions.json#/definitions/GeographicLocation",
+            "$ref": "../common/commonDefinitions.json#/$defs/GeographicLocation",
             "description": "Individual's country or region of origin (birthplace or residence place regardless of ethnic origin). Value from GAZ Geographic Location ontology (GAZ:00000448), e.g. GAZ:00002459 (United States of America)."
         },
         "id": {
@@ -31,7 +31,7 @@
             "type": "string"
         },
         "info": {
-            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Info"
+            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/$defs/Info"
         },
         "interventionsOrProcedures": {
             "items": {
@@ -40,7 +40,7 @@
             "type": "array"
         },
         "karyotypicSex": {
-            "$ref": "../common/commonDefinitions.json#/definitions/KaryotypicSex",
+            "$ref": "../common/commonDefinitions.json#/$defs/KaryotypicSex",
             "description": "The chromosomal sex of an individual represented from a selection of options."
         },
         "measures": {
@@ -62,7 +62,7 @@
             "type": "array"
         },
         "sex": {
-            "$ref": "../common/commonDefinitions.json#/definitions/Sex",
+            "$ref": "../common/commonDefinitions.json#/$defs/Sex",
             "description": "Sex of the individual. Value from NCIT General Qualifier (NCIT:C27993): 'unknown' (not assessed or not available) (NCIT:C17998), 'female' (NCIT:C16576), or 'male', (NCIT:C20197)."
         },
         "treatments": {
diff --git a/models/json/beacon-v2-default-model/individuals/endpoints.json b/models/json/beacon-v2-default-model/individuals/endpoints.json
index 32898cb17..affa76262 100644
--- a/models/json/beacon-v2-default-model/individuals/endpoints.json
+++ b/models/json/beacon-v2-default-model/individuals/endpoints.json
@@ -25,13 +25,13 @@
                 }
             },
             "includeResultsetResponses": {
-                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/IncludeResultsetResponses"
+                "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/IncludeResultsetResponses"
             },
             "limit": {
                 "in": "query",
                 "name": "limit",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Limit"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Limit"
                 }
             },
             "requestedSchema": {
@@ -48,7 +48,7 @@
                 "in": "query",
                 "name": "skip",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Skip"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Skip"
                 }
             }
         },
@@ -59,13 +59,13 @@
                         "schema": {
                             "oneOf": [
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconBooleanResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCountResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconResultsetsResponse.json"
                                 }
                             ]
                         }
@@ -115,7 +115,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json"
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json"
                     }
                 },
                 "tags": [
@@ -129,7 +129,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -140,7 +140,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -166,14 +166,14 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconFilteringTermsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconFilteringTermsResponse.json"
                                 }
                             }
                         },
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -188,7 +188,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -199,14 +199,14 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconFilteringTermsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconFilteringTermsResponse.json"
                                 }
                             }
                         },
                         "description": "Successful operation"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -224,7 +224,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -244,7 +244,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -255,7 +255,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -284,7 +284,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -304,7 +304,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -315,7 +315,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -344,7 +344,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -364,7 +364,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -375,7 +375,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
diff --git a/models/json/beacon-v2-default-model/runs/defaultSchema.json b/models/json/beacon-v2-default-model/runs/defaultSchema.json
index 6e49d8dfb..61d090df2 100644
--- a/models/json/beacon-v2-default-model/runs/defaultSchema.json
+++ b/models/json/beacon-v2-default-model/runs/defaultSchema.json
@@ -26,7 +26,7 @@
             "type": "string"
         },
         "info": {
-            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Info"
+            "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/$defs/Info"
         },
         "libraryLayout": {
             "description": "Ontology value for the library layout e.g \"PAIRED\", \"SINGLE\" #todo add Ontology name?",
diff --git a/models/json/beacon-v2-default-model/runs/endpoints.json b/models/json/beacon-v2-default-model/runs/endpoints.json
index b5084bba7..39f4f728c 100644
--- a/models/json/beacon-v2-default-model/runs/endpoints.json
+++ b/models/json/beacon-v2-default-model/runs/endpoints.json
@@ -33,7 +33,7 @@
                 }
             },
             "includeResultsetResponses": {
-                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/IncludeResultsetResponses"
+                "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/IncludeResultsetResponses"
             },
             "individualId": {
                 "in": "path",
@@ -47,7 +47,7 @@
                 "in": "query",
                 "name": "limit",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Limit"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Limit"
                 }
             },
             "requestedSchema": {
@@ -64,7 +64,7 @@
                 "in": "query",
                 "name": "skip",
                 "schema": {
-                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/common/beaconCommonComponents.json#/definitions/Skip"
+                    "$ref": "../../../../framework/json/common/beaconCommonComponents.json#/$defs/Skip"
                 }
             }
         },
@@ -75,13 +75,13 @@
                         "schema": {
                             "oneOf": [
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconBooleanResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconBooleanResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconCountResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconCountResponse.json"
                                 },
                                 {
-                                    "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconResultsetsResponse.json"
+                                    "$ref": "../../../../framework/json/responses/beaconResultsetsResponse.json"
                                 }
                             ]
                         }
@@ -131,7 +131,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json"
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json"
                     }
                 },
                 "tags": [
@@ -145,7 +145,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -156,7 +156,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -174,7 +174,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -194,7 +194,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -205,7 +205,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -234,7 +234,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -254,7 +254,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -265,7 +265,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -294,7 +294,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },
@@ -314,7 +314,7 @@
                     "content": {
                         "application/json": {
                             "schema": {
-                                "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/requests/beaconRequestBody.json"
+                                "$ref": "../../../../framework/json/requests/beaconRequestBody.json"
                             }
                         }
                     },
@@ -325,7 +325,7 @@
                         "$ref": "#/components/responses/ResultsOKResponse"
                     },
                     "default": {
-                        "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/beaconErrorResponse.json",
+                        "$ref": "../../../../framework/json/responses/beaconErrorResponse.json",
                         "description": "An unsuccessful operation"
                     }
                 },