diff --git a/config/bundles.php b/config/bundles.php
index 861ea7a..9155747 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -8,7 +8,6 @@ use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
 use Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle;
 use Nelmio\CorsBundle\NelmioCorsBundle;
-use Symfony\AI\McpBundle\McpBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
@@ -23,5 +22,4 @@ return [
     ApiPlatformBundle::class            => ['all' => true],
     LexikJWTAuthenticationBundle::class => ['all' => true],
     DAMADoctrineTestBundle::class       => ['test' => true],
-    McpBundle::class                    => ['all' => true],
 ];
diff --git a/config/packages/mcp.yaml b/config/packages/mcp.yaml.disabled
similarity index 100%
rename from config/packages/mcp.yaml
rename to config/packages/mcp.yaml.disabled
diff --git a/config/packages/security.yaml b/config/packages/security.yaml
index d4fd595..b725395 100644
--- a/config/packages/security.yaml
+++ b/config/packages/security.yaml
@@ -27,11 +27,12 @@ security:
             pattern: ^/api/session/profiles?$
             security: false
 
-        mcp:
-            pattern: ^/_mcp
-            stateless: true
-            custom_authenticators:
-                - App\Mcp\Security\McpHeaderAuthenticator
+        # TODO: re-enable when symfony/ai-mcp-bundle is installed
+        # mcp:
+        #     pattern: ^/_mcp
+        #     stateless: true
+        #     custom_authenticators:
+        #         - App\Mcp\Security\McpHeaderAuthenticator
 
         api:
             pattern: ^/api
@@ -55,7 +56,7 @@ security:
         - { path: ^/api/admin, roles: ROLE_ADMIN }
         - { path: ^/api/docs, roles: PUBLIC_ACCESS }
         - { path: ^/api/health$, roles: PUBLIC_ACCESS }
-        - { path: ^/_mcp, roles: ROLE_USER }
+        # - { path: ^/_mcp, roles: ROLE_USER }  # TODO: re-enable with MCP
         - { path: ^/docs, roles: PUBLIC_ACCESS }
         - { path: ^/contexts, roles: PUBLIC_ACCESS }
         - { path: ^/\.well-known, roles: PUBLIC_ACCESS }
diff --git a/config/routes.yaml b/config/routes.yaml
index c827fad..58a67fe 100644
--- a/config/routes.yaml
+++ b/config/routes.yaml
@@ -12,7 +12,3 @@ api_login_check:
 
 controllers:
     resource: routing.controllers
-
-mcp:
-    resource: .
-    type: mcp
diff --git a/config/services.yaml b/config/services.yaml
index 8d0e4d0..2c795a7 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -18,6 +18,8 @@ services:
     # this creates a service per class whose id is the fully-qualified class name
     App\:
         resource: '../src/'
+        exclude:
+            - '../src/Mcp/'
 
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
@@ -34,9 +36,10 @@ services:
         tags:
             - { name: doctrine.event_subscriber }
 
-    App\Mcp\Security\McpHeaderAuthenticator:
-        arguments:
-            $mcpAuthLimiter: '@limiter.mcp_auth'
+    # TODO: re-enable when symfony/ai-mcp-bundle is installed
+    # App\Mcp\Security\McpHeaderAuthenticator:
+    #     arguments:
+    #         $mcpAuthLimiter: '@limiter.mcp_auth'
 
     App\OpenApi\OpenApiDecorator:
         decorates: 'api_platform.openapi.factory'
diff --git a/phpunit.dist.xml b/phpunit.dist.xml
index 294e6d1..4dd9e0e 100644
--- a/phpunit.dist.xml
+++ b/phpunit.dist.xml
@@ -20,6 +20,7 @@
     <testsuites>
         <testsuite name="Project Test Suite">
             <directory>tests</directory>
+            <exclude>tests/Mcp</exclude>
         </testsuite>
     </testsuites>