diff --git a/docs/02-usage/030_clients.md b/docs/02-usage/030_clients.md
index 8280d604..e608b272 100644
--- a/docs/02-usage/030_clients.md
+++ b/docs/02-usage/030_clients.md
@@ -266,6 +266,15 @@ To set this up, create the file `~/.copilot/hooks/serena-hooks.json` with the fo
 The `SessionStart` hook also addresses the global configuration limitation mentioned above — it will
 automatically prompt the agent to activate the project directory, so you no longer need to do this manually.
 
+## Copilot CLI
+
+Use the interactive `/mcp add` slash command, choose Serena as the name, STDIO as the server type, and
+`serena start-mcp-server --context=copilot-cli --project-from-cwd` as command. Copilot CLI will immediately notify you
+that Serena is running if everything is set up correctly or display an error otherwise.
+
+You should add the same **hooks** as in VSCode (see above) if Copilot CLI didn't pick them up automatically.
+
+
 ## Codex (CLI and App)
 
 You can simply run `serena setup codex`.
@@ -356,30 +365,11 @@ Alternatively, add the following to `~/.copilot/mcp-config.json` (create the fil
 Copilot should now show that Serena is running, though you may have to restart it.
 
 
-## JetBrains Junie 
+## JetBrains Junie
 
 For the Junie plugin in JetBrains IDEs, go to the three dots in the top right corner, 
 then Settings / MCP Settings and add Serena to Junie's global MCP server configuration:
 
-```json
-{
-  "mcpServers": {
-    "serena": {
-      "command": "serena",
-      "args": [
-        "start-mcp-server",
-        "--context=junie"
-      ]
-    }
-  }
-}
-```
-
-You will have to prompt Junie to "Activate the current project using serena's activation tool" at the
-start of each session.
-
-For Junie CLI, where the project can be activated automatically on startup, edit `~/.junie/mcp/mcp.json` and add
-
 ```json
 {
   "mcpServers": {
@@ -395,12 +385,14 @@ For Junie CLI, where the project can be activated automatically on startup, edit
 }
 ```
 
+You will have to prompt Junie to "Activate the current project using serena's activation tool" at the
+start of each session.
+
+For Junie CLI, add the same setting to `~/.junie/mcp/mcp.json`.
+
 ## JetBrains AI Assistant
 
-Here you can set up the more convenient per-project MCP server configuration, as the AI assistant supports specifying
-the launch working directory.
-
-Go to Settings / Tools / AI Assistant / MCP and add a new **local** configuration via the `as JSON` option:
+Go to Settings / Tools / AI Assistant / MCP and add a new **global** configuration:
 
 ```json
 {
@@ -410,8 +402,7 @@ Go to Settings / Tools / AI Assistant / MCP and add a new **local** configuratio
       "args": [
         "start-mcp-server",
         "--context=jb-ai-assistant",
-        "--project",
-        "$(pwd)"
+        "--project-from-cwd"
       ]
     }
   }