diff --git a/plugins/build-web-apps/.app.json b/plugins/build-web-apps/.app.json
new file mode 100644
index 00000000..ceeb10a7
--- /dev/null
+++ b/plugins/build-web-apps/.app.json
@@ -0,0 +1,10 @@
+{
+  "apps": {
+    "stripe": {
+      "id": "connector_690ab09fa43c8191bca40280e4563238"
+    },
+    "vercel": {
+      "id": "connector_690a90ec05c881918afb6a55dc9bbaa1"
+    }
+  }
+}
diff --git a/plugins/build-web-apps/.codex-plugin/plugin.json b/plugins/build-web-apps/.codex-plugin/plugin.json
index 63d43574..53572321 100644
--- a/plugins/build-web-apps/.codex-plugin/plugin.json
+++ b/plugins/build-web-apps/.codex-plugin/plugin.json
@@ -22,11 +22,11 @@
     "ui-review"
   ],
   "skills": "./skills/",
-  "mcpServers": "./.mcp.json",
+  "apps": "./.app.json",
   "interface": {
     "displayName": "Build Web Apps",
     "shortDescription": "Build, review, ship, and scale web apps across UI, React, deployment, payments, and databases",
-    "longDescription": "Use Build Web Apps to review and improve a web app's UI, apply React and Next.js guidance, deploy projects to Vercel, wire up Stripe payments, and design or tune Supabase/Postgres schemas and queries, all with plugin-local Vercel, Stripe, and Supabase MCP support.",
+    "longDescription": "Use Build Web Apps to review and improve a web app's UI, apply React and Next.js guidance, deploy projects to Vercel, wire up Stripe payments, and design or tune Postgres schemas and queries, with connected Vercel and Stripe apps plus bundled database guidance.",
     "developerName": "OpenAI",
     "category": "Coding",
     "capabilities": [
diff --git a/plugins/build-web-apps/.mcp.json b/plugins/build-web-apps/.mcp.json
deleted file mode 100644
index d37cfc98..00000000
--- a/plugins/build-web-apps/.mcp.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "mcpServers": {
-    "stripe": {
-      "type": "http",
-      "url": "https://mcp.stripe.com"
-    },
-    "vercel": {
-      "type": "http",
-      "url": "https://mcp.vercel.com"
-    },
-    "supabase": {
-      "type": "http",
-      "url": "https://mcp.supabase.com/mcp"
-    }
-  }
-}
diff --git a/plugins/build-web-apps/README.md b/plugins/build-web-apps/README.md
index fb2b564a..5c59210e 100644
--- a/plugins/build-web-apps/README.md
+++ b/plugins/build-web-apps/README.md
@@ -11,15 +11,14 @@ It currently includes these skills:
 - `supabase-best-practices`
 - `web-design-guidelines`
 
-It is scaffolded to use these plugin-local MCP servers:
+It is scaffolded to use these connected apps:
 
 - `stripe`
 - `vercel`
-- `supabase`
 
 ## What It Covers
 
-- deployment and hosting operations through Vercel MCP
+- deployment and hosting operations through the Vercel app
 - React and Next.js performance guidance sourced from Vercel best practices
 - shadcn/ui composition, styling, and component usage guidance
 - Stripe integration design across payments, subscriptions, Connect, and Treasury
@@ -40,10 +39,10 @@ with this shape:
   - required plugin manifest
   - defines plugin metadata and points Codex at the plugin contents
 
-- `.mcp.json`
-  - plugin-local MCP dependency manifest
-  - bundles the Stripe, Vercel, and Supabase MCP endpoints used by bundled
-    skills
+- `.app.json`
+  - plugin-local app dependency manifest
+  - points Codex at the connected Stripe and Vercel apps used by the bundled
+    workflows
 
 - `agents/`
   - plugin-level agent metadata
@@ -55,11 +54,10 @@ with this shape:
 
 ## Notes
 
-This plugin is MCP-backed through `.mcp.json` and currently combines:
+This plugin is app-backed through `.app.json` and currently combines:
 
 - Vercel deployment workflows
 - React and Next.js optimization guidance
 - shadcn/ui frontend implementation guidance
 - Stripe integration guidance
-- Supabase/Postgres optimization guidance
 - web design and UI review guidance
diff --git a/plugins/build-web-apps/agents/openai.yaml b/plugins/build-web-apps/agents/openai.yaml
index 0df9130d..f692536b 100644
--- a/plugins/build-web-apps/agents/openai.yaml
+++ b/plugins/build-web-apps/agents/openai.yaml
@@ -7,18 +7,9 @@ interface:
 
 dependencies:
   tools:
-    - type: "mcp"
+    - type: "app"
       value: "stripe"
-      description: "Stripe MCP server"
-      transport: "streamable_http"
-      url: "https://mcp.stripe.com"
-    - type: "mcp"
+      description: "Connected Stripe app"
+    - type: "app"
       value: "vercel"
-      description: "Vercel MCP server"
-      transport: "streamable_http"
-      url: "https://mcp.vercel.com"
-    - type: "mcp"
-      value: "supabase"
-      description: "Supabase MCP server"
-      transport: "streamable_http"
-      url: "https://mcp.supabase.com/mcp"
+      description: "Connected Vercel app"
diff --git a/plugins/hugging-face/.codex-plugin/plugin.json b/plugins/hugging-face/.codex-plugin/plugin.json
index ea68f212..575dc9d4 100644
--- a/plugins/hugging-face/.codex-plugin/plugin.json
+++ b/plugins/hugging-face/.codex-plugin/plugin.json
@@ -18,7 +18,6 @@
   ],
   "skills": "./skills/",
   "apps": "./.app.json",
-  "mcpServers": "./.mcp.json",
   "interface": {
     "displayName": "Hugging Face",
     "shortDescription": "Inspect models, datasets, Spaces, and research",
diff --git a/plugins/hugging-face/.mcp.json b/plugins/hugging-face/.mcp.json
deleted file mode 100644
index 5689a334..00000000
--- a/plugins/hugging-face/.mcp.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "mcpServers": {
-      "hf-mcp-server": {
-        "type": "http",
-        "url": "https://huggingface.co/mcp?login"
-      }
-    }
-}
\ No newline at end of file
diff --git a/plugins/vercel/.app.json b/plugins/vercel/.app.json
new file mode 100644
index 00000000..8ea56772
--- /dev/null
+++ b/plugins/vercel/.app.json
@@ -0,0 +1,7 @@
+{
+  "apps": {
+    "vercel": {
+      "id": "connector_690a90ec05c881918afb6a55dc9bbaa1"
+    }
+  }
+}
diff --git a/plugins/vercel/.codex-plugin/plugin.json b/plugins/vercel/.codex-plugin/plugin.json
index 01a1c0ce..b07f14ab 100644
--- a/plugins/vercel/.codex-plugin/plugin.json
+++ b/plugins/vercel/.codex-plugin/plugin.json
@@ -26,11 +26,11 @@
     "discord-bot"
   ],
   "skills": "./skills/",
-  "mcpServers": "./.mcp.json",
+  "apps": "./.app.json",
   "interface": {
     "displayName": "Vercel",
     "shortDescription": "Build and deploy web apps and agents",
-    "longDescription": "Bring Vercel ecosystem guidance into Codex with curated skills and the official Vercel MCP server. Packages the upstream vercel/vercel-plugin skills, agents, and commands under the local `vercel` plugin identity for the Codex plugin marketplace.",
+    "longDescription": "Bring Vercel ecosystem guidance into Codex with curated skills and the connected Vercel app. Packages the upstream vercel/vercel-plugin skills, agents, and commands under the local `vercel` plugin identity for the Codex plugin marketplace.",
     "developerName": "Vercel Labs",
     "category": "Coding",
     "capabilities": ["Interactive", "Write"],
@@ -40,7 +40,7 @@
     "defaultPrompt": [
       "Audit this repo for Vercel deployment risks",
       "Which Vercel tools fit this app best",
-      "Help wire Vercel MCP into this workflow"
+      "Help wire the Vercel app into this workflow"
     ],
     "composerIcon": "./assets/app-icon.png",
     "logo": "./assets/app-icon.png",
diff --git a/plugins/vercel/.mcp.json b/plugins/vercel/.mcp.json
deleted file mode 100644
index ec5db6cf..00000000
--- a/plugins/vercel/.mcp.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "mcpServers": {
-    "vercel": {
-      "type": "http",
-      "url": "https://mcp.vercel.com",
-      "note": "Official Vercel MCP server. Uses OAuth — on first connection the agent will be prompted to authorize via Vercel. Read-only in initial release: search docs, list projects/deployments, inspect logs."
-    }
-  }
-}
diff --git a/plugins/vercel/README.md b/plugins/vercel/README.md
index a08588b2..eb7f3e2e 100644
--- a/plugins/vercel/README.md
+++ b/plugins/vercel/README.md
@@ -5,7 +5,7 @@ This directory packages the upstream [vercel/vercel-plugin](https://github.com/v
 ## What is included
 
 - `skills/` from the upstream plugin (47 skills with retrieval metadata for Codex discovery)
-- `.mcp.json` for the official Vercel MCP server
+- `.app.json` for the connected Vercel app
 - `vercel.md` ecosystem reference graph
 - `agents/` specialist agent definitions
 - `commands/` slash command definitions
@@ -62,7 +62,7 @@ A text-form relational graph covering:
 | `turborepo` | Monorepo orchestration, caching, remote caching, --affected, pruned subsets |
 | `v0-dev` | AI code generation, agentic intelligence, GitHub integration |
 | `vercel-agent` | AI-powered code review, incident investigation, SDK installation, PR analysis |
-| `vercel-api` | Vercel MCP Server and REST API — projects, deployments, env vars, domains, logs |
+| `vercel-api` | Connected Vercel app and REST API guidance — projects, deployments, env vars, domains, logs |
 | `vercel-cli` | All CLI commands — deploy, env, dev, domains, cache management, MCP integration, marketplace |
 | `vercel-firewall` | DDoS, WAF, rate limiting, bot filter, custom rules |
 | `vercel-flags` | Feature flags, Flags Explorer, gradual rollouts, A/B testing, provider adapters |
@@ -105,6 +105,7 @@ After installing, skills are discovered automatically via Codex's metadata-based
 ```text
 vercel/
 ├── .codex-plugin/plugin.json       # Plugin manifest
+├── .app.json                        # Connected Vercel app manifest
 ├── vercel.md                        # Ecosystem graph + conventions
 ├── skills/                          # 47 skills discovered via SKILL.md metadata
 │   ├── agent-browser/
diff --git a/plugins/vercel/skills/vercel-api/SKILL.md b/plugins/vercel/skills/vercel-api/SKILL.md
index eb53d972..e95b19ab 100644
--- a/plugins/vercel/skills/vercel-api/SKILL.md
+++ b/plugins/vercel/skills/vercel-api/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: vercel-api
-description: Vercel MCP and REST API expert guidance. Use when the agent needs live access to Vercel projects, deployments, environment variables, domains, logs, or documentation through the MCP server or REST API.
+description: Vercel app and REST API expert guidance. Use when the agent needs live access to Vercel projects, deployments, environment variables, domains, logs, or documentation through the connected Vercel app or REST API.
 metadata:
   priority: 7
   docs:
@@ -44,13 +44,13 @@ chainTo:
 
 ---
 
-# Vercel API — MCP Server & REST API
+# Vercel API — Connected App & REST API
 
-You are an expert in the Vercel platform APIs. This plugin bundles a connection to the **official Vercel MCP server** (`https://mcp.vercel.com`) which gives agents live, authenticated access to Vercel resources.
+You are an expert in the Vercel platform APIs. This plugin uses the connected Vercel app for live, authenticated access to Vercel resources, and this skill also covers the direct REST API when connector coverage is not enough.
 
-## MCP Server (Public Beta)
+## Connected Vercel App
 
-The plugin's `.mcp.json` configures the official Vercel MCP server using Streamable HTTP transport with OAuth authentication. The MCP server is in **public beta** — read-only in the initial release. Write operations are on the roadmap. Supported clients: Codex, Cursor, and VS Code.
+The plugin's `.app.json` points Codex at the connected Vercel app. The linked Vercel documentation still describes the underlying MCP server and REST API, and this skill uses that documentation where it helps explain capabilities and fallback paths.
 
 ### Connection
 
@@ -64,7 +64,7 @@ On first connection the agent will open a browser-based OAuth flow to grant read
 
 ### Available MCP Tools
 
-The Vercel MCP server exposes these tool categories (read-only in initial release):
+The connected Vercel app exposes these tool categories:
 
 | Category | Capabilities |
 |----------|-------------|