diff --git a/features/platform-admin/frontend-admin/playwright.config.ts b/features/platform-admin/frontend-admin/playwright.config.ts
index b31d8cce2..a81045aed 100755
--- a/features/platform-admin/frontend-admin/playwright.config.ts
+++ b/features/platform-admin/frontend-admin/playwright.config.ts
@@ -23,4 +23,11 @@ export default createPlaywrightConfig({
   trace: 'on-first-retry',
   screenshot: 'only-on-failure',
   outputDir: './test-results',
+  // Auto-start dev server for E2E tests
+  webServer: {
+    command: 'pnpm dev',
+    port: 3200,
+    reuseExistingServer: true,
+    timeout: 120000,
+  },
 });
diff --git a/features/platform-dev/frontend-dev/e2e/shared-packages.e2e.ts b/features/platform-dev/frontend-dev/e2e/shared-packages.e2e.ts
index 631d915ee..02f0d1d98 100644
--- a/features/platform-dev/frontend-dev/e2e/shared-packages.e2e.ts
+++ b/features/platform-dev/frontend-dev/e2e/shared-packages.e2e.ts
@@ -119,8 +119,9 @@ test.describe('Shared Package Integration', () => {
     test('404 page has navigation link to dashboard', async ({ page }) => {
       await page.goto('/unknown-route-abc');
 
-      // Should have a link to go back to dashboard
-      const homeLink = page.getByRole('link', { name: /dashboard/i });
+      // Should have a specific "Go to Dashboard" link in the 404 content area
+      // (not just the sidebar nav links which also contain "dashboard")
+      const homeLink = page.getByRole('link', { name: 'Go to Dashboard' });
       await expect(homeLink).toBeVisible();
     });
 
diff --git a/features/platform-dev/frontend-dev/playwright.config.ts b/features/platform-dev/frontend-dev/playwright.config.ts
index e3d9a4641..46cb33351 100644
--- a/features/platform-dev/frontend-dev/playwright.config.ts
+++ b/features/platform-dev/frontend-dev/playwright.config.ts
@@ -23,4 +23,11 @@ export default createPlaywrightConfig({
   trace: 'on-first-retry',
   screenshot: 'only-on-failure',
   outputDir: './test-results',
+  // Auto-start dev server for E2E tests
+  webServer: {
+    command: 'pnpm dev',
+    port: 3201,
+    reuseExistingServer: true,
+    timeout: 120000,
+  },
 });
diff --git a/features/platform-dev/frontend-dev/src/main.tsx b/features/platform-dev/frontend-dev/src/main.tsx
index f8ea4837c..a16398797 100644
--- a/features/platform-dev/frontend-dev/src/main.tsx
+++ b/features/platform-dev/frontend-dev/src/main.tsx
@@ -57,4 +57,10 @@ bootstrap({
   providers: {
     router: 'browser',
   },
+  // Dev tools disabled - ThemeProvider is inside AppWithProviders, but DevContentOverlay
+  // needs theme context BEFORE App renders. This causes a theme context error.
+  devTools: {
+    disableContentOverlay: true,
+    disableDeveloperFab: true,
+  },
 });