diff --git a/cluster_config.json b/cluster_config.json
index d8433ef24..54ec8f361 100644
--- a/cluster_config.json
+++ b/cluster_config.json
@@ -410,8 +410,7 @@
             "weather": true,
             "summarize": true,
             "github": true,
-            "monday": true,
-            "harvest": true
+            "hdn-server": true
           }
         }
       },
@@ -557,8 +556,6 @@
       "weather",
       "summarize",
       "github",
-      "monday",
-      "harvest",
       "hdn-server"
     ],
     "whitelist_enabled": true,
diff --git a/docs/configuration.md b/docs/configuration.md
index fc1cc061b..31444e2f8 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -77,7 +77,7 @@ When an incoming message includes a **ChatID** (passed in the `/chat` API or ext
  
 1.  **Isolated Workspace:** The agent's operations are restricted to `workspace/sessions/{isolationID}/workspace`.
 2.  **Isolated Memory:** Long-term memory (`MEMORY.md`) is stored and read from the isolated session path.
-3.  **Isolated Tools:** Tools like `read_file` and `write_file` are automatically pointed to the isolated workspace. Additionally, **MCP server tools** (e.g., Harvest, Monday) and discovery search tools are dynamically registered to each isolated instance, ensuring they inherit the same security boundaries.
+3.  **Isolated Tools:** Tools like `read_file` and `write_file` are automatically pointed to the isolated workspace. Additionally, **MCP server tools** (e.g., GitHub, Google) and discovery search tools are dynamically registered to each isolated instance, ensuring they inherit the same security boundaries.
  
 #### Tenant Identification (Inbound Integration)
  
diff --git a/pkg/security/policy/checker.go b/pkg/security/policy/checker.go
index f4b5e13b7..eb51ea467 100644
--- a/pkg/security/policy/checker.go
+++ b/pkg/security/policy/checker.go
@@ -55,7 +55,7 @@ func (c *Checker) ApproveTool(ctx context.Context, req *agent.ToolApprovalReques
 		if c.Config.AllowedTools[req.Tool] {
 			allowed = true
 		} else {
-			// Check for prefix matches (e.g. "monday" matches "mcp_monday_...")
+			// Check for prefix matches (e.g. "github" matches "mcp_github_...")
 			// Match logic consistent with ToolRegistry.Filter
 			for w, ok := range c.Config.AllowedTools {
 				if !ok {
diff --git a/pkg/tools/registry.go b/pkg/tools/registry.go
index b7d9e8538..ef808b4be 100644
--- a/pkg/tools/registry.go
+++ b/pkg/tools/registry.go
@@ -445,7 +445,7 @@ func (r *ToolRegistry) Filter(whitelist []string, enabled bool) {
 		if _, exact := whitelistMap[name]; exact {
 			allowed = true
 		} else {
-			// Check for prefix matches (e.g. "monday" matches "mcp_monday_...")
+			// Check for prefix matches (e.g. "github" matches "mcp_github_...")
 			for _, w := range whitelist {
 				// Match exact (redundant but safe) or prefix with underscore
 				// We also check for "mcp_" prefix specifically to support MCP tool grouping