diff --git a/apps/server/src/api/v2/chats/[id]/screenshot/GET.ts b/apps/server/src/api/v2/chats/[id]/screenshot/GET.ts
index 03da5516e..bf5ad0eae 100644
--- a/apps/server/src/api/v2/chats/[id]/screenshot/GET.ts
+++ b/apps/server/src/api/v2/chats/[id]/screenshot/GET.ts
@@ -4,7 +4,7 @@ import {
   GetChatScreenshotParamsSchema,
   GetChatScreenshotQuerySchema,
 } from '@buster/server-shared/screenshots';
-import { getChatScreenshot } from '@buster/server-shared/screenshots';
+import { getChatScreenshot } from '@buster/server-shared/screenshots/methods';
 import { zValidator } from '@hono/zod-validator';
 import { Hono } from 'hono';
 import { HTTPException } from 'hono/http-exception';
diff --git a/apps/server/src/api/v2/dashboards/[id]/screenshot/GET.ts b/apps/server/src/api/v2/dashboards/[id]/screenshot/GET.ts
index 171d05a87..27c70025c 100644
--- a/apps/server/src/api/v2/dashboards/[id]/screenshot/GET.ts
+++ b/apps/server/src/api/v2/dashboards/[id]/screenshot/GET.ts
@@ -4,7 +4,7 @@ import {
   GetDashboardScreenshotParamsSchema,
   GetDashboardScreenshotQuerySchema,
 } from '@buster/server-shared/screenshots';
-import { getDashboardScreenshot } from '@buster/server-shared/screenshots';
+import { getDashboardScreenshot } from '@buster/server-shared/screenshots/methods';
 import { zValidator } from '@hono/zod-validator';
 import { Hono } from 'hono';
 import { HTTPException } from 'hono/http-exception';
diff --git a/apps/server/src/api/v2/metric_files/[id]/screenshot/GET.ts b/apps/server/src/api/v2/metric_files/[id]/screenshot/GET.ts
index c7f8aaac1..2cc9b2860 100644
--- a/apps/server/src/api/v2/metric_files/[id]/screenshot/GET.ts
+++ b/apps/server/src/api/v2/metric_files/[id]/screenshot/GET.ts
@@ -4,7 +4,7 @@ import {
   GetMetricScreenshotParamsSchema,
   GetMetricScreenshotQuerySchema,
 } from '@buster/server-shared/screenshots';
-import { getMetricScreenshot } from '@buster/server-shared/screenshots';
+import { getMetricScreenshot } from '@buster/server-shared/screenshots/methods';
 import { zValidator } from '@hono/zod-validator';
 import { createImageResponse } from '@shared-helpers/create-image-response';
 import { Hono } from 'hono';
diff --git a/apps/trigger/src/tasks/screenshots/schemas.ts b/apps/trigger/src/tasks/screenshots/schemas.ts
index 1168ef4b4..43d72eb52 100644
--- a/apps/trigger/src/tasks/screenshots/schemas.ts
+++ b/apps/trigger/src/tasks/screenshots/schemas.ts
@@ -3,7 +3,7 @@ import {
   GetDashboardScreenshotHandlerArgsSchema,
   GetMetricScreenshotHandlerArgsSchema,
   GetReportScreenshotHandlerArgsSchema,
-} from '@buster/server-shared/screenshots';
+} from '@buster/server-shared/screenshots/methods';
 import { z } from 'zod';
 
 export const TakeMetricScreenshotTriggerSchema = GetMetricScreenshotHandlerArgsSchema.extend({
diff --git a/apps/trigger/src/tasks/screenshots/take-chat-screenshot-handler.ts b/apps/trigger/src/tasks/screenshots/take-chat-screenshot-handler.ts
index e962ff077..8df486839 100644
--- a/apps/trigger/src/tasks/screenshots/take-chat-screenshot-handler.ts
+++ b/apps/trigger/src/tasks/screenshots/take-chat-screenshot-handler.ts
@@ -1,6 +1,5 @@
-import { getChatScreenshot } from '@buster/server-shared/screenshots';
+import { getChatScreenshot } from '@buster/server-shared/screenshots/methods';
 import { logger, schemaTask } from '@trigger.dev/sdk';
-import dayjs from 'dayjs';
 import { TakeChartScreenshotTriggerSchema } from './schemas';
 import { screenshots_task_keys } from './task-keys';
 import { uploadScreenshotHandler } from './upload-screenshot-handler';
diff --git a/apps/trigger/src/tasks/screenshots/take-dashboard-screenshot-handler.ts b/apps/trigger/src/tasks/screenshots/take-dashboard-screenshot-handler.ts
index d57db347d..98b72df1f 100644
--- a/apps/trigger/src/tasks/screenshots/take-dashboard-screenshot-handler.ts
+++ b/apps/trigger/src/tasks/screenshots/take-dashboard-screenshot-handler.ts
@@ -1,5 +1,5 @@
 import { hasDashboardScreenshotBeenTakenWithin } from '@buster/database/queries';
-import { getDashboardScreenshot } from '@buster/server-shared/screenshots';
+import { getDashboardScreenshot } from '@buster/server-shared/screenshots/methods';
 import { logger, schemaTask } from '@trigger.dev/sdk';
 import dayjs from 'dayjs';
 import { TakeDashboardScreenshotTriggerSchema } from './schemas';
diff --git a/apps/trigger/src/tasks/screenshots/take-metric-screenshot-handler.ts b/apps/trigger/src/tasks/screenshots/take-metric-screenshot-handler.ts
index 7a92a9fea..8152a0530 100644
--- a/apps/trigger/src/tasks/screenshots/take-metric-screenshot-handler.ts
+++ b/apps/trigger/src/tasks/screenshots/take-metric-screenshot-handler.ts
@@ -1,5 +1,5 @@
 import { hasMetricScreenshotBeenTakenWithin } from '@buster/database/queries';
-import { getMetricScreenshot } from '@buster/server-shared/screenshots';
+import { getMetricScreenshot } from '@buster/server-shared/screenshots/methods';
 import { logger, schemaTask } from '@trigger.dev/sdk';
 import dayjs from 'dayjs';
 import { TakeMetricScreenshotTriggerSchema } from './schemas';
diff --git a/apps/trigger/src/tasks/screenshots/take-report-screenshot-handler.ts b/apps/trigger/src/tasks/screenshots/take-report-screenshot-handler.ts
index 67a890345..de36f197a 100644
--- a/apps/trigger/src/tasks/screenshots/take-report-screenshot-handler.ts
+++ b/apps/trigger/src/tasks/screenshots/take-report-screenshot-handler.ts
@@ -1,5 +1,5 @@
 import { hasReportScreenshotBeenTakenWithin } from '@buster/database/queries';
-import { getReportScreenshot } from '@buster/server-shared/screenshots';
+import { getReportScreenshot } from '@buster/server-shared/screenshots/methods';
 import { logger, schemaTask } from '@trigger.dev/sdk';
 import dayjs from 'dayjs';
 import { TakeReportScreenshotTriggerSchema } from './schemas';
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index 0e415e96f..50f5db65a 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -34,6 +34,9 @@ const config = defineConfig(({ command, mode }) => {
       'import.meta.env.VITE_BUILD_ID': JSON.stringify(buildId),
       'import.meta.env.VITE_BUILD_AT': JSON.stringify(buildAt),
     },
+    optimizeDeps: {
+      exclude: ['playwright-core', 'chromium-bidi'],
+    },
     plugins: [
       // this is the plugin that enables path aliases
       tsConfigPaths({ projects: ['./tsconfig.json'] }),
diff --git a/packages/server-shared/package.json b/packages/server-shared/package.json
index f0cbeefe2..81d34382c 100644
--- a/packages/server-shared/package.json
+++ b/packages/server-shared/package.json
@@ -108,6 +108,10 @@
       "types": "./dist/screenshots/index.d.ts",
       "default": "./dist/screenshots/index.js"
     },
+    "./screenshots/methods": {
+      "types": "./dist/screenshots/methods/index.d.ts",
+      "default": "./dist/screenshots/methods/index.js"
+    },
     "./library": {
       "types": "./dist/library/index.d.ts",
       "default": "./dist/library/index.js"
diff --git a/packages/server-shared/src/screenshots/index.ts b/packages/server-shared/src/screenshots/index.ts
index 8d25088f1..e21ddf45b 100644
--- a/packages/server-shared/src/screenshots/index.ts
+++ b/packages/server-shared/src/screenshots/index.ts
@@ -4,4 +4,3 @@ export * from './requests.dashboards';
 export * from './requests.reports';
 export * from './requests.chats';
 export * from './requests.base';
-export * from './methods';