diff --git a/docs/how-tos/vs-code/external-ai-tools/claude-code.md b/docs/how-tos/vs-code/external-ai-tools/claude-code.md
index b2ac585..aa66af4 100644
--- a/docs/how-tos/vs-code/external-ai-tools/claude-code.md
+++ b/docs/how-tos/vs-code/external-ai-tools/claude-code.md
@@ -67,7 +67,9 @@ If you have problems copying text from Claude Code in the VS Code terminal, run
## MCP servers
-Claude Code, the extension and the CLI, can use the Datacoves [Snowflake MCP server](/docs/how-tos/vs-code/mcp/snowflake) when it is enabled for your environment.
+Claude Code, the extension and the CLI, can use the Datacoves [MCP servers](/docs/how-tos/vs-code/mcp) (GitHub, Airflow, Grafana, Snowflake) when they are enabled for your environment. The `claude` command in a terminal loads them for you.
+
+To see them, run `/mcp` inside Claude Code. `claude mcp list` doesn't show the GitHub, Airflow and Grafana servers.
## Learn more
diff --git a/docs/how-tos/vs-code/external-ai-tools/snowflake-cortex.md b/docs/how-tos/vs-code/external-ai-tools/snowflake-cortex.md
index 1ab149c..90363ca 100644
--- a/docs/how-tos/vs-code/external-ai-tools/snowflake-cortex.md
+++ b/docs/how-tos/vs-code/external-ai-tools/snowflake-cortex.md
@@ -12,10 +12,7 @@ Snowflake's AI coding assistant, available as a CLI tool in Datacoves.
## Prerequisites
- A Snowflake-based (`dbt-snowflake`) environment. Cortex is only available on Snowflake
- environments.
-- Cortex enabled in your Datacoves environment. Contact
- [Datacoves support](mailto:support@datacoves.com) to enable it, or an administrator can turn it
- on under **Admin > Environments > _your environment_ > AI Tools**.
+ environments, where it is always on.
## Login and usage
diff --git a/docs/how-tos/vs-code/initial.mdx b/docs/how-tos/vs-code/initial.mdx
index 29b80e1..78c0180 100644
--- a/docs/how-tos/vs-code/initial.mdx
+++ b/docs/how-tos/vs-code/initial.mdx
@@ -200,6 +200,10 @@ If using key based authentication, you will need to provide or generate a key wh
Provide or automatically generate your keys. Then add the public key to Snowflake.
+:::warning
+Elliptic curve keys don't work with the [Snowflake VS Code extension](/docs/getting-started/developer/snowflake-extension) or the [Snowflake MCP server](/docs/how-tos/vs-code/mcp/snowflake). The default **Auto-generate key pairs** creates an elliptic curve key. To use either, pick **Auto-generate RSA key pairs (Compatibility)** or provide an RSA private key. Datacoves shows this warning when you generate, paste, or select an elliptic curve key.
+:::
+

diff --git a/docs/how-tos/vs-code/mcp/README.md b/docs/how-tos/vs-code/mcp/README.md
index acbbcad..5452b84 100644
--- a/docs/how-tos/vs-code/mcp/README.md
+++ b/docs/how-tos/vs-code/mcp/README.md
@@ -25,12 +25,10 @@ your workspace:
- Datacoves Copilot
- GitHub Copilot
+- [Claude Code](/docs/how-tos/vs-code/external-ai-tools/claude-code), the extension and the CLI
- [OpenAI Codex](/docs/how-tos/vs-code/external-ai-tools/openai-codex)
- [Snowflake Cortex](/docs/how-tos/vs-code/external-ai-tools/snowflake-cortex)
-The Snowflake server also reaches [Claude Code](/docs/how-tos/vs-code/external-ai-tools/claude-code),
-the extension and the CLI, and the GitHub Copilot CLI.
-
## Enabling MCP servers
MCP servers are toggled per environment by an administrator.
diff --git a/docs/how-tos/vs-code/mcp/snowflake.md b/docs/how-tos/vs-code/mcp/snowflake.md
index 971fb36..85ae27d 100644
--- a/docs/how-tos/vs-code/mcp/snowflake.md
+++ b/docs/how-tos/vs-code/mcp/snowflake.md
@@ -18,9 +18,9 @@ which runs inside your own Snowflake account. Your data never leaves it.
- A Snowflake environment whose first Snowflake connection is a development connection, that is, one
whose name contains `dev`.
-- [Key pair authentication](/docs/how-tos/vs-code/initial) on that connection. Snowflake accepts a
- key pair token and nothing else for MCP, so a password-authenticated connection cannot reach the
- server.
+- [Key pair authentication](/docs/how-tos/vs-code/initial) on that connection, using an RSA key. The
+ MCP server works with RSA key pairs only, not with passwords or elliptic curve keys. To create one,
+ pick **Auto-generate RSA key pairs (Compatibility)** or provide your own RSA private key.
- An MCP server object in your Snowflake account, created by an account administrator as shown
below.
- The **Snowflake** toggle turned on for your environment by an administrator, under
diff --git a/docs/reference/admin-menu/environments.md b/docs/reference/admin-menu/environments.md
index ab7a89d..7af5adb 100644
--- a/docs/reference/admin-menu/environments.md
+++ b/docs/reference/admin-menu/environments.md
@@ -36,7 +36,7 @@ assistants and the data systems they can reach. It has three sections:
- **AI Extensions** - enable or disable the built-in AI extensions, such as Datacoves Copilot and
GitHub Copilot.
- **AI Tools** - enable or disable the AI CLI tools, such as OpenAI Codex and Snowflake Cortex
- (Cortex is only shown on Snowflake environments).
+ (Cortex is only shown on Snowflake environments, where it is always on).
- **MCP Servers** - enable or disable the [MCP servers](/docs/how-tos/vs-code/mcp) (GitHub,
Airflow, Grafana, and Snowflake) that give the AI tools read access to your repositories, DAGs,
metrics and logs, and Snowflake data.