diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 714c403..3844cd5 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -49,3 +49,16 @@ jobs:
           else
             npm publish -w packages/cli --provenance --access public
           fi
+      - name: Install mcp-publisher
+        run: curl -L "https://github.com/modelcontextprotocol/registry/releases/latest/download/mcp-publisher_linux_amd64.tar.gz" | tar xz mcp-publisher
+      # OIDC authenticates this repository for the io.github.aryamthecodebreaker/* namespace.
+      - name: Publish to the MCP Registry
+        run: |
+          VERSION=$(node -p "require('./packages/cli/package.json').version")
+          if curl -s "https://registry.modelcontextprotocol.io/v0/servers?search=io.github.aryamthecodebreaker/fixmap" | grep -q "\"version\": *\"${VERSION}\""; then
+            echo "MCP Registry already has ${VERSION}; skipping."
+          else
+            jq --arg v "$VERSION" '.version = $v | .packages[0].version = $v' server.json > server.tmp && mv server.tmp server.json
+            ./mcp-publisher login github-oidc
+            ./mcp-publisher publish
+          fi
diff --git a/package-lock.json b/package-lock.json
index 3bedcb8..6bef101 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8485,7 +8485,7 @@
     },
     "packages/action": {
       "name": "@fixmap/action",
-      "version": "0.4.0",
+      "version": "0.4.1",
       "license": "MIT",
       "dependencies": {
         "@aryam/fixmap-core": "0.3.1"
@@ -8493,10 +8493,10 @@
     },
     "packages/cli": {
       "name": "@aryam/fixmap",
-      "version": "0.4.0",
+      "version": "0.4.1",
       "license": "MIT",
       "dependencies": {
-        "@aryam/fixmap-core": "0.4.0",
+        "@aryam/fixmap-core": "0.4.1",
         "@modelcontextprotocol/sdk": "^1.29.0"
       },
       "bin": {
@@ -8508,7 +8508,7 @@
     },
     "packages/core": {
       "name": "@aryam/fixmap-core",
-      "version": "0.4.0",
+      "version": "0.4.1",
       "license": "MIT",
       "devDependencies": {}
     }
diff --git a/packages/action/package.json b/packages/action/package.json
index 2717b28..f60a2c2 100644
--- a/packages/action/package.json
+++ b/packages/action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fixmap/action",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "GitHub Action wrapper for FixMap pull request reports.",
   "private": true,
   "license": "MIT",
@@ -10,6 +10,6 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@aryam/fixmap-core": "0.4.0"
+    "@aryam/fixmap-core": "0.4.1"
   }
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 97ca30d..b04c828 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@aryam/fixmap",
-  "version": "0.4.0",
+  "version": "0.4.1",
+  "mcpName": "io.github.aryamthecodebreaker/fixmap",
   "description": "CLI and MCP server for mapping issues and diffs to relevant files, tests, and review risks.",
   "license": "MIT",
   "repository": {
@@ -20,7 +21,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@aryam/fixmap-core": "0.4.0",
+    "@aryam/fixmap-core": "0.4.1",
     "@modelcontextprotocol/sdk": "^1.29.0"
   },
   "engines": {
diff --git a/packages/core/package.json b/packages/core/package.json
index 9bdbd33..32ee8e3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aryam/fixmap-core",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Core repository scanner, ranker, and report renderer for FixMap.",
   "license": "MIT",
   "repository": {
diff --git a/server.json b/server.json
new file mode 100644
index 0000000..3ee6ad6
--- /dev/null
+++ b/server.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
+  "name": "io.github.aryamthecodebreaker/fixmap",
+  "description": "Deterministic repo context for coding agents: ranked files with reasons, test routes, risk notes.",
+  "repository": {
+    "url": "https://github.com/aryamthecodebreaker/FixMap",
+    "source": "github"
+  },
+  "version": "0.4.1",
+  "packages": [
+    {
+      "registryType": "npm",
+      "identifier": "@aryam/fixmap",
+      "version": "0.4.1",
+      "transport": {
+        "type": "stdio"
+      },
+      "runtimeHint": "npx",
+      "packageArguments": [
+        {
+          "type": "positional",
+          "value": "mcp"
+        }
+      ]
+    }
+  ]
+}