diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2442a0737da..56002ffb1c3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -207,7 +207,7 @@ When renaming a schema name, the old version must continue to exist. Otherwise,
 
 ```json
 {
-  "$ref": "https://json.schemastore.org/NEWNAME.json"
+  "$ref": "https://www.schemastore.org/NEWNAME.json"
 }
 ```
 
@@ -218,7 +218,7 @@ The process of renaming schemas is similar to [this section](#how-to-move-a-json
 Many tools, such as [validate-pyproject](https://github.com/abravalheri/validate-pyproject), accept passing in subpaths for validation like so:
 
 ```sh
-validate-pyproject --tool cibuildwheel=https://json.schemastore.org/cibuildwheel.toml#/properties/tool/properties
+validate-pyproject --tool cibuildwheel=https://www.schemastore.org/cibuildwheel.toml#/properties/tool/properties
 ```
 
 This means that renames in subschema paths is a potentially a breaking change. However, it needs to be possible to refactor internal schema structures.
@@ -409,7 +409,7 @@ When adding glob patterns to `fileMatch` so language servers can auto-apply sche
   "name": "Hugo",
   "description": "Hugo static site generator config file",
   "fileMatch": ["config.toml"], // Avoid generic patterns.
-  "url": "https://json.schemastore.org/hugo.json",
+  "url": "https://www.schemastore.org/hugo.json",
 }
 ```
 
@@ -560,7 +560,7 @@ If you do not wish to use the `new-schema` task, the manual steps are listed bel
      "description": "Schema description",
      "fileMatch": ["list of well-known filenames matching schema"],
      "name": "Friendly schema name",
-     "url": "https://json.schemastore.org/<schemaName>.json"
+     "url": "https://www.schemastore.org/<schemaName>.json"
    }
    ```
 
@@ -570,7 +570,7 @@ Finally, validate your changes. See [How to Validate a JSON Schema](#how-to-vali
 
 ### How to add a JSON Schema that's self-hosted/remote/external
 
-You may wish to serve a schema from `https://json.schemastore.org/<schemaName>.json`, but keep the content of the schema file at a place you control (not this repository).
+You may wish to serve a schema from `https://www.schemastore.org/<schemaName>.json`, but keep the content of the schema file at a place you control (not this repository).
 
 See [this PR](https://github.com/SchemaStore/schemastore/pull/1211/files) as an example. Simply register your schema in the [schema catalog](src/api/json/catalog.json), with the `url` field pointing to your schema file:
 
@@ -618,11 +618,11 @@ Then, use the `versions` field to list each of them. Add the latest version to t
   "description": "JSON schema for the Agrippa config file",
   "fileMatch": [".agripparc.json", "agripparc.json"],
   "name": ".agripparc.json",
-  "url": "https://json.schemastore.org/agripparc-1.4.json",
+  "url": "https://www.schemastore.org/agripparc-1.4.json",
   "versions": {
-    "1.2": "https://json.schemastore.org/agripparc-1.2.json",
-    "1.3": "https://json.schemastore.org/agripparc-1.3.json",
-    "1.4": "https://json.schemastore.org/agripparc-1.4.json"
+    "1.2": "https://www.schemastore.org/agripparc-1.2.json",
+    "1.3": "https://www.schemastore.org/agripparc-1.3.json",
+    "1.4": "https://www.schemastore.org/agripparc-1.4.json"
   }
 }
 ```
@@ -643,7 +643,7 @@ See [this PR](https://github.com/SchemaStore/schemastore/pull/2421/files) for a
 - Both schemas must exist [locally](src/schemas/json) in SchemaStore.
 - Both schemas must have the same draft (ex. `draft-07`)
 - `schema_y.json` must have `id` or `$id` with this value `"https://json.schemastore.org/schema_y.json"`
-- In `schema_x.json`, add ref to `schema_y.json`: `"$ref": "https://json.schemastore.org/schema_y.json#..."`
+- In `schema_x.json`, add ref to `schema_y.json`: `"$ref": "https://www.schemastore.org/schema_y.json#..."`
 - Within [schema-validation.jsonc](./src/schema-validation.jsonc), in `"options": []`, add an entry:
   `{ "schema_x.json": {"externalSchema": ["schema_y.json"] } }`
   - Note that all transitive schemas must be specified in `externalSchema`
diff --git a/scripts/build-xregistry.js b/scripts/build-xregistry.js
index 5076683761b..8ed0d75fed2 100644
--- a/scripts/build-xregistry.js
+++ b/scripts/build-xregistry.js
@@ -229,9 +229,9 @@ async function buildXRegistry() {
     )
     const url = schema.url
     console.info(`Determining schema format for ${url}...`)
-    // Map json.schemastore.org domain to schemastore.org
+    // Map www.schemastore.org domain to schemastore.org
     let domain = extractDomain(url)
-    if (domain === 'json.schemastore.org') {
+    if (domain === 'json.schemastore.org' || domain === 'www.schemastore.org') {
       domain = 'schemastore.org'
     }
 
diff --git a/src/api/json/catalog.json b/src/api/json/catalog.json
index bcbbfafaae6..720bd89a638 100644
--- a/src/api/json/catalog.json
+++ b/src/api/json/catalog.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/schema-catalog.json",
+  "$schema": "https://www.schemastore.org/schema-catalog.json",
   "version": 1,
   "schemas": [
     {
diff --git a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-extraneous-property.json b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-extraneous-property.json
index 204cd51b01d..c01555f47e8 100644
--- a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-extraneous-property.json
+++ b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-extraneous-property.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.0.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-fractional-lot-size.json b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-fractional-lot-size.json
index 1ff8d6ae38f..80bbdeea804 100644
--- a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-fractional-lot-size.json
+++ b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-fractional-lot-size.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.0.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-plan-date.json b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-plan-date.json
index d3c29a4cac1..f5da3b2e1c2 100644
--- a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-plan-date.json
+++ b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-plan-date.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.0.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-strings-as-numbers.json b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-strings-as-numbers.json
index cd26fa76595..fb334a15d5b 100644
--- a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-strings-as-numbers.json
+++ b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-invalid-strings-as-numbers.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.0.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-missing-tabs.json b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-missing-tabs.json
index 0ed06d637c3..73da5547056 100644
--- a/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-missing-tabs.json
+++ b/src/negative_test/abc-supply-plan-10.0.0/abc-supply-plan-missing-tabs.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.0.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-extraneous-property.json b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-extraneous-property.json
index 08ba0aa0f7b..c31ce7e22de 100644
--- a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-extraneous-property.json
+++ b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-extraneous-property.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.1.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-fractional-lot-size.json b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-fractional-lot-size.json
index 82212b75349..54c59f0ff6f 100644
--- a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-fractional-lot-size.json
+++ b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-fractional-lot-size.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.1.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-plan-date.json b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-plan-date.json
index ed5ad352034..e5d954030cc 100644
--- a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-plan-date.json
+++ b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-plan-date.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.1.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-strings-as-numbers.json b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-strings-as-numbers.json
index 05766f53226..c1945d3cf8c 100644
--- a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-strings-as-numbers.json
+++ b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-strings-as-numbers.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.1.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-targetmfcs-empty-array.json b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-targetmfcs-empty-array.json
index 396bea9b983..31f34bce6d6 100644
--- a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-targetmfcs-empty-array.json
+++ b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-targetmfcs-empty-array.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.1.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-targetmfcs-too-many-items.json b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-targetmfcs-too-many-items.json
index e2b091f4add..7e85327a4cc 100644
--- a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-targetmfcs-too-many-items.json
+++ b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-invalid-targetmfcs-too-many-items.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.1.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-missing-tabs.json b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-missing-tabs.json
index 81cfa3481d2..88da1c9e8dd 100644
--- a/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-missing-tabs.json
+++ b/src/negative_test/abc-supply-plan-10.1.0/abc-supply-plan-missing-tabs.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.1.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-extraneous-property.json b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-extraneous-property.json
index 31c2c973426..afb802ad13d 100644
--- a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-extraneous-property.json
+++ b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-extraneous-property.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.0.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-fractional-lot-size.json b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-fractional-lot-size.json
index babf3818417..c83f7bf51ef 100644
--- a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-fractional-lot-size.json
+++ b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-fractional-lot-size.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.0.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-plan-date.json b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-plan-date.json
index 0ca21c522fe..9b959efcaec 100644
--- a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-plan-date.json
+++ b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-plan-date.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.0.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-strings-as-numbers.json b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-strings-as-numbers.json
index 70f85750e22..500ae8bc166 100644
--- a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-strings-as-numbers.json
+++ b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-invalid-strings-as-numbers.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.0.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-missing-tabs.json b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-missing-tabs.json
index 31e91d403a0..3869377f902 100644
--- a/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-missing-tabs.json
+++ b/src/negative_test/abc-supply-plan-11.0.0/abc-supply-plan-missing-tabs.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.0.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-extraneous-property.json b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-extraneous-property.json
index 8fa6a2b8740..239c1c34629 100644
--- a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-extraneous-property.json
+++ b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-extraneous-property.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.1.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-fractional-lot-size.json b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-fractional-lot-size.json
index e4eeb0ef405..a21d0dcc2a0 100644
--- a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-fractional-lot-size.json
+++ b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-fractional-lot-size.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.1.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-plan-date.json b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-plan-date.json
index 690294f0701..8bd25c042b5 100644
--- a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-plan-date.json
+++ b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-plan-date.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.1.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-strings-as-numbers.json b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-strings-as-numbers.json
index 40cc1ff96db..70c1a8aff7d 100644
--- a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-strings-as-numbers.json
+++ b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-invalid-strings-as-numbers.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.1.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-missing-tabs.json b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-missing-tabs.json
index 259b9b85abc..c00ab97f746 100644
--- a/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-missing-tabs.json
+++ b/src/negative_test/abc-supply-plan-11.1.0/abc-supply-plan-missing-tabs.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.1.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-extraneous-property.json b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-extraneous-property.json
index 2cdbc14db56..ac04ee71195 100644
--- a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-extraneous-property.json
+++ b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-extraneous-property.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.2.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.2.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-fractional-lot-size.json b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-fractional-lot-size.json
index eb267d8189d..5f932cd507d 100644
--- a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-fractional-lot-size.json
+++ b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-fractional-lot-size.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.2.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.2.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-plan-date.json b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-plan-date.json
index 032064ca5f5..af748f2ee69 100644
--- a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-plan-date.json
+++ b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-plan-date.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.2.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.2.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-strings-as-numbers.json b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-strings-as-numbers.json
index 16dd105ba10..55b735fae68 100644
--- a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-strings-as-numbers.json
+++ b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-invalid-strings-as-numbers.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.2.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.2.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-missing-tabs.json b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-missing-tabs.json
index 19a70c033a1..05329e36ccb 100644
--- a/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-missing-tabs.json
+++ b/src/negative_test/abc-supply-plan-11.2.0/abc-supply-plan-missing-tabs.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.2.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.2.0.json",
   "abcMaterialsMap": {},
   "analytics": {
     "items": [],
diff --git a/src/schemas/json/abc-supply-plan-10.0.0.json b/src/schemas/json/abc-supply-plan-10.0.0.json
index 6f692b27695..178df8dd758 100644
--- a/src/schemas/json/abc-supply-plan-10.0.0.json
+++ b/src/schemas/json/abc-supply-plan-10.0.0.json
@@ -5,9 +5,12 @@
   "description": "Schema defining the structure of ABCSupplyPlan used for managing plan data in ABC-Plan's MasterPlanner.",
   "properties": {
     "$schema": {
-      "description": "Link to https://json.schemastore.org/abc-supply-plan-10.0.0.json",
+      "description": "Link to https://www.schemastore.org/abc-supply-plan-10.0.0.json",
       "type": "string",
-      "enum": ["https://json.schemastore.org/abc-supply-plan-10.0.0.json"]
+      "enum": [
+        "https://json.schemastore.org/abc-supply-plan-10.0.0.json",
+        "https://www.schemastore.org/abc-supply-plan-10.0.0.json"
+      ]
     },
     "planDate": {
       "type": "string",
diff --git a/src/schemas/json/abc-supply-plan-10.1.0.json b/src/schemas/json/abc-supply-plan-10.1.0.json
index 146da947dfc..f7c988f9200 100644
--- a/src/schemas/json/abc-supply-plan-10.1.0.json
+++ b/src/schemas/json/abc-supply-plan-10.1.0.json
@@ -5,9 +5,12 @@
   "description": "Schema defining the structure of ABCSupplyPlan used for managing plan data in ABC-Plan's MasterPlanner.",
   "properties": {
     "$schema": {
-      "description": "Link to https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+      "description": "Link to https://www.schemastore.org/abc-supply-plan-10.1.0.json",
       "type": "string",
-      "enum": ["https://json.schemastore.org/abc-supply-plan-10.1.0.json"]
+      "enum": [
+        "https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+        "https://www.schemastore.org/abc-supply-plan-10.1.0.json"
+      ]
     },
     "planDate": {
       "type": "string",
diff --git a/src/schemas/json/abc-supply-plan-11.0.0.json b/src/schemas/json/abc-supply-plan-11.0.0.json
index 83dda3fc211..1dfd2130542 100644
--- a/src/schemas/json/abc-supply-plan-11.0.0.json
+++ b/src/schemas/json/abc-supply-plan-11.0.0.json
@@ -5,9 +5,12 @@
   "description": "Schema defining the structure of ABCSupplyPlan used for managing plan data in ABC-Plan's MasterPlanner.",
   "properties": {
     "$schema": {
-      "description": "Link to https://json.schemastore.org/abc-supply-plan-11.0.0.json",
+      "description": "Link to https://www.schemastore.org/abc-supply-plan-11.0.0.json",
       "type": "string",
-      "enum": ["https://json.schemastore.org/abc-supply-plan-11.0.0.json"]
+      "enum": [
+        "https://json.schemastore.org/abc-supply-plan-11.0.0.json",
+        "https://www.schemastore.org/abc-supply-plan-11.0.0.json"
+      ]
     },
     "planDate": {
       "type": "string",
diff --git a/src/schemas/json/abc-supply-plan-11.1.0.json b/src/schemas/json/abc-supply-plan-11.1.0.json
index c03164f1c4c..201186acca0 100644
--- a/src/schemas/json/abc-supply-plan-11.1.0.json
+++ b/src/schemas/json/abc-supply-plan-11.1.0.json
@@ -5,9 +5,12 @@
   "description": "Schema defining the structure of ABCSupplyPlan used for managing plan data in ABC-Plan's MasterPlanner.",
   "properties": {
     "$schema": {
-      "description": "Link to https://json.schemastore.org/abc-supply-plan-11.1.0.json",
+      "description": "Link to https://www.schemastore.org/abc-supply-plan-11.1.0.json",
       "type": "string",
-      "enum": ["https://json.schemastore.org/abc-supply-plan-11.1.0.json"]
+      "enum": [
+        "https://json.schemastore.org/abc-supply-plan-11.1.0.json",
+        "https://www.schemastore.org/abc-supply-plan-11.1.0.json"
+      ]
     },
     "planDate": {
       "type": "string",
diff --git a/src/schemas/json/abc-supply-plan-11.2.0.json b/src/schemas/json/abc-supply-plan-11.2.0.json
index 20cb7b97def..06f1f133723 100644
--- a/src/schemas/json/abc-supply-plan-11.2.0.json
+++ b/src/schemas/json/abc-supply-plan-11.2.0.json
@@ -5,9 +5,12 @@
   "description": "Schema defining the structure of ABCSupplyPlan used for managing plan data in ABC-Plan's MasterPlanner.",
   "properties": {
     "$schema": {
-      "description": "Link to https://json.schemastore.org/abc-supply-plan-11.2.0.json",
+      "description": "Link to https://www.schemastore.org/abc-supply-plan-11.2.0.json",
       "type": "string",
-      "enum": ["https://json.schemastore.org/abc-supply-plan-11.2.0.json"]
+      "enum": [
+        "https://json.schemastore.org/abc-supply-plan-11.2.0.json",
+        "https://www.schemastore.org/abc-supply-plan-11.2.0.json"
+      ]
     },
     "planDate": {
       "type": "string",
diff --git a/src/schemas/json/schema-catalog.json b/src/schemas/json/schema-catalog.json
index fe3deb0723d..4da7596d9a3 100644
--- a/src/schemas/json/schema-catalog.json
+++ b/src/schemas/json/schema-catalog.json
@@ -4,9 +4,12 @@
   "additionalProperties": false,
   "properties": {
     "$schema": {
-      "description": "Link to https://json.schemastore.org/schema-catalog.json",
+      "description": "Link to https://www.schemastore.org/schema-catalog.json",
       "type": "string",
-      "enum": ["https://json.schemastore.org/schema-catalog.json"]
+      "enum": [
+        "https://json.schemastore.org/schema-catalog.json",
+        "https://www.schemastore.org/schema-catalog.json"
+      ]
     },
     "schemas": {
       "type": "array",
diff --git a/src/test/abc-supply-plan-10.0.0/abc-supply-plan.json b/src/test/abc-supply-plan-10.0.0/abc-supply-plan.json
index cd89d4c7655..e01bd5ec60b 100644
--- a/src/test/abc-supply-plan-10.0.0/abc-supply-plan.json
+++ b/src/test/abc-supply-plan-10.0.0/abc-supply-plan.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.0.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/test/abc-supply-plan-10.1.0/abc-supply-plan.json b/src/test/abc-supply-plan-10.1.0/abc-supply-plan.json
index caa7b8aedfb..f68d5c76b7b 100644
--- a/src/test/abc-supply-plan-10.1.0/abc-supply-plan.json
+++ b/src/test/abc-supply-plan-10.1.0/abc-supply-plan.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-10.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-10.1.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/test/abc-supply-plan-11.0.0/abc-supply-plan.json b/src/test/abc-supply-plan-11.0.0/abc-supply-plan.json
index ead2e564763..73ccdfd0697 100644
--- a/src/test/abc-supply-plan-11.0.0/abc-supply-plan.json
+++ b/src/test/abc-supply-plan-11.0.0/abc-supply-plan.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.0.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.0.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/test/abc-supply-plan-11.1.0/abc-supply-plan.json b/src/test/abc-supply-plan-11.1.0/abc-supply-plan.json
index 3291da4387e..31645d70016 100644
--- a/src/test/abc-supply-plan-11.1.0/abc-supply-plan.json
+++ b/src/test/abc-supply-plan-11.1.0/abc-supply-plan.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.1.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.1.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/test/abc-supply-plan-11.2.0/abc-supply-plan.json b/src/test/abc-supply-plan-11.2.0/abc-supply-plan.json
index 48e5965c861..d36f333ff09 100644
--- a/src/test/abc-supply-plan-11.2.0/abc-supply-plan.json
+++ b/src/test/abc-supply-plan-11.2.0/abc-supply-plan.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/abc-supply-plan-11.2.0.json",
+  "$schema": "https://www.schemastore.org/abc-supply-plan-11.2.0.json",
   "abcMaterialsMap": {
     "1": {
       "abcMaterialName": "FDP",
diff --git a/src/test/aspire-8.0/Nats.3.json b/src/test/aspire-8.0/Nats.3.json
index 2a057489028..717cd9088a2 100644
--- a/src/test/aspire-8.0/Nats.3.json
+++ b/src/test/aspire-8.0/Nats.3.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/aspire-8.0.json",
+  "$schema": "https://www.schemastore.org/aspire-8.0.json",
   "resources": {
     "api": {
       "bindings": {
diff --git a/src/test/aspire-8.0/OracleEndToEnd.2.json b/src/test/aspire-8.0/OracleEndToEnd.2.json
index c4591073f3d..4a8b87a4fba 100644
--- a/src/test/aspire-8.0/OracleEndToEnd.2.json
+++ b/src/test/aspire-8.0/OracleEndToEnd.2.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/aspire-8.0.json",
+  "$schema": "https://www.schemastore.org/aspire-8.0.json",
   "resources": {
     "FREEPDB1": {
       "connectionString": "{oracle.connectionString}/FREEPDB1",
diff --git a/src/test/aspire-8.0/TestShop.3.json b/src/test/aspire-8.0/TestShop.3.json
index 79db9a7307e..8712ecb569e 100644
--- a/src/test/aspire-8.0/TestShop.3.json
+++ b/src/test/aspire-8.0/TestShop.3.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/aspire-8.0.json",
+  "$schema": "https://www.schemastore.org/aspire-8.0.json",
   "resources": {
     "apigateway": {
       "args": ["/app/yarp.dll"],
diff --git a/src/test/claude-code-settings/modern-complete-config.json b/src/test/claude-code-settings/modern-complete-config.json
index 79b1a2db260..8e3a779e362 100644
--- a/src/test/claude-code-settings/modern-complete-config.json
+++ b/src/test/claude-code-settings/modern-complete-config.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/claude-code-settings.json",
+  "$schema": "https://www.schemastore.org/claude-code-settings.json",
   "apiKeyHelper": "/usr/local/bin/claude-auth-helper",
   "cleanupPeriodDays": 60,
   "disabledMcpjsonServers": ["untrusted-server"],
diff --git a/src/test/schema-catalog/minimal.json b/src/test/schema-catalog/minimal.json
index 3cb257710e1..64cca7d3932 100644
--- a/src/test/schema-catalog/minimal.json
+++ b/src/test/schema-catalog/minimal.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/schema-catalog.json",
+  "$schema": "https://www.schemastore.org/schema-catalog.json",
   "schemas": [
     {
       "description": "minimal",
diff --git a/src/test/schema-catalog/multiple.json b/src/test/schema-catalog/multiple.json
index 0b2655b21a1..b52fe88bb4d 100644
--- a/src/test/schema-catalog/multiple.json
+++ b/src/test/schema-catalog/multiple.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json.schemastore.org/schema-catalog.json",
+  "$schema": "https://www.schemastore.org/schema-catalog.json",
   "schemas": [
     {
       "description": "minimal",