diff --git a/documentation/docs/mcp/elevenlabs-mcp.md b/documentation/docs/mcp/elevenlabs-mcp.md
index 1b23890b936d..59d6ad54d43f 100644
--- a/documentation/docs/mcp/elevenlabs-mcp.md
+++ b/documentation/docs/mcp/elevenlabs-mcp.md
@@ -11,7 +11,7 @@ import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
 <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/1Z8XtjQ9El0" />
 
 
-This tutorial covers how to add the [ElevenLabs MCP Server](https://github.com/yamadashy/repomix) as a Goose extension to enable AI-powered voice generation, voice cloning, audio editing, and speech-to-text transcription.
+This tutorial covers how to add the [ElevenLabs MCP Server](https://github.com/elevenlabs/elevenlabs-mcp) as a Goose extension to enable AI-powered voice generation, voice cloning, audio editing, and speech-to-text transcription.
 
 :::tip TLDR
 <Tabs groupId="interface">
diff --git a/documentation/src/components/server-card.tsx b/documentation/src/components/server-card.tsx
index f625e751bd77..d7416e090281 100644
--- a/documentation/src/components/server-card.tsx
+++ b/documentation/src/components/server-card.tsx
@@ -85,7 +85,7 @@ export function ServerCard({ server }: { server: MCPServer }) {
                   </div>
                 )}
 
-                {!server.is_builtin && (
+                {!server.is_builtin && (server.show_install_command !== false) && (
                   <>
                   <button
                     onClick={() => setIsCommandVisible(!isCommandVisible)}
@@ -139,7 +139,7 @@ export function ServerCard({ server }: { server: MCPServer }) {
                   >
                     Built-in
                   </div>
-                ) : (
+                ) : server.show_install_link !== false ? (
                   <a
                     href={getGooseInstallLink(server)}
                     target="_blank"
@@ -149,7 +149,7 @@ export function ServerCard({ server }: { server: MCPServer }) {
                     <span>Install</span>
                     <Download className="h-4 w-4" />
                   </a>
-                )}
+                ) : null}
               </div>
             </div>
           </div>
diff --git a/documentation/src/pages/extensions/detail.tsx b/documentation/src/pages/extensions/detail.tsx
index 734be4d947de..3378dd4c02b5 100644
--- a/documentation/src/pages/extensions/detail.tsx
+++ b/documentation/src/pages/extensions/detail.tsx
@@ -103,7 +103,7 @@ const getDocumentationPath = (serverId: string): string => {
                            Can be enabled on the Extensions page in Goose
                         </span>
                       </div>
-                    ) : (
+                    ) : server.show_install_command !== false ? (
                       <>
                         <div className="flex items-center gap-2 text-textStandard">
                           <Terminal className="h-4 w-4" />
@@ -129,7 +129,7 @@ const getDocumentationPath = (serverId: string): string => {
                           )}
                         </div>
                       </>
-                    )}
+                    ) : null}
                   </div>
 
                   {server.environmentVariables && (
@@ -215,7 +215,7 @@ const getDocumentationPath = (serverId: string): string => {
                       >
                         Built-in
                       </div>
-                    ) : (
+                    ) : server.show_install_link !== false ? (
                       <a
                         href={getGooseInstallLink(server)}
                         target="_blank"
@@ -225,7 +225,7 @@ const getDocumentationPath = (serverId: string): string => {
                         <span>Install</span>
                         <Download className="h-4 w-4" />
                       </a>
-                    )}
+                    ) : null}
                   </div>
                 </div>
               </div>
diff --git a/documentation/src/types/server.ts b/documentation/src/types/server.ts
index 068944bc6855..aadb4559a783 100644
--- a/documentation/src/types/server.ts
+++ b/documentation/src/types/server.ts
@@ -9,6 +9,8 @@ export interface MCPServer {
   installation_notes: string;
   is_builtin: boolean;
   endorsed: boolean;
+  show_install_link?: boolean;
+  show_install_command?: boolean;
   environmentVariables: {
     name: string;
     description: string;
diff --git a/documentation/static/servers.json b/documentation/static/servers.json
index 693619536fed..0a1e3545409c 100644
--- a/documentation/static/servers.json
+++ b/documentation/static/servers.json
@@ -20,15 +20,15 @@
     "id": "alby-mcp",
     "name": "Alby",
     "description": "Bitcoin Lightning Network integration",
-    "command": "npx -y @getalby/alby-mcp-server",
+    "command": "npx -y @getalby/mcp",
     "link": "https://github.com/getalby/mcp",
     "installation_notes": "Install using npx package manager.",
     "is_builtin": false,
     "endorsed": false,
     "environmentVariables": [
       {
-        "name": "ALBY_API_TOKEN",
-        "description": "Required environment variable",
+        "name": "NWC_CONNECTION_STRING",
+        "description": "NWC connection secret from your lightning wallet",
         "required": true
       }
     ]
@@ -77,7 +77,7 @@
     "name": "Brave Search",
     "description": "Web search capabilities powered by Brave",
     "command": "npx -y @brave/brave-search-mcp",
-    "link": "https://github.com/brave/brave-search-mcp",
+    "link": "https://github.com/brave/brave-search-mcp-server",
     "installation_notes": "Install using npx package manager.",
     "is_builtin": false,
     "endorsed": true,
@@ -217,7 +217,7 @@
     "environmentVariables": []
   },
   {
-    "id": "dev-to",
+    "id": "dev.to",
     "name": "Dev.to",
     "description": "Access Dev.to articles and content (requires local server setup)",
     "url": "http://localhost:3000/mcp",
@@ -232,9 +232,9 @@
     "id": "elevenlabs-mcp",
     "name": "ElevenLabs",
     "description": "Text-to-speech and voice synthesis",
-    "command": "npx -y elevenlabs-mcp",
+    "command": "uvx elevenlabs-mcp",
     "link": "https://github.com/elevenlabs/elevenlabs-mcp",
-    "installation_notes": "Install using npx package manager.",
+    "installation_notes": "Install using uvx package manager.",
     "is_builtin": false,
     "endorsed": true,
     "environmentVariables": [
@@ -269,12 +269,12 @@
     "environmentVariables": []
   },
   {
-    "id": "filesystem-mcp",
+    "id": "filesystem",
     "name": "Filesystem",
     "description": "File system operations and management",
-    "command": "uvx mcp-server-filesystem",
+    "command": "npx -y @modelcontextprotocol/server-filesystem /path/to/dir1 /path/to/dir2",
     "link": "https://github.com/modelcontextprotocol/servers",
-    "installation_notes": "Install using uvx package manager.",
+    "installation_notes": "Install using npx package manager.",
     "is_builtin": false,
     "endorsed": true,
     "environmentVariables": []
@@ -446,7 +446,7 @@
     "id": "netlify-mcp",
     "name": "Netlify",
     "description": "Web deployment and hosting automation",
-    "command": "npx -y netlify-mcp",
+    "command": "npx -y @netlify/mcp",
     "link": "https://github.com/netlify/netlify-mcp",
     "installation_notes": "Install using npx package manager.",
     "is_builtin": false,
@@ -463,8 +463,8 @@
     "id": "nostrbook-mcp",
     "name": "NostrBook",
     "description": "Nostr protocol integration for decentralized social",
-    "command": "npx -y nostrbook-mcp",
-    "link": "https://github.com/nostrbook/nostrbook-mcp",
+    "command": "npx -y @nostrbook/mcp@latest",
+    "link": "https://gitlab.com/soapbox-pub/nostrbook",
     "installation_notes": "Install using npx package manager.",
     "is_builtin": false,
     "endorsed": false,
@@ -644,7 +644,7 @@
     "description": "Web search capabilities powered by Tavily",
     "command": "npx -y tavily-mcp",
     "link": "https://github.com/tavily-ai/tavily-mcp",
-    "installation_notes": "Install using uvx package manager. Requires Tavily API key.",
+    "installation_notes": "Install using npx package manager. Requires Tavily API key.",
     "is_builtin": false,
     "endorsed": true,
     "environmentVariables": [
@@ -683,7 +683,7 @@
     "description": "YouTube video transcript extraction",
     "command": "uvx --from git+https://github.com/jkawamoto/mcp-youtube-transcript mcp-youtube-transcript",
     "link": "https://github.com/jkawamoto/mcp-youtube-transcript",
-    "installation_notes": "Install using uv package manager.",
+    "installation_notes": "Install using uvx package manager.",
     "is_builtin": false,
     "endorsed": false,
     "environmentVariables": []