diff --git a/README.md b/README.md
index 916e2d5d..44ec1ac3 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ A growing set of community-developed and maintained servers demonstrates various
 - **[Pinecone](https://github.com/sirmews/mcp-pinecone)** - MCP server for searching and uploading records to Pinecone. Allows for simple RAG features, leveraging Pinecone's Inference API.
 - **[HuggingFace Spaces](https://github.com/evalstate/mcp-hfspace)** - Server for using HuggingFace Spaces, supporting Open Source Image, Audio, Text Models and more. Claude Desktop mode for easy integration.
 - **[ChatSum](https://github.com/chatmcp/mcp-server-chatsum)** - Query and Summarize chat messages with LLM. by [mcpso](https://mcp.so)
-- **[Rememberizer AI](https://github.com/skydeckai/mcp-server-rememberizer)** - An MCP server designed for interacting with the Rememberizer data source, facilitating enhanced knowledge retrieval.
+- **[Rememberizer AI](https://github.com/skydeckmcp/server-rememberizer)** - An MCP server designed for interacting with the Rememberizer data source, facilitating enhanced knowledge retrieval.
 - **[FlightRadar24](https://github.com/sunsetcoder/flightradar24-mcp-server)** - A Claude Desktop MCP server that helps you track flights in real-time using Flightradar24 data.
 - **[X (Twitter)](https://github.com/vidhupv/x-mcp)** (by vidhupv) - Create, manage and publish X/Twitter posts directly through Claude chat.
 - **[X (Twitter)](https://github.com/EnesCinr/twitter-mcp)** (by EnesCinr) - Interact with twitter API. Post tweets and search for tweets by query.
@@ -118,7 +118,7 @@ Additional resources on MCP.
 - **[mcp-cli](https://github.com/wong2/mcp-cli)** - A CLI inspector for the Model Context Protocol by **[wong2](https://github.com/wong2)**
 - **[r/mcp](https://www.reddit.com/r/mcp)** – A Reddit community dedicated to MCP by **[Frank Fiegel](https://github.com/punkpeye)**
 - **[MCP X Community](https://x.com/i/communities/1861891349609603310)** – A X community for MCP by **[Xiaoyi](https://x.com/chxy)**
-- **[mcp-manager](https://github.com/zueai/mcp-manager)** - Simple Web UI to install and manage MCP servers for Claude Desktop by **[Zue](https://github.com/zueai)**
+- **[mcp-manager](https://github.com/zuemcp/manager)** - Simple Web UI to install and manage MCP servers for Claude Desktop by **[Zue](https://github.com/zueai)**
 - **[MCPHub](https://github.com/Jeamee/MCPHub-Desktop)** – An Open Source MacOS & Windows GUI Desktop app for discovering, installing and managing MCP servers by **[Jeamee](https://github.com/jeamee)**
 
 ## 🚀 Getting Started
diff --git a/src/aws-kb-retrieval-server/README.md b/src/aws-kb-retrieval-server/README.md
index 84855568..bcd9fc2f 100644
--- a/src/aws-kb-retrieval-server/README.md
+++ b/src/aws-kb-retrieval-server/README.md
@@ -34,7 +34,7 @@ Add this to your `claude_desktop_config.json`:
   "mcpServers": {
     "aws-kb-retrieval": {
       "command": "docker",
-      "args": [ "run", "-i", "--rm", "-e", "AWS_ACCESS_KEY_ID", "-e", "AWS_SECRET_ACCESS_KEY", "-e", "AWS_REGION", "ai/mcp-aws-kb-retrieval-server" ],
+      "args": [ "run", "-i", "--rm", "-e", "AWS_ACCESS_KEY_ID", "-e", "AWS_SECRET_ACCESS_KEY", "-e", "AWS_REGION", "mcp/aws-kb-retrieval-server" ],
       "env": {
         "AWS_ACCESS_KEY_ID": "YOUR_ACCESS_KEY_HERE",
         "AWS_SECRET_ACCESS_KEY": "YOUR_SECRET_ACCESS_KEY_HERE",
@@ -69,7 +69,7 @@ Add this to your `claude_desktop_config.json`:
 Docker: 
 
 ```sh
-docker build -t ai/mcp-aws-kb-retrieval -f src/aws-kb-retrieval-server/Dockerfile . 
+docker build -t mcp/aws-kb-retrieval -f src/aws-kb-retrieval-server/Dockerfile . 
 ```
 
 ## License
diff --git a/src/brave-search/README.md b/src/brave-search/README.md
index 1907fc9c..a7c1b47c 100644
--- a/src/brave-search/README.md
+++ b/src/brave-search/README.md
@@ -49,7 +49,7 @@ Add this to your `claude_desktop_config.json`:
         "--rm",
         "-e",
         "BRAVE_API_KEY",
-        "ai/mcp-brave-search"
+        "mcp/brave-search"
       ],
       "env": {
         "BRAVE_API_KEY": "YOUR_API_KEY_HERE"
diff --git a/src/everart/README.md b/src/everart/README.md
index 94c0e33b..bccd5942 100644
--- a/src/everart/README.md
+++ b/src/everart/README.md
@@ -17,7 +17,7 @@ Add to Claude Desktop config:
   "mcpServers": {
     "everart": {
       "command": "docker",
-      "args": ["run", "-i", "--rm", "-e", "EVERART_API_KEY", "ai/mcp-everart"],
+      "args": ["run", "-i", "--rm", "-e", "EVERART_API_KEY", "mcp/everart"],
     "env": {
       "EVERART_API_KEY": "your_key_here"
     }
@@ -94,5 +94,5 @@ You can also click the URL above to view the image again.
 ## Building w/ Docker
 
 ```sh
-docker build -t ai/mcp-everart -f src/everart/Dockerfile . 
+docker build -t mcp/everart -f src/everart/Dockerfile . 
 ```
diff --git a/src/filesystem/README.md b/src/filesystem/README.md
index 50d8c347..05c915ad 100644
--- a/src/filesystem/README.md
+++ b/src/filesystem/README.md
@@ -123,7 +123,7 @@ Note: all directories must be mounted to `/projects` by default.
         "--mount", "type=bind,src=/Users/username/Desktop,dst=/projects/Desktop",
         "--mount", "type=bind,src=/path/to/other/allowed/dir,dst=/projects/other/allowed/dir,ro",
         "--mount", "type=bind,src=/path/to/file.txt,dst=/projects/path/to/file.txt",
-        "ai/mcp-filesystem",
+        "mcp/filesystem",
         "/projects",
       ]
     }
@@ -154,7 +154,7 @@ Note: all directories must be mounted to `/projects` by default.
 Docker build:
 
 ```bash
-docker build -t ai/mcp-filesystem -f src/filesystem/Dockerfile .
+docker build -t mcp/filesystem -f src/filesystem/Dockerfile .
 ```
 
 ## License
diff --git a/src/gdrive/README.md b/src/gdrive/README.md
index 1ef88b67..56e8cfbe 100644
--- a/src/gdrive/README.md
+++ b/src/gdrive/README.md
@@ -56,7 +56,7 @@ To integrate this server with the desktop app, add the following to your app's s
   "mcpServers": {
     "gdrive": {
       "command": "docker",
-      "args": ["run", "-i", "--rm", "--mount", "type=bind,source=/Users/colinmcneil/Desktop/gcp-oauth.keys.json,target=/gcp-oauth.keys.json", "-v", "mcp-gdrive:/gdrive-server", "-e", "GDRIVE_OAUTH_PATH=/gcp-oauth.keys.json", "-e", "GDRIVE_CREDENTIALS_PATH=/gdrive-server/credentials.json", "ai/mcp-gdrive"]
+      "args": ["run", "-i", "--rm", "--mount", "type=bind,source=/Users/colinmcneil/Desktop/gcp-oauth.keys.json,target=/gcp-oauth.keys.json", "-v", "mcp-gdrive:/gdrive-server", "-e", "GDRIVE_OAUTH_PATH=/gcp-oauth.keys.json", "-e", "GDRIVE_CREDENTIALS_PATH=/gdrive-server/credentials.json", "mcp/gdrive"]
     }
   }
 }
diff --git a/src/git/README.md b/src/git/README.md
index 9a62081b..06664022 100644
--- a/src/git/README.md
+++ b/src/git/README.md
@@ -201,7 +201,7 @@ If you are doing local development, there are two ways to test your changes:
         "--mount", "type=bind,src=/Users/username/Desktop,dst=/projects/Desktop",
         "--mount", "type=bind,src=/path/to/other/allowed/dir,dst=/projects/other/allowed/dir,ro",
         "--mount", "type=bind,src=/path/to/file.txt,dst=/projects/path/to/file.txt",
-        "ai/mcp-git"
+        "mcp/git"
       ]
     }
   }
@@ -230,7 +230,7 @@ Docker build:
 
 ```bash
 cd src/git
-docker build -t ai/mcp-git .
+docker build -t mcp/git .
 ```
 
 ## License
diff --git a/src/github/README.md b/src/github/README.md
index a63e803b..14bab491 100644
--- a/src/github/README.md
+++ b/src/github/README.md
@@ -237,7 +237,7 @@ To use this with Claude Desktop, add the following to your `claude_desktop_confi
         "--rm",
         "-e",
         "GITHUB_PERSONAL_ACCESS_TOKEN",
-        "ai/mcp-github"
+        "mcp/github"
       ],
       "env": {
         "GITHUB_PERSONAL_ACCESS_TOKEN": "<YOUR_TOKEN>"
@@ -271,7 +271,7 @@ To use this with Claude Desktop, add the following to your `claude_desktop_confi
 Docker build:
 
 ```bash
-docker build -t ai/mcp-github -f src/github/Dockerfile .
+docker build -t mcp/github -f src/github/Dockerfile .
 ```
 
 ## License
diff --git a/src/gitlab/README.md b/src/gitlab/README.md
index d2dff023..e2b16fe1 100644
--- a/src/gitlab/README.md
+++ b/src/gitlab/README.md
@@ -121,7 +121,7 @@ Add the following to your `claude_desktop_config.json`:
         "GITLAB_PERSONAL_ACCESS_TOKEN",
         "-e",
         "GITLAB_API_URL",
-        "ai/mcp-gitlab"
+        "mcp/gitlab"
       ],
       "env": {
         "GITLAB_PERSONAL_ACCESS_TOKEN": "<YOUR_TOKEN>",
diff --git a/src/google-maps/README.md b/src/google-maps/README.md
index 867aa2f5..c0fd576e 100644
--- a/src/google-maps/README.md
+++ b/src/google-maps/README.md
@@ -72,7 +72,7 @@ Add the following to your `claude_desktop_config.json`:
         "--rm",
         "-e",
         "GOOGLE_MAPS_API_KEY",
-        "ai/mcp-google-maps"
+        "mcp/google-maps"
       ],
       "env": {
         "GOOGLE_MAPS_API_KEY": "<YOUR_API_KEY>"
diff --git a/src/memory/README.md b/src/memory/README.md
index 37f47094..e405a0d4 100644
--- a/src/memory/README.md
+++ b/src/memory/README.md
@@ -137,7 +137,7 @@ Add this to your claude_desktop_config.json:
   "mcpServers": {
     "memory": {
       "command": "docker",
-      "args": ["run", "-i", "--rm", "ai/mcp-memory"]
+      "args": ["run", "-i", "--rm", "mcp/memory"]
     }
   }
 }
@@ -195,7 +195,7 @@ Follow these steps for each interaction:
 Docker:
 
 ```sh
-docker build -t ai/mcp-memory -f src/memory/Dockerfile . 
+docker build -t mcp/memory -f src/memory/Dockerfile . 
 ```
 
 ## License
diff --git a/src/postgres/README.md b/src/postgres/README.md
index f5ace34c..aaace581 100644
--- a/src/postgres/README.md
+++ b/src/postgres/README.md
@@ -38,7 +38,7 @@ To use this server with the Claude Desktop app, add the following configuration
         "run", 
         "-i", 
         "--rm", 
-        "ai/mcp-postgres", 
+        "mcp/postgres", 
         "postgresql://host.docker.internal:5432/mydb"]
     }
   }
@@ -69,7 +69,7 @@ Replace `/mydb` with your database name.
 Docker:
 
 ```sh
-docker build -t ai/mcp-postgres -f src/postgres/Dockerfile . 
+docker build -t mcp/postgres -f src/postgres/Dockerfile . 
 ```
 
 ## License
diff --git a/src/puppeteer/README.md b/src/puppeteer/README.md
index d13ef2a5..375b27cd 100644
--- a/src/puppeteer/README.md
+++ b/src/puppeteer/README.md
@@ -72,7 +72,7 @@ Here's the Claude Desktop configuration to use the Puppeter server:
   "mcpServers": {
     "puppeteer": {
       "command": "docker",
-      "args": ["run", "-i", "--rm", "--init", "-e", "DOCKER_CONTAINER=true", "ai/mcp-puppeteer"]
+      "args": ["run", "-i", "--rm", "--init", "-e", "DOCKER_CONTAINER=true", "mcp/puppeteer"]
     }
   }
 }
@@ -96,7 +96,7 @@ Here's the Claude Desktop configuration to use the Puppeter server:
 Docker build:
 
 ```bash
-docker build -t ai/mcp-puppeteer -f src/puppeteer/Dockerfile .
+docker build -t mcp/puppeteer -f src/puppeteer/Dockerfile .
 ```
 
 ## License
diff --git a/src/sequentialthinking/README.md b/src/sequentialthinking/README.md
index 15586b39..77ccb454 100644
--- a/src/sequentialthinking/README.md
+++ b/src/sequentialthinking/README.md
@@ -71,7 +71,7 @@ Add this to your `claude_desktop_config.json`:
         "run",
         "--rm",
         "-i",
-        "ai/mcp-sequentialthinking"
+        "mcp/sequentialthinking"
       ]
     }
   }
@@ -83,7 +83,7 @@ Add this to your `claude_desktop_config.json`:
 Docker:
 
 ```bash
-docker build -t ai/mcp-sequentialthinking -f sequentialthinking/Dockerfile .
+docker build -t mcp/sequentialthinking -f sequentialthinking/Dockerfile .
 ```
 
 ## License
diff --git a/src/slack/README.md b/src/slack/README.md
index 74d3dada..970cba66 100644
--- a/src/slack/README.md
+++ b/src/slack/README.md
@@ -124,7 +124,7 @@ Add the following to your `claude_desktop_config.json`:
         "SLACK_BOT_TOKEN",
         "-e",
         "SLACK_TEAM_ID",
-        "ai/mcp-slack"
+        "mcp/slack"
       ],
       "env": {
         "SLACK_BOT_TOKEN": "xoxb-your-bot-token",
@@ -148,7 +148,7 @@ If you encounter permission errors, verify that:
 Docker build:
 
 ```bash
-docker build -t ai/mcp-slack -f src/slack/Dockerfile .
+docker build -t mcp/slack -f src/slack/Dockerfile .
 ```
 
 ## License
diff --git a/src/sqlite/README.md b/src/sqlite/README.md
index 517b6e47..e194c6bf 100644
--- a/src/sqlite/README.md
+++ b/src/sqlite/README.md
@@ -95,7 +95,7 @@ The server offers six core tools:
       "-i",
       "-v",
       "mcp-test:/mcp",
-      "ai/mcp-sqlite",
+      "mcp/sqlite",
       "--db-path",
       "/mcp/test.db"
     ]
@@ -108,7 +108,7 @@ The server offers six core tools:
 Docker:
 
 ```bash
-docker build -t ai/mcp-sqlite .
+docker build -t mcp/sqlite .
 ```
 
 ## License
diff --git a/src/time/README.md b/src/time/README.md
index f40dc19d..eed504bb 100644
--- a/src/time/README.md
+++ b/src/time/README.md
@@ -61,7 +61,7 @@ Add to your Claude settings:
 "mcpServers": {
   "time": {
     "command": "docker",
-    "args": ["run", "-i", "--rm", "ai/mcp-time"]
+    "args": ["run", "-i", "--rm", "mcp/time"]
   }
 }
 ```
@@ -198,7 +198,7 @@ Docker build:
 
 ```bash
 cd src/time
-docker build -t ai/mcp-time .
+docker build -t mcp/time .
 ```
 
 ## Contributing