diff --git a/apps/docs/spec/api_v1_openapi.json b/apps/docs/spec/api_v1_openapi.json
index 658a292fa0..36e0d4f4a6 100644
--- a/apps/docs/spec/api_v1_openapi.json
+++ b/apps/docs/spec/api_v1_openapi.json
@@ -449,7 +449,10 @@
             "required": false,
             "in": "query",
             "description": "Resource indicator for MCP (Model Context Protocol) clients",
-            "schema": { "type": "string", "enum": ["https://api.supabase.io/mcp"] }
+            "schema": {
+              "type": "string",
+              "enum": ["https://api.supabase.com/mcp", "https://mcp.supabase.com/mcp"]
+            }
           }
         ],
         "responses": { "204": { "description": "" } },
@@ -4790,7 +4793,7 @@
           "refresh_token": { "type": "string" },
           "resource": {
             "type": "string",
-            "enum": ["https://api.supabase.io/mcp"],
+            "enum": ["https://api.supabase.com/mcp", "https://mcp.supabase.com/mcp"],
             "description": "Resource indicator for MCP (Model Context Protocol) clients"
           }
         },
@@ -5615,7 +5618,17 @@
               {
                 "type": "object",
                 "properties": {
+                  "kid": { "type": "string", "format": "uuid" },
+                  "use": { "type": "string", "enum": ["sig"] },
+                  "key_ops": {
+                    "type": "array",
+                    "items": { "type": "string", "enum": ["sign", "verify"] },
+                    "minItems": 2,
+                    "maxItems": 2
+                  },
+                  "ext": { "type": "boolean", "enum": [true] },
                   "kty": { "type": "string", "enum": ["RSA"] },
+                  "alg": { "type": "string", "enum": ["RS256"] },
                   "n": { "type": "string" },
                   "e": { "type": "string", "enum": ["AQAB"] },
                   "d": { "type": "string" },
@@ -5631,7 +5644,17 @@
               {
                 "type": "object",
                 "properties": {
+                  "kid": { "type": "string", "format": "uuid" },
+                  "use": { "type": "string", "enum": ["sig"] },
+                  "key_ops": {
+                    "type": "array",
+                    "items": { "type": "string", "enum": ["sign", "verify"] },
+                    "minItems": 2,
+                    "maxItems": 2
+                  },
+                  "ext": { "type": "boolean", "enum": [true] },
                   "kty": { "type": "string", "enum": ["EC"] },
+                  "alg": { "type": "string", "enum": ["ES256"] },
                   "crv": { "type": "string", "enum": ["P-256"] },
                   "x": { "type": "string" },
                   "y": { "type": "string" },
@@ -5643,7 +5666,17 @@
               {
                 "type": "object",
                 "properties": {
+                  "kid": { "type": "string", "format": "uuid" },
+                  "use": { "type": "string", "enum": ["sig"] },
+                  "key_ops": {
+                    "type": "array",
+                    "items": { "type": "string", "enum": ["sign", "verify"] },
+                    "minItems": 2,
+                    "maxItems": 2
+                  },
+                  "ext": { "type": "boolean", "enum": [true] },
                   "kty": { "type": "string", "enum": ["OKP"] },
+                  "alg": { "type": "string", "enum": ["EdDSA"] },
                   "crv": { "type": "string", "enum": ["Ed25519"] },
                   "x": { "type": "string" },
                   "d": { "type": "string" }
@@ -5654,7 +5687,17 @@
               {
                 "type": "object",
                 "properties": {
+                  "kid": { "type": "string", "format": "uuid" },
+                  "use": { "type": "string", "enum": ["sig"] },
+                  "key_ops": {
+                    "type": "array",
+                    "items": { "type": "string", "enum": ["sign", "verify"] },
+                    "minItems": 2,
+                    "maxItems": 2
+                  },
+                  "ext": { "type": "boolean", "enum": [true] },
                   "kty": { "type": "string", "enum": ["oct"] },
+                  "alg": { "type": "string", "enum": ["HS256"] },
                   "k": { "type": "string", "minLength": 16 }
                 },
                 "required": ["kty", "k"],
diff --git a/apps/docs/spec/transforms/api_v1_openapi_deparsed.json b/apps/docs/spec/transforms/api_v1_openapi_deparsed.json
index 4001882bb2..2d2a2ccae8 100644
--- a/apps/docs/spec/transforms/api_v1_openapi_deparsed.json
+++ b/apps/docs/spec/transforms/api_v1_openapi_deparsed.json
@@ -1134,7 +1134,7 @@
             "description": "Resource indicator for MCP (Model Context Protocol) clients",
             "schema": {
               "type": "string",
-              "enum": ["https://api.supabase.io/mcp"]
+              "enum": ["https://api.supabase.com/mcp", "https://mcp.supabase.com/mcp"]
             }
           }
         ],
@@ -1188,7 +1188,7 @@
                   },
                   "resource": {
                     "type": "string",
-                    "enum": ["https://api.supabase.io/mcp"],
+                    "enum": ["https://api.supabase.com/mcp", "https://mcp.supabase.com/mcp"],
                     "description": "Resource indicator for MCP (Model Context Protocol) clients"
                   }
                 },
@@ -5930,10 +5930,35 @@
                       {
                         "type": "object",
                         "properties": {
+                          "kid": {
+                            "type": "string",
+                            "format": "uuid"
+                          },
+                          "use": {
+                            "type": "string",
+                            "enum": ["sig"]
+                          },
+                          "key_ops": {
+                            "type": "array",
+                            "items": {
+                              "type": "string",
+                              "enum": ["sign", "verify"]
+                            },
+                            "minItems": 2,
+                            "maxItems": 2
+                          },
+                          "ext": {
+                            "type": "boolean",
+                            "enum": [true]
+                          },
                           "kty": {
                             "type": "string",
                             "enum": ["RSA"]
                           },
+                          "alg": {
+                            "type": "string",
+                            "enum": ["RS256"]
+                          },
                           "n": {
                             "type": "string"
                           },
@@ -5966,10 +5991,35 @@
                       {
                         "type": "object",
                         "properties": {
+                          "kid": {
+                            "type": "string",
+                            "format": "uuid"
+                          },
+                          "use": {
+                            "type": "string",
+                            "enum": ["sig"]
+                          },
+                          "key_ops": {
+                            "type": "array",
+                            "items": {
+                              "type": "string",
+                              "enum": ["sign", "verify"]
+                            },
+                            "minItems": 2,
+                            "maxItems": 2
+                          },
+                          "ext": {
+                            "type": "boolean",
+                            "enum": [true]
+                          },
                           "kty": {
                             "type": "string",
                             "enum": ["EC"]
                           },
+                          "alg": {
+                            "type": "string",
+                            "enum": ["ES256"]
+                          },
                           "crv": {
                             "type": "string",
                             "enum": ["P-256"]
@@ -5990,10 +6040,35 @@
                       {
                         "type": "object",
                         "properties": {
+                          "kid": {
+                            "type": "string",
+                            "format": "uuid"
+                          },
+                          "use": {
+                            "type": "string",
+                            "enum": ["sig"]
+                          },
+                          "key_ops": {
+                            "type": "array",
+                            "items": {
+                              "type": "string",
+                              "enum": ["sign", "verify"]
+                            },
+                            "minItems": 2,
+                            "maxItems": 2
+                          },
+                          "ext": {
+                            "type": "boolean",
+                            "enum": [true]
+                          },
                           "kty": {
                             "type": "string",
                             "enum": ["OKP"]
                           },
+                          "alg": {
+                            "type": "string",
+                            "enum": ["EdDSA"]
+                          },
                           "crv": {
                             "type": "string",
                             "enum": ["Ed25519"]
@@ -6011,10 +6086,35 @@
                       {
                         "type": "object",
                         "properties": {
+                          "kid": {
+                            "type": "string",
+                            "format": "uuid"
+                          },
+                          "use": {
+                            "type": "string",
+                            "enum": ["sig"]
+                          },
+                          "key_ops": {
+                            "type": "array",
+                            "items": {
+                              "type": "string",
+                              "enum": ["sign", "verify"]
+                            },
+                            "minItems": 2,
+                            "maxItems": 2
+                          },
+                          "ext": {
+                            "type": "boolean",
+                            "enum": [true]
+                          },
                           "kty": {
                             "type": "string",
                             "enum": ["oct"]
                           },
+                          "alg": {
+                            "type": "string",
+                            "enum": ["HS256"]
+                          },
                           "k": {
                             "type": "string",
                             "minLength": 16
@@ -15906,7 +16006,7 @@
           },
           "resource": {
             "type": "string",
-            "enum": ["https://api.supabase.io/mcp"],
+            "enum": ["https://api.supabase.com/mcp", "https://mcp.supabase.com/mcp"],
             "description": "Resource indicator for MCP (Model Context Protocol) clients"
           }
         },
@@ -17216,10 +17316,35 @@
               {
                 "type": "object",
                 "properties": {
+                  "kid": {
+                    "type": "string",
+                    "format": "uuid"
+                  },
+                  "use": {
+                    "type": "string",
+                    "enum": ["sig"]
+                  },
+                  "key_ops": {
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "enum": ["sign", "verify"]
+                    },
+                    "minItems": 2,
+                    "maxItems": 2
+                  },
+                  "ext": {
+                    "type": "boolean",
+                    "enum": [true]
+                  },
                   "kty": {
                     "type": "string",
                     "enum": ["RSA"]
                   },
+                  "alg": {
+                    "type": "string",
+                    "enum": ["RS256"]
+                  },
                   "n": {
                     "type": "string"
                   },
@@ -17252,10 +17377,35 @@
               {
                 "type": "object",
                 "properties": {
+                  "kid": {
+                    "type": "string",
+                    "format": "uuid"
+                  },
+                  "use": {
+                    "type": "string",
+                    "enum": ["sig"]
+                  },
+                  "key_ops": {
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "enum": ["sign", "verify"]
+                    },
+                    "minItems": 2,
+                    "maxItems": 2
+                  },
+                  "ext": {
+                    "type": "boolean",
+                    "enum": [true]
+                  },
                   "kty": {
                     "type": "string",
                     "enum": ["EC"]
                   },
+                  "alg": {
+                    "type": "string",
+                    "enum": ["ES256"]
+                  },
                   "crv": {
                     "type": "string",
                     "enum": ["P-256"]
@@ -17276,10 +17426,35 @@
               {
                 "type": "object",
                 "properties": {
+                  "kid": {
+                    "type": "string",
+                    "format": "uuid"
+                  },
+                  "use": {
+                    "type": "string",
+                    "enum": ["sig"]
+                  },
+                  "key_ops": {
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "enum": ["sign", "verify"]
+                    },
+                    "minItems": 2,
+                    "maxItems": 2
+                  },
+                  "ext": {
+                    "type": "boolean",
+                    "enum": [true]
+                  },
                   "kty": {
                     "type": "string",
                     "enum": ["OKP"]
                   },
+                  "alg": {
+                    "type": "string",
+                    "enum": ["EdDSA"]
+                  },
                   "crv": {
                     "type": "string",
                     "enum": ["Ed25519"]
@@ -17297,10 +17472,35 @@
               {
                 "type": "object",
                 "properties": {
+                  "kid": {
+                    "type": "string",
+                    "format": "uuid"
+                  },
+                  "use": {
+                    "type": "string",
+                    "enum": ["sig"]
+                  },
+                  "key_ops": {
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "enum": ["sign", "verify"]
+                    },
+                    "minItems": 2,
+                    "maxItems": 2
+                  },
+                  "ext": {
+                    "type": "boolean",
+                    "enum": [true]
+                  },
                   "kty": {
                     "type": "string",
                     "enum": ["oct"]
                   },
+                  "alg": {
+                    "type": "string",
+                    "enum": ["HS256"]
+                  },
                   "k": {
                     "type": "string",
                     "minLength": 16