diff --git a/servers/stdio-context7-mcp/server.yaml b/servers/stdio-context7-mcp/server.yaml
new file mode 100644
index 00000000..759360ef
--- /dev/null
+++ b/servers/stdio-context7-mcp/server.yaml
@@ -0,0 +1,28 @@
+name: stdio-context7-mcp
+image: dolasoft/stdio-context7-mcp
+type: server
+meta:
+  category: documentation
+  tags:
+    - documentation
+    - context7
+    - api
+    - library-docs
+  about:
+    title: STDIO Context7 MCP Server
+    description: Access comprehensive library documentation through Context7 API. Get focused, up-to-date documentation for popular frameworks and libraries directly in your MCP client. Ideal for developers who need quick access to React, Next.js, TypeScript, and hundreds of other library docs.
+    icon: https://avatars.githubusercontent.com/u/198320816?s=200&v=4
+  source:
+    project: https://github.com/dolasoft/stdio_context7_mcp
+config:
+  description: Configure Context7 API access for library documentation (API key is optional but recommended for higher rate limits)
+  secrets:
+    - name: stdio-context7-mcp.context7_api_key
+      env: CONTEXT7_API_KEY
+      example: your_context7_api_key_here
+  parameters:
+    type: object
+    properties:
+      context7_api_key:
+        type: string
+        description: Optional API key for Context7 service (get from https://context7.com). If not provided, uses public access with lower rate limits.
diff --git a/servers/stdio-context7-mcp/tools.json b/servers/stdio-context7-mcp/tools.json
new file mode 100644
index 00000000..0ee7dda0
--- /dev/null
+++ b/servers/stdio-context7-mcp/tools.json
@@ -0,0 +1,34 @@
+[
+  {
+    "name": "resolve-library-id",
+    "description": "Resolves a general library name into a Context7-compatible library ID. Use this first to find the exact library identifier before fetching documentation.",
+    "arguments": [
+      {
+        "name": "libraryName",
+        "type": "string",
+        "desc": "The name of the library to search for (e.g., 'react', 'next.js', 'typescript')"
+      }
+    ]
+  },
+  {
+    "name": "get-library-docs",
+    "description": "Fetches comprehensive documentation for a library using its Context7-compatible library ID. Returns focused, relevant documentation based on optional topic filtering.",
+    "arguments": [
+      {
+        "name": "context7CompatibleLibraryID",
+        "type": "string",
+        "desc": "Exact Context7-compatible library ID (e.g., '/mongodb/docs', '/vercel/next.js')"
+      },
+      {
+        "name": "topic",
+        "type": "string",
+        "desc": "Optional: Focus the docs on a specific topic (e.g., 'routing', 'hooks', 'authentication')"
+      },
+      {
+        "name": "tokens",
+        "type": "number",
+        "desc": "Optional: Max number of tokens to return (default: 5000, min: 1000)"
+      }
+    ]
+  }
+]