diff --git a/.changeset/mcp-server-model-module.md b/.changeset/mcp-server-model-module.md
deleted file mode 100644
index 273e03d142..0000000000
--- a/.changeset/mcp-server-model-module.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend-module-mcp-server-model': patch
----
-
-New backend module that registers support for the `mcp-server` API spec type in the catalog. Install with `backend.add(import('@backstage/plugin-catalog-backend-module-mcp-server-model'))`.
diff --git a/plugins/catalog-backend-module-ai-model/src/module.ts b/plugins/catalog-backend-module-ai-model/src/module.ts
index f2807a1cab..0a69a8a6de 100644
--- a/plugins/catalog-backend-module-ai-model/src/module.ts
+++ b/plugins/catalog-backend-module-ai-model/src/module.ts
@@ -18,6 +18,7 @@ import { createBackendModule } from '@backstage/backend-plugin-api';
 import {
   CatalogModelSources,
   aiResourceEntityModel,
+  mcpServerApiEntityModel,
 } from '@backstage/catalog-model/alpha';
 import { catalogModelExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 
@@ -36,7 +37,10 @@ export const catalogModuleAiResourceEntityModel = createBackendModule({
       },
       async init({ model }) {
         model.addModelSource(
-          CatalogModelSources.static([aiResourceEntityModel]),
+          CatalogModelSources.static([
+            aiResourceEntityModel,
+            mcpServerApiEntityModel,
+          ]),
         );
       },
     });
diff --git a/plugins/catalog-backend-module-mcp-server-model/.eslintrc.js b/plugins/catalog-backend-module-mcp-server-model/.eslintrc.js
deleted file mode 100644
index e2a53a6ad2..0000000000
--- a/plugins/catalog-backend-module-mcp-server-model/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/catalog-backend-module-mcp-server-model/catalog-info.yaml b/plugins/catalog-backend-module-mcp-server-model/catalog-info.yaml
deleted file mode 100644
index 5ea5697284..0000000000
--- a/plugins/catalog-backend-module-mcp-server-model/catalog-info.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: backstage-plugin-catalog-backend-module-mcp-server-model
-  title: '@backstage/plugin-catalog-backend-module-mcp-server-model'
-  description: Adds support for the mcp-server API spec type to the catalog backend plugin.
-spec:
-  lifecycle: experimental
-  type: backstage-backend-plugin-module
-  owner: maintainers
diff --git a/plugins/catalog-backend-module-mcp-server-model/package.json b/plugins/catalog-backend-module-mcp-server-model/package.json
deleted file mode 100644
index d074f7d488..0000000000
--- a/plugins/catalog-backend-module-mcp-server-model/package.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "@backstage/plugin-catalog-backend-module-mcp-server-model",
-  "version": "0.1.0",
-  "description": "Adds support for the mcp-server API spec type to the catalog backend plugin.",
-  "backstage": {
-    "role": "backend-plugin-module",
-    "pluginId": "catalog",
-    "pluginPackage": "@backstage/plugin-catalog-backend"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/backstage/backstage",
-    "directory": "plugins/catalog-backend-module-mcp-server-model"
-  },
-  "license": "Apache-2.0",
-  "exports": {
-    ".": "./src/index.ts",
-    "./package.json": "./package.json"
-  },
-  "main": "src/index.ts",
-  "types": "src/index.ts",
-  "typesVersions": {
-    "*": {
-      "package.json": [
-        "package.json"
-      ]
-    }
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "backstage-cli package build",
-    "clean": "backstage-cli package clean",
-    "lint": "backstage-cli package lint",
-    "prepack": "backstage-cli package prepack",
-    "postpack": "backstage-cli package postpack",
-    "start": "backstage-cli package start",
-    "test": "backstage-cli package test"
-  },
-  "dependencies": {
-    "@backstage/backend-plugin-api": "workspace:^",
-    "@backstage/catalog-model": "workspace:^",
-    "@backstage/plugin-catalog-node": "workspace:^"
-  },
-  "devDependencies": {
-    "@backstage/backend-test-utils": "workspace:^",
-    "@backstage/cli": "workspace:^"
-  }
-}
diff --git a/plugins/catalog-backend-module-mcp-server-model/report.api.md b/plugins/catalog-backend-module-mcp-server-model/report.api.md
deleted file mode 100644
index a3f872c435..0000000000
--- a/plugins/catalog-backend-module-mcp-server-model/report.api.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## API Report File for "@backstage/plugin-catalog-backend-module-mcp-server-model"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-import { BackendFeature } from '@backstage/backend-plugin-api';
-
-// @public
-const catalogModuleMcpServerModel: BackendFeature;
-export default catalogModuleMcpServerModel;
-```
diff --git a/plugins/catalog-backend-module-mcp-server-model/src/index.ts b/plugins/catalog-backend-module-mcp-server-model/src/index.ts
deleted file mode 100644
index 2f3e927e16..0000000000
--- a/plugins/catalog-backend-module-mcp-server-model/src/index.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2026 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Adds support for the mcp-server API spec type to the catalog backend plugin.
- *
- * @packageDocumentation
- */
-
-export { catalogModuleMcpServerModel as default } from './module';
diff --git a/plugins/catalog-backend-module-mcp-server-model/src/module.ts b/plugins/catalog-backend-module-mcp-server-model/src/module.ts
deleted file mode 100644
index 0a9c1eca00..0000000000
--- a/plugins/catalog-backend-module-mcp-server-model/src/module.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2026 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { createBackendModule } from '@backstage/backend-plugin-api';
-import {
-  CatalogModelSources,
-  mcpServerApiEntityModel,
-} from '@backstage/catalog-model/alpha';
-import { catalogModelExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
-
-/**
- * Registers support for the mcp-server API spec type in the catalog.
- *
- * @public
- */
-export const catalogModuleMcpServerModel = createBackendModule({
-  pluginId: 'catalog',
-  moduleId: 'mcp-server-model',
-  register(reg) {
-    reg.registerInit({
-      deps: {
-        model: catalogModelExtensionPoint,
-      },
-      async init({ model }) {
-        model.addModelSource(
-          CatalogModelSources.static([mcpServerApiEntityModel]),
-        );
-      },
-    });
-  },
-});
diff --git a/yarn.lock b/yarn.lock
index 5df632d1bf..6655516238 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5068,18 +5068,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-backend-module-mcp-server-model@workspace:plugins/catalog-backend-module-mcp-server-model":
-  version: 0.0.0-use.local
-  resolution: "@backstage/plugin-catalog-backend-module-mcp-server-model@workspace:plugins/catalog-backend-module-mcp-server-model"
-  dependencies:
-    "@backstage/backend-plugin-api": "workspace:^"
-    "@backstage/backend-test-utils": "workspace:^"
-    "@backstage/catalog-model": "workspace:^"
-    "@backstage/cli": "workspace:^"
-    "@backstage/plugin-catalog-node": "workspace:^"
-  languageName: unknown
-  linkType: soft
-
 "@backstage/plugin-catalog-backend-module-msgraph-incremental@workspace:plugins/catalog-backend-module-msgraph-incremental":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-backend-module-msgraph-incremental@workspace:plugins/catalog-backend-module-msgraph-incremental"