diff --git a/.github/plugin/marketplace.json b/.github/plugin/marketplace.json
index bd805beb..da4fcdfb 100644
--- a/.github/plugin/marketplace.json
+++ b/.github/plugin/marketplace.json
@@ -65,8 +65,8 @@
       "version": "1.0.0"
     },
     {
-      "name": "dataverse-mcp",
-      "source": "./plugins/dataverse-mcp",
+      "name": "dataverse",
+      "source": "./plugins/dataverse",
       "description": "Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setup commands.",
       "version": "1.0.0"
     },
diff --git a/docs/README.plugins.md b/docs/README.plugins.md
index 9fa231bd..4aaa87bf 100644
--- a/docs/README.plugins.md
+++ b/docs/README.plugins.md
@@ -25,7 +25,7 @@ Curated plugins of related prompts, agents, and skills organized around specific
 | [csharp-dotnet-development](../plugins/csharp-dotnet-development/README.md) | Essential prompts, instructions, and chat modes for C# and .NET development including testing, documentation, and best practices. | 9 items | csharp, dotnet, aspnet, testing |
 | [csharp-mcp-development](../plugins/csharp-mcp-development/README.md) | Complete toolkit for building Model Context Protocol (MCP) servers in C# using the official SDK. Includes instructions for best practices, a prompt for generating servers, and an expert chat mode for guidance. | 2 items | csharp, mcp, model-context-protocol, dotnet, server-development |
 | [database-data-management](../plugins/database-data-management/README.md) | Database administration, SQL optimization, and data management tools for PostgreSQL, SQL Server, and general database development best practices. | 6 items | database, sql, postgresql, sql-server, dba, optimization, queries, data-management |
-| [dataverse-mcp](../plugins/dataverse-mcp/README.md) | Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setup commands. | 1 items | dataverse, mcp |
+| [dataverse](../plugins/dataverse/README.md) | Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setup commands. | 1 items | dataverse, mcp |
 | [dataverse-sdk-for-python](../plugins/dataverse-sdk-for-python/README.md) | Comprehensive collection for building production-ready Python integrations with Microsoft Dataverse. Includes official documentation, best practices, advanced features, file operations, and code generation prompts. | 4 items | dataverse, python, integration, sdk |
 | [devops-oncall](../plugins/devops-oncall/README.md) | A focused set of prompts, instructions, and a chat mode to help triage incidents and respond quickly with DevOps tools and Azure resources. | 3 items | devops, incident-response, oncall, azure |
 | [edge-ai-tasks](../plugins/edge-ai-tasks/README.md) | Task Researcher and Task Planner for intermediate to expert users and large codebases - Brought to you by microsoft/edge-ai | 2 items | architecture, planning, research, tasks, implementation |
diff --git a/plugins/dataverse-mcp/.github/plugin/plugin.json b/plugins/dataverse/.github/plugin/plugin.json
similarity index 93%
rename from plugins/dataverse-mcp/.github/plugin/plugin.json
rename to plugins/dataverse/.github/plugin/plugin.json
index 13cc9990..778af04a 100644
--- a/plugins/dataverse-mcp/.github/plugin/plugin.json
+++ b/plugins/dataverse/.github/plugin/plugin.json
@@ -1,5 +1,5 @@
 {
-  "name": "dataverse-mcp",
+  "name": "dataverse",
   "description": "Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setup commands.",
   "version": "1.0.0",
   "author": {
diff --git a/plugins/dataverse-mcp/README.md b/plugins/dataverse/README.md
similarity index 68%
rename from plugins/dataverse-mcp/README.md
rename to plugins/dataverse/README.md
index d4411aca..6fd49941 100644
--- a/plugins/dataverse-mcp/README.md
+++ b/plugins/dataverse/README.md
@@ -1,4 +1,4 @@
-# Dataverse MCP setup
+# Dataverse MCP
 
 Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setup commands that guide you through configuring Dataverse MCP servers for GitHub Copilot.
 
@@ -6,7 +6,7 @@ Comprehensive collection for Microsoft Dataverse integrations. Includes MCP setu
 
 ```bash
 # Using Copilot CLI
-copilot plugin install dataverse-mcp@awesome-copilot
+copilot plugin install dataverse@awesome-copilot
 ```
 
 ## What's Included
@@ -15,7 +15,7 @@ copilot plugin install dataverse-mcp@awesome-copilot
 
 | Command | Description |
 |---------|-------------|
-| `/dataverse-mcp:mcp-setup` | Configure Dataverse MCP server for GitHub Copilot with global or project-scoped settings. No external scripts required. |
+| `/dataverse:mcp-setup` | Configure Dataverse MCP server for GitHub Copilot with global or project-scoped settings. No external scripts required. |
 
 ## Source
 
diff --git a/prompts/mcp-setup.prompt.md b/prompts/mcp-setup.prompt.md
index 1bdf2a83..eb06b1f4 100644
--- a/prompts/mcp-setup.prompt.md
+++ b/prompts/mcp-setup.prompt.md
@@ -91,7 +91,7 @@ Based on their choice:
    Accept: application/json
    ```
 
-4. Parse the JSON response and filter for environments where `properties.databaseType` is `"CommonDataService"`.
+4. Parse the JSON response and filter for environments where `properties?.linkedEnvironmentMetadata?.instanceUrl` is not null.
 
 5. For each matching environment, extract:
    - `properties.displayName` as `displayName`