diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ffaa4d..72be0f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 > **Note**: odd version numbers, for example, `0.13.0`, are not included in this changelog. They are used to test the new features and fixes before the final release.
 
+## [0.17.0] - Unreleased
+
+### Changed: 
+
+- Snippets: Updated schema urls to reflect the move to dotnet organisation in Github
+- Code action: Updated update schema code action to reflect the move to dotnet organisation in Github
+
 ## [0.16.0] - 2025-02-03
 
 ### Added:
diff --git a/package-lock.json b/package-lock.json
index d791b19..02ce2e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "dev-proxy-toolkit",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dev-proxy-toolkit",
-      "version": "0.16.0",
+      "version": "0.17.0",
       "dependencies": {
         "json-to-ast": "^2.1.0"
       },
diff --git a/package.json b/package.json
index 8155679..a53fffd 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "dev-proxy-toolkit",
   "displayName": "Dev Proxy Toolkit",
   "description": "Makes it easy to create and update Dev Proxy configuration files.",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "publisher": "garrytrinder",
   "engines": {
     "vscode": "^1.89.0"
diff --git a/scripts/snippets-table.js b/scripts/snippets-table.js
index 2a245a1..bdfd1eb 100644
--- a/scripts/snippets-table.js
+++ b/scripts/snippets-table.js
@@ -8,7 +8,7 @@ const snippets = require('../src/snippets.json');
 //       "prefix": "devproxy-config",
 //       "body": [
 //         "{",
-//         "\t\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v1.0/rc.schema.json\",",
+//         "\t\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v1.0/rc.schema.json\",",
 //         "\t\"plugins\": [$1],",
 //         "\t\"urlsToWatch\": [$2],",
 //         "\t\"rate\": 50,",
diff --git a/src/codeactions.ts b/src/codeactions.ts
index 1327685..66486fe 100644
--- a/src/codeactions.ts
+++ b/src/codeactions.ts
@@ -22,7 +22,7 @@ export const registerCodeActions = (context: vscode.ExtensionContext) => {
                             diagnostic.range.start,
                             diagnostic.range.end
                         ),
-                        `$schema": "https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v${devProxyVersion}/rc.schema.json",`
+                        `$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v${devProxyVersion}/rc.schema.json",`
                     );
                     return [fix];
                 }
diff --git a/src/snippets.json b/src/snippets.json
index f5236b6..91944a8 100644
--- a/src/snippets.json
+++ b/src/snippets.json
@@ -3,7 +3,7 @@
     "prefix": "devproxy-config-file",
     "body": [
       "{",
-      "\t\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json\",",
+      "\t\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/rc.schema.json\",",
       "\t\"plugins\": [",
       "\t\t$1",
       "\t],",
@@ -20,7 +20,7 @@
   "ConfigFileSchema": {
     "prefix": "devproxy-config-file-schema",
     "body": [
-      "\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/rc.schema.json\","
+      "\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/rc.schema.json\","
     ],
     "description": "Dev Proxy config file schema"
   },
@@ -42,7 +42,7 @@
     "prefix": "devproxy-mocks-file",
     "body": [
       "{",
-      "\t\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json\",",
+      "\t\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json\",",
       "\t\"mocks\": [",
       "\t\t$1",
       "\t]",
@@ -53,7 +53,7 @@
   "MocksFileSchema": {
     "prefix": "devproxy-mocks-file-schema",
     "body": [
-      "\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json\","
+      "\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json\","
     ],
     "description": "Dev Proxy mocks file schema"
   },
@@ -294,7 +294,7 @@
     "prefix": "devproxy-plugin-crud-api-file",
     "body": [
       "{",
-      "\t\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/crudapiplugin.schema.json\",",
+      "\t\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/crudapiplugin.schema.json\",",
       "\t\"actions\": [",
       "\t\t$1",
       "\t],",
@@ -307,7 +307,7 @@
   "CrudApiPluginFileSchema": {
     "prefix": "devproxy-plugin-crud-api-file-schema",
     "body": [
-      "\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/crudapiplugin.schema.json\","
+      "\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/crudapiplugin.schema.json\","
     ],
     "description": "CrudApiPlugin API file schema"
   },
@@ -409,7 +409,7 @@
     "prefix": "devproxy-plugin-generic-random-error-file",
     "body": [
       "{",
-      "\t\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/genericrandomerrorplugin.schema.json\",",
+      "\t\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/genericrandomerrorplugin.schema.json\",",
       "\t\"errors\": [",
       "\t\t$1",
       "\t]",
@@ -420,7 +420,7 @@
   "GenericRandomErrorPluginFileSchema": {
     "prefix": "devproxy-plugin-generic-random-error-file-schema",
     "body": [
-      "\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/genericrandomerrorplugin.schema.json\","
+      "\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/genericrandomerrorplugin.schema.json\","
     ],
     "description": "GenericRandomErrorPlugin errors file schema"
   },
@@ -728,7 +728,7 @@
   "MockResponsePluginFileSchema": {
     "prefix": "devproxy-plugin-mock-response-schema",
     "body": [
-      "\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json\","
+      "\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/mockresponseplugin.schema.json\","
     ],
     "description": "MockResponsePlugin schema"
   },
@@ -823,7 +823,7 @@
     "prefix": "devproxy-plugin-rate-limiting-file",
     "body": [
       "{",
-      "\t\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/ratelimitingplugin.schema.json\",",
+      "\t\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/ratelimitingplugin.schema.json\",",
       "\t\"body\": {",
       "\t\t$1",
       "\t},",
@@ -838,7 +838,7 @@
   "RateLimitingFileSchema": {
     "prefix": "devproxy-plugin-rate-limiting-file-schema",
     "body": [
-      "\"\\$schema\": \"https://raw.githubusercontent.com/microsoft/dev-proxy/main/schemas/v0.24.0/ratelimitingplugin.schema.json\","
+      "\"\\$schema\": \"https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v0.24.0/ratelimitingplugin.schema.json\","
     ],
     "description": "Dev Proxy rate limiting file schema"
   },