diff --git a/docs/reference/artifact-format.md b/docs/reference/artifact-format.md
index 11620708..1f229dd4 100644
--- a/docs/reference/artifact-format.md
+++ b/docs/reference/artifact-format.md
@@ -27,7 +27,6 @@ apim-artifacts/
 │       ├── policy.xml                      # API-level policy
 │       ├── specification.yaml              # OpenAPI spec (if applicable)
 │       ├── wiki.md                         # API wiki (if exists)
-│       ├── mcpServerInformation.json       # MCP server config (if exists)
 │       ├── operations/
 │       │   └── get-pets/
 │       │       └── policy.xml              # Operation-level policy
@@ -151,7 +150,7 @@ All 34 APIM resource types and their artifact mappings:
 | ApiWiki | `apis/{api}` | `wiki.md` |
 | GraphQLResolver | `apis/{api}/resolvers/{resolver}` | `resolverInformation.json` |
 | GraphQLResolverPolicy | `apis/{api}/resolvers/{resolver}` | `policy.xml` |
-| McpServer | `apis/{api}` | `mcpServerInformation.json` |
+| McpServer | `apis/{api}` | _embedded in `apiInformation.json`_ |
 
 ### Gateway Child Resources
 
diff --git a/docs/reference/resource-types.md b/docs/reference/resource-types.md
index 5d200a41..37798158 100644
--- a/docs/reference/resource-types.md
+++ b/docs/reference/resource-types.md
@@ -67,7 +67,7 @@ Resources scoped to a specific API.
 | ApiWiki | `/apis/{name}/wikis/default` | `apis/{0}` | `wiki.md` | Markdown documentation page for an API |
 | GraphQLResolver | `/apis/{name}/resolvers/{resolver}` | `apis/{0}/resolvers/{1}` | `resolverInformation.json` | GraphQL field resolver configuration |
 | GraphQLResolverPolicy | `/apis/{name}/resolvers/{resolver}/policies/policy` | `apis/{0}/resolvers/{1}` | `policy.xml` | Policy applied to a GraphQL resolver |
-| McpServer | `/apis/{name}/mcpServers/default` | `apis/{0}` | `mcpServerInformation.json` | MCP (Model Context Protocol) server linked to an API |
+| McpServer | `/apis/{name}/mcpServers/default` | `apis/{0}` | _embedded in `apiInformation.json`_ | MCP (Model Context Protocol) server linked to an API |
 
 ## Gateway Resources
 
diff --git a/tests/integration/all-resource-types/expected-structure.json b/tests/integration/all-resource-types/expected-structure.json
index 0229ed14..fcd65a38 100644
--- a/tests/integration/all-resource-types/expected-structure.json
+++ b/tests/integration/all-resource-types/expected-structure.json
@@ -614,15 +614,13 @@
         },
         {
           "name": "src-mcp-todos",
-          "files": ["apiInformation.json", "mcpServerInformation.json", "policy.xml"],
+          "files": ["apiInformation.json", "policy.xml"],
           "spotChecks": {
             "apiInformation.json": {
               "properties.displayName": "KS MCP Todos Server",
               "properties.path": "ks/mcp-todos",
               "properties.type": "mcp",
-              "properties.subscriptionRequired": false
-            },
-            "mcpServerInformation.json": {
+              "properties.subscriptionRequired": false,
               "properties.mcpProperties.endpoints.mcp.uriTemplate": "/mcp",
               "properties.mcpTools": "exists"
             }