diff --git a/ibexa/commerce/5.0/config/packages/security.yaml b/ibexa/commerce/5.0/config/packages/security.yaml
index ab2ed9a7..e4bfaf7e 100644
--- a/ibexa/commerce/5.0/config/packages/security.yaml
+++ b/ibexa/commerce/5.0/config/packages/security.yaml
@@ -107,14 +107,6 @@ security:
         #    stateless: true
         #    jwt: ~
 
-        # Uncomment `ibexa_jwt_mcp` rule if you are using Ibexa MCP
-        #ibexa_jwt_mcp:
-        #    request_matcher: Ibexa\Mcp\Security\McpRequestMatcher
-        #    user_checker: Ibexa\Core\MVC\Symfony\Security\UserChecker
-        #    provider: ibexa
-        #    stateless: true
-        #    jwt: ~
-
         #ibexa_jwt_graphql:
         #    request_matcher: Ibexa\GraphQL\Security\NonAdminGraphQLRequestMatcher
         #    provider: ibexa
diff --git a/ibexa/experience/5.0/config/packages/security.yaml b/ibexa/experience/5.0/config/packages/security.yaml
index d977f525..d89cf135 100644
--- a/ibexa/experience/5.0/config/packages/security.yaml
+++ b/ibexa/experience/5.0/config/packages/security.yaml
@@ -95,14 +95,6 @@ security:
         #    stateless: true
         #    jwt: ~
 
-        # Uncomment `ibexa_jwt_mcp` rule if you are using Ibexa MCP
-        #ibexa_jwt_mcp:
-        #    request_matcher: Ibexa\Mcp\Security\McpRequestMatcher
-        #    user_checker: Ibexa\Core\MVC\Symfony\Security\UserChecker
-        #    provider: ibexa
-        #    stateless: true
-        #    jwt: ~
-
         #ibexa_jwt_graphql:
         #    request_matcher: Ibexa\GraphQL\Security\NonAdminGraphQLRequestMatcher
         #    provider: ibexa
diff --git a/ibexa/experience/5.0/config/routes/ibexa_mcp.yaml b/ibexa/experience/5.0/config/routes/ibexa_mcp.yaml
deleted file mode 100644
index 33e04eea..00000000
--- a/ibexa/experience/5.0/config/routes/ibexa_mcp.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-ibexa_mcp:
-    resource: .
-    type: ibexa_mcp
diff --git a/ibexa/headless/5.0/config/packages/security.yaml b/ibexa/headless/5.0/config/packages/security.yaml
index aac809a5..2126bc5d 100644
--- a/ibexa/headless/5.0/config/packages/security.yaml
+++ b/ibexa/headless/5.0/config/packages/security.yaml
@@ -95,14 +95,6 @@ security:
         #    stateless: true
         #    jwt: ~
 
-        # Uncomment `ibexa_jwt_mcp` rule if you are using Ibexa MCP
-        #ibexa_jwt_mcp:
-        #    request_matcher: Ibexa\Mcp\Security\McpRequestMatcher
-        #    user_checker: Ibexa\Core\MVC\Symfony\Security\UserChecker
-        #    provider: ibexa
-        #    stateless: true
-        #    jwt: ~
-
         #ibexa_jwt_graphql:
         #    request_matcher: Ibexa\GraphQL\Security\NonAdminGraphQLRequestMatcher
         #    provider: ibexa
diff --git a/ibexa/headless/5.0/config/routes/ibexa_mcp.yaml b/ibexa/headless/5.0/config/routes/ibexa_mcp.yaml
deleted file mode 100644
index 33e04eea..00000000
--- a/ibexa/headless/5.0/config/routes/ibexa_mcp.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-ibexa_mcp:
-    resource: .
-    type: ibexa_mcp
diff --git a/ibexa/commerce/5.0/config/routes/ibexa_mcp.yaml b/ibexa/mcp/5.0/config/routes/ibexa_mcp.yaml
similarity index 100%
rename from ibexa/commerce/5.0/config/routes/ibexa_mcp.yaml
rename to ibexa/mcp/5.0/config/routes/ibexa_mcp.yaml
diff --git a/ibexa/mcp/5.0/manifest.json b/ibexa/mcp/5.0/manifest.json
new file mode 100644
index 00000000..cd6128bb
--- /dev/null
+++ b/ibexa/mcp/5.0/manifest.json
@@ -0,0 +1,9 @@
+{
+  "aliases": [],
+  "bundles": {
+    "Ibexa\\Bundle\\Mcp\\IbexaMcpBundle": ["all"]
+  },
+  "copy-from-recipe": {
+    "config/": "%CONFIG_DIR%/"
+  }
+}