diff --git a/src/Website/Mcp/Boot.php b/src/Website/Mcp/Boot.php
index 22fd4d5..5be5d94 100644
--- a/src/Website/Mcp/Boot.php
+++ b/src/Website/Mcp/Boot.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Core\Website\Mcp;
 
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 use Livewire\Livewire;
@@ -25,6 +26,11 @@ class Boot extends ServiceProvider
     {
         $this->loadViewsFrom(__DIR__.'/View/Blade', 'mcp');
 
+        // Register mcp layout into the layouts:: namespace
+        $layoutsPath = dirname(__DIR__, 2).'/Front/View/Blade/layouts';
+        $this->loadViewsFrom($layoutsPath, 'layouts');
+        Blade::anonymousComponentPath($layoutsPath, 'layouts');
+
         $this->registerLivewireComponents();
         $this->registerRoutes();
     }
diff --git a/src/Website/Mcp/View/Blade/web/analytics.blade.php b/src/Website/Mcp/View/Blade/web/analytics.blade.php
index c6afc41..07771c8 100644
--- a/src/Website/Mcp/View/Blade/web/analytics.blade.php
+++ b/src/Website/Mcp/View/Blade/web/analytics.blade.php
@@ -1,4 +1,4 @@
-<x-layouts.mcp>
+<x-layouts::mcp>
     <x-slot:title>{{ $server['name'] }} Analytics</x-slot:title>
 
     <div class="mb-8">
@@ -112,4 +112,4 @@
             @endforeach
         </flux:button.group>
     </div>
-</x-layouts.mcp>
+</x-layouts::mcp>
diff --git a/src/Website/Mcp/View/Blade/web/connect.blade.php b/src/Website/Mcp/View/Blade/web/connect.blade.php
index c3a7999..419ff69 100644
--- a/src/Website/Mcp/View/Blade/web/connect.blade.php
+++ b/src/Website/Mcp/View/Blade/web/connect.blade.php
@@ -1,4 +1,4 @@
-<x-layouts.mcp>
+<x-layouts::mcp>
     <x-slot:title>Setup Guide</x-slot:title>
 
     @php
@@ -215,4 +215,4 @@ const data = await resp.json();</code></pre>
             </div>
         </div>
     </div>
-</x-layouts.mcp>
+</x-layouts::mcp>
diff --git a/src/Website/Mcp/View/Blade/web/index.blade.php b/src/Website/Mcp/View/Blade/web/index.blade.php
index bb149d3..dbd1fc0 100644
--- a/src/Website/Mcp/View/Blade/web/index.blade.php
+++ b/src/Website/Mcp/View/Blade/web/index.blade.php
@@ -1,4 +1,4 @@
-<x-layouts.mcp>
+<x-layouts::mcp>
     <x-slot:title>MCP Servers</x-slot:title>
 
     <div class="mb-8">
@@ -126,4 +126,4 @@
             </div>
         </div>
     @endif
-</x-layouts.mcp>
+</x-layouts::mcp>
diff --git a/src/Website/Mcp/View/Blade/web/keys.blade.php b/src/Website/Mcp/View/Blade/web/keys.blade.php
index 78463fb..92ff915 100644
--- a/src/Website/Mcp/View/Blade/web/keys.blade.php
+++ b/src/Website/Mcp/View/Blade/web/keys.blade.php
@@ -1,6 +1,6 @@
-<x-layouts.mcp>
+<x-layouts::mcp>
     <x-slot:title>API Keys</x-slot:title>
     <x-slot:description>Manage API keys for MCP server access.</x-slot:description>
 
     <livewire:mcp.api-key-manager :workspace="$workspace" />
-</x-layouts.mcp>
+</x-layouts::mcp>
diff --git a/src/Website/Mcp/View/Blade/web/landing.blade.php b/src/Website/Mcp/View/Blade/web/landing.blade.php
index 7963814..302865b 100644
--- a/src/Website/Mcp/View/Blade/web/landing.blade.php
+++ b/src/Website/Mcp/View/Blade/web/landing.blade.php
@@ -1,4 +1,4 @@
-<x-layouts.mcp>
+<x-layouts::mcp>
     <x-slot:title>MCP Portal</x-slot:title>
     <x-slot:description>Connect AI agents to platform infrastructure via Model Context Protocol. Machine-readable, agent-optimised, human-friendly.</x-slot:description>
 
@@ -208,4 +208,4 @@
             </flux:button>
         </div>
     </section>
-</x-layouts.mcp>
+</x-layouts::mcp>
diff --git a/src/Website/Mcp/View/Blade/web/show.blade.php b/src/Website/Mcp/View/Blade/web/show.blade.php
index 7d3316a..76a77d7 100644
--- a/src/Website/Mcp/View/Blade/web/show.blade.php
+++ b/src/Website/Mcp/View/Blade/web/show.blade.php
@@ -1,4 +1,4 @@
-<x-layouts.mcp>
+<x-layouts::mcp>
     <x-slot:title>{{ $server['name'] }}</x-slot:title>
     <x-slot:description>{{ $server['tagline'] ?? $server['description'] ?? '' }}</x-slot:description>
 
@@ -237,4 +237,4 @@
             View Usage Analytics
         </a>
     </div>
-</x-layouts.mcp>
+</x-layouts::mcp>
diff --git a/src/Website/Mcp/View/Modal/McpMetrics.php b/src/Website/Mcp/View/Modal/McpMetrics.php
index 50f2267..dc00b60 100644
--- a/src/Website/Mcp/View/Modal/McpMetrics.php
+++ b/src/Website/Mcp/View/Modal/McpMetrics.php
@@ -13,7 +13,7 @@ use Core\Mcp\Services\McpMetricsService;
  *
  * Displays analytics and metrics for MCP tool usage.
  */
-#[Layout('components.layouts.mcp')]
+#[Layout('layouts::mcp')]
 class McpMetrics extends Component
 {
     public int $days = 7;
diff --git a/src/Website/Mcp/View/Modal/McpPlayground.php b/src/Website/Mcp/View/Modal/McpPlayground.php
index 2506153..fb8fbbc 100644
--- a/src/Website/Mcp/View/Modal/McpPlayground.php
+++ b/src/Website/Mcp/View/Modal/McpPlayground.php
@@ -18,7 +18,7 @@ use Symfony\Component\Yaml\Yaml;
  * A browser-based UI for testing MCP tool calls.
  * Allows users to select a server, pick a tool, and execute it with custom parameters.
  */
-#[Layout('components.layouts.mcp')]
+#[Layout('layouts::mcp')]
 class McpPlayground extends Component
 {
     public string $selectedServer = '';
diff --git a/src/Website/Mcp/View/Modal/Playground.php b/src/Website/Mcp/View/Modal/Playground.php
index cfccdd9..38785fc 100644
--- a/src/Website/Mcp/View/Modal/Playground.php
+++ b/src/Website/Mcp/View/Modal/Playground.php
@@ -14,7 +14,7 @@ use Symfony\Component\Yaml\Yaml;
 /**
  * MCP Playground - interactive tool testing in the browser.
  */
-#[Layout('components.layouts.mcp')]
+#[Layout('layouts::mcp')]
 class Playground extends Component
 {
     public string $selectedServer = '';
diff --git a/src/Website/Mcp/View/Modal/RequestLog.php b/src/Website/Mcp/View/Modal/RequestLog.php
index 1bc6292..cac4380 100644
--- a/src/Website/Mcp/View/Modal/RequestLog.php
+++ b/src/Website/Mcp/View/Modal/RequestLog.php
@@ -12,7 +12,7 @@ use Core\Mcp\Models\McpApiRequest;
 /**
  * MCP Request Log - view and replay API requests.
  */
-#[Layout('components.layouts.mcp')]
+#[Layout('layouts::mcp')]
 class RequestLog extends Component
 {
     use WithPagination;
diff --git a/src/Website/Mcp/View/Modal/UnifiedSearch.php b/src/Website/Mcp/View/Modal/UnifiedSearch.php
index 03bf000..4130fe4 100644
--- a/src/Website/Mcp/View/Modal/UnifiedSearch.php
+++ b/src/Website/Mcp/View/Modal/UnifiedSearch.php
@@ -15,7 +15,7 @@ use Livewire\Component;
  * Single search interface across all system components:
  * MCP tools, API endpoints, patterns, assets, todos, and plans.
  */
-#[Layout('components.layouts.mcp')]
+#[Layout('layouts::mcp')]
 class UnifiedSearch extends Component
 {
     public string $query = '';