diff --git a/rh-sre/skills/cve-impact/docs/references/lightspeed-mcp-tool-failures.md b/rh-sre/skills/cve-impact/docs/references/lightspeed-mcp-tool-failures.md
index f2c661b4..868f4776 100644
--- a/rh-sre/skills/cve-impact/docs/references/lightspeed-mcp-tool-failures.md
+++ b/rh-sre/skills/cve-impact/docs/references/lightspeed-mcp-tool-failures.md
@@ -24,13 +24,13 @@ When Lightspeed MCP tools fail with cryptic backend errors (e.g. KeyError, missi
 
 **Cause**: Some MCP clients incorrectly serialize the `limit` parameter as `limit_`. The Lightspeed MCP server expects `limit` (no underscore).
 
-**Workaround**: For connectivity tests, call with **no parameters**—the tool uses default `limit=10`:
+**Workaround**: Call with **no parameters**—the tool uses default `limit=10`:
 ```
 vulnerability__get_cves()
 ```
 Or pass only parameters that don't trigger the bug (e.g. `impact`, `sort`, `advisory_available`). Avoid passing `limit` when the client may serialize it as `limit_`.
 
-**Skills affected**: mcp-lightspeed-validator (connectivity test), cve-impact (account-level CVE queries).
+**Skills affected**: cve-impact (account-level CVE queries). For MCP connectivity validation, use `/mcp-lightspeed-validator` which calls `get_mcp_version` instead.
 
 ### vulnerability__explain_cves — `'dnf_modules'` (or similar KeyError)
 
diff --git a/rh-sre/skills/mcp-lightspeed-validator/SKILL.md b/rh-sre/skills/mcp-lightspeed-validator/SKILL.md
index f1b4fd6a..d9e1d432 100644
--- a/rh-sre/skills/mcp-lightspeed-validator/SKILL.md
+++ b/rh-sre/skills/mcp-lightspeed-validator/SKILL.md
@@ -5,12 +5,12 @@ description: |
 model: haiku
 color: yellow
 license: Apache-2.0
-allowed-tools: vulnerability__get_cves
+allowed-tools: get_mcp_version
 ---
 
 # MCP Lightspeed Validator
 
-Validates connectivity to the Red Hat Lightspeed MCP server by running a lightweight tool call.
+Validates connectivity to the Red Hat Lightspeed MCP server by calling `get_mcp_version`.
 
 ## When to Use This Skill
 
@@ -18,7 +18,7 @@ Use when validating Lightspeed MCP before CVE operations, troubleshooting connec
 
 ## Workflow
 
-1. **Test connectivity**: Call `vulnerability__get_cves` with **no parameters** (uses default limit=10). Do NOT pass `limit`—some MCP clients incorrectly serialize it as `limit_`, causing validation errors.
+1. **Test connectivity**: Call `get_mcp_version` with **no parameters**.
 2. **If it fails**: Provide a comprehensive message with possible root causes (see below).
 3. **Report**: Output a table with validated servers and outcome (emojis).
 
@@ -60,7 +60,7 @@ Use ✅ for success, ❌ for failure, ⚠️ for partial (e.g. connected but err
 - `lightspeed-mcp` - Red Hat Lightspeed vulnerability and inventory data
 
 ### Required MCP Tools
-- `vulnerability__get_cves` or `get_cves` (from lightspeed-mcp) - Connectivity test
+- `get_mcp_version` (from lightspeed-mcp gateway) - Connectivity test
 
 ### Related Skills
 - `/remediation` - Requires Lightspeed MCP validation before CVE operations