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/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/configuration/beaconMapSchema.json b/framework/json/configuration/beaconMapSchema.json
index d4d97ab2e..ff9d6a70a 100644
--- a/framework/json/configuration/beaconMapSchema.json
+++ b/framework/json/configuration/beaconMapSchema.json
@@ -14,11 +14,6 @@
                     "description": "",
                     "type": "string"
                 },
-                "filteringTermsUrl": {
-                    "description": "Optional. Returns the list of filtering terms that could be applied to this entry type. It is added here for convenience of the Beacon clients, so they don't need to parse the OpenAPI endpoints definition to get that endpoint. Also, in very simple Beacons, that endpoint could be the one of the few implemented, together with \u00b4rootUrl` and \u00b4singleEntryUrl`, in which case the whole map of endpoints is found in the current Map.",
-                    "format": "uri-template",
-                    "type": "string"
-                },
                 "openAPIEndpointsDefinition": {
                     "description": "Reference to the file that includes the OpenAPI definition of the endpoints implemented in this Beacon instance. The referenced file MUST BE a valid OpenAPI definition file, as it is expected that the Beacon clients (e.g. a Beacon Network) should be able to parse it to discover additional details on the supported verbs, parameters, etc.",
                     "type": "string"
diff --git a/framework/json/configuration/entryTypeDefinition.json b/framework/json/configuration/entryTypeDefinition.json
index 03579a683..630f3d304 100644
--- a/framework/json/configuration/entryTypeDefinition.json
+++ b/framework/json/configuration/entryTypeDefinition.json
@@ -28,11 +28,6 @@
             "description": "A textual description for the element.",
             "type": "string"
         },
-        "filteringTerms": {
-            "$comment": "TO DO: Evaluate switch this to `url` or a more specific way for allowing URLs and local file paths (is this necessary?).",
-            "description": "Reference to the list of filtering terms that could be used to filter records of this entry type in this beacon.",
-            "type": "string"
-        },
         "id": {
             "description": "A unique identifier of the element.",
             "examples": [
diff --git a/framework/src/configuration/beaconMapSchema.yaml b/framework/src/configuration/beaconMapSchema.yaml
index 500d2087e..c16c6ab58 100644
--- a/framework/src/configuration/beaconMapSchema.yaml
+++ b/framework/src/configuration/beaconMapSchema.yaml
@@ -47,15 +47,6 @@ $defs:
           whole map of endpoints is found in the current Map.
         type: string
         format: uri-template
-      filteringTermsUrl:
-        description: Optional. Returns the list of filtering terms that could be applied
-          to this entry type. It is added here for convenience of the Beacon clients,
-          so they don't need to parse the OpenAPI endpoints definition to get that
-          endpoint. Also, in very simple Beacons, that endpoint could be the one of
-          the few implemented, together with ´rootUrl` and ´singleEntryUrl`, in which
-          case the whole map of endpoints is found in the current Map.
-        type: string
-        format: uri-template
       endpoints:
         description: Optional. A list describing additional endpoints implemented
           by this Beacon instance for that entry type. Additional details on the endpoint
diff --git a/framework/src/configuration/entryTypeDefinition.yaml b/framework/src/configuration/entryTypeDefinition.yaml
index 2a57b8c2a..98d6792f2 100644
--- a/framework/src/configuration/entryTypeDefinition.yaml
+++ b/framework/src/configuration/entryTypeDefinition.yaml
@@ -56,14 +56,6 @@ properties:
     type: array
     items:
       $ref: ../common/basicElement.yaml
-  filteringTerms:
-    description: >-
-      Reference to the list of filtering terms that could be used to filter records
-      of this entry type in this beacon.
-    type: string
-    $comment: >-
-      TO DO: Evaluate switch this to `url` or a more specific way for allowing
-      URLs and local file paths (is this necessary?).
   nonFilteredQueriesAllowed:
     $ref: ../common/beaconCommonComponents.yaml#/$defs/NonFilteredQueriesAllowed
 required:
diff --git a/models/json/beacon-v2-default-model/analyses/filteringTerms.json b/models/json/beacon-v2-default-model/analyses/filteringTerms.json
deleted file mode 100644
index 9cd753def..000000000
--- a/models/json/beacon-v2-default-model/analyses/filteringTerms.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "filteringTerms": []
-}
\ No newline at end of file
diff --git a/models/json/beacon-v2-default-model/biosamples/endpoints.json b/models/json/beacon-v2-default-model/biosamples/endpoints.json
index 037c605f3..cc751384a 100644
--- a/models/json/beacon-v2-default-model/biosamples/endpoints.json
+++ b/models/json/beacon-v2-default-model/biosamples/endpoints.json
@@ -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"
                             }
                         }
                     },
@@ -206,7 +206,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"
                             }
                         }
                     },
@@ -278,7 +278,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"
                             }
                         }
                     },
@@ -350,7 +350,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"
                             }
                         }
                     },
@@ -396,7 +396,7 @@
                         "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"
                                 }
                             }
                         },
@@ -429,7 +429,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"
                             }
                         }
                     },
@@ -440,7 +440,7 @@
                         "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"
                                 }
                             }
                         },
diff --git a/models/json/beacon-v2-default-model/biosamples/filteringTerms.json b/models/json/beacon-v2-default-model/biosamples/filteringTerms.json
deleted file mode 100644
index 9cd753def..000000000
--- a/models/json/beacon-v2-default-model/biosamples/filteringTerms.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "filteringTerms": []
-}
\ No newline at end of file
diff --git a/models/json/beacon-v2-default-model/cohorts/endpoints.json b/models/json/beacon-v2-default-model/cohorts/endpoints.json
index ac5cd1f30..806674053 100644
--- a/models/json/beacon-v2-default-model/cohorts/endpoints.json
+++ b/models/json/beacon-v2-default-model/cohorts/endpoints.json
@@ -58,13 +58,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"
                                 }
                             ]
                         }
@@ -78,13 +78,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/CollectionsResponse"
                     },
                     "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"
                             }
                         }
                     },
@@ -211,7 +211,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"
                             }
                         }
                     },
@@ -254,7 +254,7 @@
                         "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"
                                 }
                             }
                         },
@@ -287,7 +287,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"
                             }
                         }
                     },
@@ -298,7 +298,7 @@
                         "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"
                                 }
                             }
                         },
@@ -366,7 +366,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"
                             }
                         }
                     },
diff --git a/models/json/beacon-v2-default-model/datasets/endpoints.json b/models/json/beacon-v2-default-model/datasets/endpoints.json
index d9aeef24c..3f29cd135 100644
--- a/models/json/beacon-v2-default-model/datasets/endpoints.json
+++ b/models/json/beacon-v2-default-model/datasets/endpoints.json
@@ -58,13 +58,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"
                                 }
                             ]
                         }
@@ -78,13 +78,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/CollectionsResponse"
                     },
                     "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"
                             }
                         }
                     },
@@ -211,7 +211,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"
                             }
                         }
                     },
@@ -283,7 +283,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"
                             }
                         }
                     },
@@ -326,7 +326,7 @@
                         "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"
                                 }
                             }
                         },
@@ -359,7 +359,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"
                             }
                         }
                     },
@@ -370,7 +370,7 @@
                         "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"
                                 }
                             }
                         },
@@ -438,7 +438,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"
                             }
                         }
                     },
@@ -510,7 +510,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"
                             }
                         }
                     },
diff --git a/models/json/beacon-v2-default-model/endpoints.json b/models/json/beacon-v2-default-model/endpoints.json
index e8a0419a6..8a3c89cd6 100644
--- a/models/json/beacon-v2-default-model/endpoints.json
+++ b/models/json/beacon-v2-default-model/endpoints.json
@@ -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"
                         }
                     }
@@ -92,7 +92,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"
                                 }
                             }
@@ -125,7 +125,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"
                                 }
                             }
@@ -226,7 +226,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"
                                 }
                             }
@@ -258,7 +258,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/endpoints.json b/models/json/beacon-v2-default-model/genomicVariations/endpoints.json
index 9b94d240f..41bc9c121 100644
--- a/models/json/beacon-v2-default-model/genomicVariations/endpoints.json
+++ b/models/json/beacon-v2-default-model/genomicVariations/endpoints.json
@@ -173,13 +173,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"
                                 }
                             ]
                         }
@@ -262,7 +262,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": [
@@ -276,7 +276,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"
                             }
                         }
                     },
@@ -337,7 +337,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"
                             }
                         }
                     },
@@ -409,7 +409,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"
                             }
                         }
                     },
@@ -481,7 +481,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"
                             }
                         }
                     },
diff --git a/models/json/beacon-v2-default-model/individuals/endpoints.json b/models/json/beacon-v2-default-model/individuals/endpoints.json
index 1c905c150..31661db23 100644
--- a/models/json/beacon-v2-default-model/individuals/endpoints.json
+++ b/models/json/beacon-v2-default-model/individuals/endpoints.json
@@ -65,13 +65,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"
                                 }
                             ]
                         }
@@ -121,7 +121,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": [
@@ -135,7 +135,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"
                             }
                         }
                     },
@@ -178,7 +178,7 @@
                         "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"
                                 }
                             }
                         },
@@ -206,7 +206,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"
                             }
                         }
                     },
@@ -217,7 +217,7 @@
                         "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"
                                 }
                             }
                         },
@@ -274,7 +274,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"
                             }
                         }
                     },
@@ -346,7 +346,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"
                             }
                         }
                     },
@@ -418,7 +418,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"
                             }
                         }
                     },
diff --git a/models/json/beacon-v2-default-model/individuals/filteringTerms.json b/models/json/beacon-v2-default-model/individuals/filteringTerms.json
deleted file mode 100644
index 9cd753def..000000000
--- a/models/json/beacon-v2-default-model/individuals/filteringTerms.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "filteringTerms": []
-}
\ No newline at end of file
diff --git a/models/json/beacon-v2-default-model/runs/endpoints.json b/models/json/beacon-v2-default-model/runs/endpoints.json
index 456469a33..4c5325cc4 100644
--- a/models/json/beacon-v2-default-model/runs/endpoints.json
+++ b/models/json/beacon-v2-default-model/runs/endpoints.json
@@ -81,13 +81,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"
                                 }
                             ]
                         }
@@ -137,7 +137,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": [
@@ -151,7 +151,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"
                             }
                         }
                     },
@@ -212,7 +212,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"
                             }
                         }
                     },
@@ -284,7 +284,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"
                             }
                         }
                     },
@@ -356,7 +356,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"
                             }
                         }
                     },
diff --git a/models/json/beacon-v2-default-model/runs/filteringTerms.json b/models/json/beacon-v2-default-model/runs/filteringTerms.json
deleted file mode 100644
index 9cd753def..000000000
--- a/models/json/beacon-v2-default-model/runs/filteringTerms.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "filteringTerms": []
-}
\ No newline at end of file
diff --git a/models/src/beacon-v2-default-model/analyses/filteringTerms.yaml b/models/src/beacon-v2-default-model/analyses/filteringTerms.yaml
deleted file mode 100644
index 0701175cf..000000000
--- a/models/src/beacon-v2-default-model/analyses/filteringTerms.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-$schema: https://json-schema.org/draft/2020-12/schema
-filteringTerms: []
diff --git a/models/src/beacon-v2-default-model/biosamples/filteringTerms.yaml b/models/src/beacon-v2-default-model/biosamples/filteringTerms.yaml
deleted file mode 100644
index 0701175cf..000000000
--- a/models/src/beacon-v2-default-model/biosamples/filteringTerms.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-$schema: https://json-schema.org/draft/2020-12/schema
-filteringTerms: []
diff --git a/models/src/beacon-v2-default-model/individuals/filteringTerms.yaml b/models/src/beacon-v2-default-model/individuals/filteringTerms.yaml
deleted file mode 100644
index 0701175cf..000000000
--- a/models/src/beacon-v2-default-model/individuals/filteringTerms.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-$schema: https://json-schema.org/draft/2020-12/schema
-filteringTerms: []
diff --git a/models/src/beacon-v2-default-model/runs/filteringTerms.yaml b/models/src/beacon-v2-default-model/runs/filteringTerms.yaml
deleted file mode 100644
index 0701175cf..000000000
--- a/models/src/beacon-v2-default-model/runs/filteringTerms.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-$schema: https://json-schema.org/draft/2020-12/schema
-filteringTerms: []