diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 00000000000..868d6820404
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,14 @@
+{
+  "name": "sim",
+  "description": "Plugins for Sim, the open-source AI workspace.",
+  "owner": {
+    "name": "Sim",
+    "url": "https://www.sim.ai"
+  },
+  "plugins": [
+    {
+      "name": "sim",
+      "source": "./plugins/sim"
+    }
+  ]
+}
diff --git a/README.md b/README.md
index a0e9402a5f0..4ca3af46cd4 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,16 @@ macOS 12+, Apple Silicon and Intel. See the [desktop docs](https://docs.sim.ai/d
   </tr>
 </table>
 
+## MCP server
+
+Connect Claude, Claude Code, Codex, or any MCP client to Sim Cloud at `https://mcp.sim.ai/mcp`. Your agent can manage workspaces, run and deploy workflows, and work with tables, knowledge bases, files, and logs. Sign in with OAuth or use an API key.
+
+- **Claude Code:** `claude mcp add --transport http sim https://mcp.sim.ai/mcp`, then open `/mcp` to sign in
+- **Claude:** add `https://mcp.sim.ai/mcp` as a custom connector under **Customize → Connectors**
+- **Codex:** `codex mcp add sim --url https://mcp.sim.ai/mcp`
+
+See the [MCP docs](https://docs.sim.ai/mcp/overview) for other clients and for self-hosted URLs.
+
 ## Self-hosting
 
 **Requirements:** [Node.js 20+](https://nodejs.org/) and [Docker](https://www.docker.com/).
diff --git a/apps/sim/lib/api/mcp/server.ts b/apps/sim/lib/api/mcp/server.ts
index 380d3144693..dbcd2a481aa 100644
--- a/apps/sim/lib/api/mcp/server.ts
+++ b/apps/sim/lib/api/mcp/server.ts
@@ -121,16 +121,16 @@ export function createSimMcpServer(context: Omit<McpDispatchContext, 'signal'>):
       description: DESCRIPTION,
       websiteUrl: `${SIM_DOCS_URL}/mcp/overview`,
       icons: [
-        {
-          src: `${baseUrl}/brandbook/icon/green.svg`,
-          mimeType: 'image/svg+xml',
-          sizes: ['any'],
-        },
         {
           src: `${baseUrl}/favicon/android-chrome-512x512.png`,
           mimeType: 'image/png',
           sizes: ['512x512'],
         },
+        {
+          src: `${baseUrl}/favicon/android-chrome-192x192.png`,
+          mimeType: 'image/png',
+          sizes: ['192x192'],
+        },
       ],
     },
     { instructions: INSTRUCTIONS }
diff --git a/plugins/sim/.claude-plugin/plugin.json b/plugins/sim/.claude-plugin/plugin.json
new file mode 100644
index 00000000000..c06b774b4f5
--- /dev/null
+++ b/plugins/sim/.claude-plugin/plugin.json
@@ -0,0 +1,21 @@
+{
+  "name": "sim",
+  "displayName": "Sim",
+  "version": "1.0.0",
+  "description": "Connect to Sim, the open-source AI workspace, to build, deploy, and manage AI agents: run workflows and work with tables, knowledge bases, files, and logs.",
+  "author": {
+    "name": "Sim",
+    "url": "https://www.sim.ai"
+  },
+  "homepage": "https://docs.sim.ai/mcp/overview",
+  "repository": "https://github.com/simstudioai/sim",
+  "license": "Apache-2.0",
+  "keywords": ["mcp", "ai-agents", "workflows"],
+  "icon": "./assets/logo.png",
+  "mcpServers": {
+    "sim": {
+      "type": "http",
+      "url": "https://mcp.sim.ai/mcp"
+    }
+  }
+}
diff --git a/plugins/sim/README.md b/plugins/sim/README.md
new file mode 100644
index 00000000000..bf57dda86f9
--- /dev/null
+++ b/plugins/sim/README.md
@@ -0,0 +1,16 @@
+# Sim plugin
+
+Connects Claude Code to Sim, the open-source AI workspace where teams build, deploy, and manage AI agents. The plugin adds Sim's hosted MCP server, `https://mcp.sim.ai/mcp`, so your agent can manage workspaces, run and deploy workflows, and work with tables, knowledge bases, files, and logs.
+
+## Install
+
+```bash
+claude plugin marketplace add simstudioai/sim --sparse .claude-plugin plugins
+claude plugin install sim@sim
+```
+
+Then open `/mcp` in Claude Code and sign in to Sim in the browser. Access follows your Sim account and workspace roles.
+
+## Self-hosted Sim
+
+This plugin connects to Sim Cloud. For a self-hosted deployment, add your own server URL instead, as described in the [MCP docs](https://docs.sim.ai/mcp/overview).
diff --git a/plugins/sim/assets/logo.png b/plugins/sim/assets/logo.png
new file mode 100644
index 00000000000..70db080feed
Binary files /dev/null and b/plugins/sim/assets/logo.png differ
diff --git a/server.json b/server.json
new file mode 100644
index 00000000000..42e348af6cf
--- /dev/null
+++ b/server.json
@@ -0,0 +1,30 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
+  "name": "ai.sim/sim",
+  "title": "Sim",
+  "description": "Build, deploy, and manage AI agents in Sim: workflows, tables, knowledge bases, files, and logs.",
+  "version": "1.0.0",
+  "websiteUrl": "https://docs.sim.ai/mcp/overview",
+  "repository": {
+    "url": "https://github.com/simstudioai/sim",
+    "source": "github"
+  },
+  "icons": [
+    {
+      "src": "https://www.sim.ai/favicon/android-chrome-512x512.png",
+      "mimeType": "image/png",
+      "sizes": ["512x512"]
+    },
+    {
+      "src": "https://www.sim.ai/favicon/android-chrome-192x192.png",
+      "mimeType": "image/png",
+      "sizes": ["192x192"]
+    }
+  ],
+  "remotes": [
+    {
+      "type": "streamable-http",
+      "url": "https://mcp.sim.ai/mcp"
+    }
+  ]
+}