diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
index 950673d8d..45b92be8e 100644
--- a/.github/workflows/integration-tests.yaml
+++ b/.github/workflows/integration-tests.yaml
@@ -106,7 +106,7 @@ jobs:
             - run: composer run-script auto-scripts --no-interaction
               working-directory: demo
 
-            - run: bin/console cache:clear
+            - run: bin/console lint:container
               working-directory: demo
 
             - name: Run demo tests
diff --git a/src/mcp-bundle/config/services.php b/src/mcp-bundle/config/services.php
index fc27af04f..3da39d99d 100644
--- a/src/mcp-bundle/config/services.php
+++ b/src/mcp-bundle/config/services.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Mcp\Server;
-use Mcp\Server\ServerBuilder;
+use Mcp\Server\Builder;
 
 return static function (ContainerConfigurator $container): void {
     $container->services()
@@ -21,8 +21,8 @@
             ->args(['mcp'])
             ->tag('monolog.logger', ['channel' => 'mcp'])
 
-        ->set('mcp.server.builder', ServerBuilder::class)
-            ->factory([Server::class, 'make'])
+        ->set('mcp.server.builder', Builder::class)
+            ->factory([Server::class, 'builder'])
             ->call('setServerInfo', [param('mcp.app'), param('mcp.version')])
             ->call('setPaginationLimit', [param('mcp.pagination_limit')])
             ->call('setInstructions', [param('mcp.instructions')])