diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1651611f6ef..d5ea67b40db 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -83,7 +83,7 @@
 			"fileMatch": [
 				"cgmanifest.json"
 			],
-			"url": "https://json.schemastore.org/component-detection-manifest.json",
+			"url": "https://www.schemastore.org/component-detection-manifest.json",
 		},
 		{
 			"fileMatch": [
diff --git a/extensions/json-language-features/client/src/node/jsonClientMain.ts b/extensions/json-language-features/client/src/node/jsonClientMain.ts
index d57ebf80834..1172d6cbde1 100644
--- a/extensions/json-language-features/client/src/node/jsonClientMain.ts
+++ b/extensions/json-language-features/client/src/node/jsonClientMain.ts
@@ -158,7 +158,7 @@ async function getSchemaRequestService(context: ExtensionContext, log: LogOutput
 
 	return {
 		getContent: async (uri: string) => {
-			if (cache && /^https?:\/\/json\.schemastore\.org\//.test(uri)) {
+			if (cache && /^https?:\/\/(json|www)\.schemastore\.org\//.test(uri)) {
 				const content = await cache.getSchemaIfUpdatedSince(uri, retryTimeoutInHours);
 				if (content) {
 					if (log.logLevel === LogLevel.Trace) {
diff --git a/extensions/json-language-features/server/README.md b/extensions/json-language-features/server/README.md
index 10956439e32..1c382916072 100644
--- a/extensions/json-language-features/server/README.md
+++ b/extensions/json-language-features/server/README.md
@@ -90,7 +90,7 @@ The server supports the following settings:
                         "foo.json",
                         "*.superfoo.json"
                     ],
-                    "url": "http://json.schemastore.org/foo",
+                    "url": "http://www.schemastore.org/foo",
                     "schema": {
                         "type": "array"
                     }
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index de458a52069..9a67c3a83ec 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -336,11 +336,11 @@
     "jsonValidation": [
       {
         "fileMatch": "package.json",
-        "url": "https://json.schemastore.org/package"
+        "url": "https://www.schemastore.org/package"
       },
       {
         "fileMatch": "bower.json",
-        "url": "https://json.schemastore.org/bower"
+        "url": "https://www.schemastore.org/bower"
       }
     ],
     "taskDefinitions": [
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 7f66178f09c..1de7b92c398 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -81,7 +81,7 @@
       },
       {
         "fileMatch": "tsconfig.json",
-        "url": "https://json.schemastore.org/tsconfig"
+        "url": "https://www.schemastore.org/tsconfig"
       },
       {
         "fileMatch": "tsconfig.json",
@@ -89,7 +89,7 @@
       },
       {
         "fileMatch": "tsconfig.*.json",
-        "url": "https://json.schemastore.org/tsconfig"
+        "url": "https://www.schemastore.org/tsconfig"
       },
       {
         "fileMatch": "tsconfig-*.json",
@@ -97,7 +97,7 @@
       },
       {
         "fileMatch": "tsconfig-*.json",
-        "url": "https://json.schemastore.org/tsconfig"
+        "url": "https://www.schemastore.org/tsconfig"
       },
       {
         "fileMatch": "tsconfig.*.json",
@@ -105,27 +105,27 @@
       },
       {
         "fileMatch": "typings.json",
-        "url": "https://json.schemastore.org/typings"
+        "url": "https://www.schemastore.org/typings"
       },
       {
         "fileMatch": ".bowerrc",
-        "url": "https://json.schemastore.org/bowerrc"
+        "url": "https://www.schemastore.org/bowerrc"
       },
       {
         "fileMatch": ".babelrc",
-        "url": "https://json.schemastore.org/babelrc"
+        "url": "https://www.schemastore.org/babelrc"
       },
       {
         "fileMatch": ".babelrc.json",
-        "url": "https://json.schemastore.org/babelrc"
+        "url": "https://www.schemastore.org/babelrc"
       },
       {
         "fileMatch": "babel.config.json",
-        "url": "https://json.schemastore.org/babelrc"
+        "url": "https://www.schemastore.org/babelrc"
       },
       {
         "fileMatch": "jsconfig.json",
-        "url": "https://json.schemastore.org/jsconfig"
+        "url": "https://www.schemastore.org/jsconfig"
       },
       {
         "fileMatch": "jsconfig.json",
@@ -133,7 +133,7 @@
       },
       {
         "fileMatch": "jsconfig.*.json",
-        "url": "https://json.schemastore.org/jsconfig"
+        "url": "https://www.schemastore.org/jsconfig"
       },
       {
         "fileMatch": "jsconfig.*.json",
diff --git a/test/.mocharc.json b/test/.mocharc.json
index 1397b6053a3..fc49e399493 100644
--- a/test/.mocharc.json
+++ b/test/.mocharc.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://json.schemastore.org/mocharc",
+	"$schema": "https://www.schemastore.org/mocharc",
 	"ui": "tdd",
 	"timeout": 10000
 }
diff --git a/test/monaco/.mocharc.json b/test/monaco/.mocharc.json
index fd9de38be2e..aaacd6913e9 100644
--- a/test/monaco/.mocharc.json
+++ b/test/monaco/.mocharc.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://json.schemastore.org/mocharc",
+	"$schema": "https://www.schemastore.org/mocharc",
 	"ui": "bdd",
 	"timeout": 10000
 }