diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index cb6ab55aad5b..77e6f9d5e507 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -4,7 +4,7 @@ import { useEffect } from "react";
 import { TooltipProvider } from "@radix-ui/react-tooltip";
 import { setEnv } from "../packages/feature-flags/src/index";
 import { theme, globalCss } from "../packages/design-system/src/index";
-import { color } from "../packages/design-system/src/__generated__/figma-design-tokens";
+import { color } from "../packages/design-system/src/design-tokens";
 
 // this adds <style> tags to the <head> of the document
 import "@fontsource-variable/inter";
diff --git a/apps/builder/e2e/serve-built-remix.ts b/apps/builder/e2e/serve-built-remix.ts
index b239d6818c1b..84ac84be21d6 100644
--- a/apps/builder/e2e/serve-built-remix.ts
+++ b/apps/builder/e2e/serve-built-remix.ts
@@ -2,7 +2,7 @@ import { installGlobals } from "@remix-run/node";
 import { createRequestHandler as createExpressRequestHandler } from "@remix-run/express";
 import type { ServerBuild } from "@remix-run/server-runtime";
 import express from "express";
-import { readdirSync, readFileSync } from "node:fs";
+import { existsSync, readdirSync, readFileSync } from "node:fs";
 import https from "node:https";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
@@ -11,6 +11,14 @@ installGlobals({ nativeFetch: true });
 
 const resolveServerBuildPath = () => {
   const serverDirectory = path.resolve("build/server");
+
+  // Standard Vite build (no vercelPreset): index.js is at the root of build/server/
+  const directEntry = path.join(serverDirectory, "index.js");
+  if (existsSync(directEntry)) {
+    return directEntry;
+  }
+
+  // Vercel preset build: index.js lives inside a hash-named subdirectory
   const serverBuild = readdirSync(serverDirectory, {
     withFileTypes: true,
   }).find((entry) => entry.isDirectory());
