diff --git a/infra/stats.ts b/infra/stats.ts
index 28d50fe0e3..107e8b9f23 100644
--- a/infra/stats.ts
+++ b/infra/stats.ts
@@ -1,4 +1,5 @@
 import { lakeAthenaWorkgroup, lakeCatalog, lakeCluster, lakeQueryPermissions, lakeRegion, tableBucket } from "./lake"
+import { EMAILOCTOPUS_API_KEY } from "./app"
 
 const domain = (() => {
   if ($app.stage === "production") return "stats.opencode.ai"
@@ -163,15 +164,15 @@ new sst.x.DevCommand("StatsStudio", {
 // APP
 ////////////////
 
-// export const app = new sst.cloudflare.x.SolidStart("Stats", {
-//   path: "packages/stats/app",
-//   buildCommand: "bun run build",
-//   domain,
-//   link: [database],
-//   environment: {
-//     PUBLIC_URL: `https://${domain}`,
-//   },
-// })
+export const app = new sst.cloudflare.x.SolidStart("Stats", {
+  path: "packages/stats/app",
+  buildCommand: "bun run build",
+  domain,
+  link: [database, EMAILOCTOPUS_API_KEY],
+  environment: {
+    PUBLIC_URL: `https://${domain}/stats`,
+  },
+})
 
 ////////////////
 // SERVICES
diff --git a/packages/console/app/src/routes/stats/[...path].ts b/packages/console/app/src/routes/stats/[...path].ts
new file mode 100644
index 0000000000..326ff2c117
--- /dev/null
+++ b/packages/console/app/src/routes/stats/[...path].ts
@@ -0,0 +1,22 @@
+import type { APIEvent } from "@solidjs/start/server"
+import { Resource } from "@opencode-ai/console-resource"
+
+async function handler(evt: APIEvent) {
+  const req = evt.request.clone()
+  const url = new URL(req.url)
+  const host = Resource.App.stage === "production" ? "stats.opencode.ai" : "stats.dev.opencode.ai"
+  const targetUrl = `https://${host}${url.pathname}${url.search}`
+
+  return fetch(targetUrl, {
+    method: req.method,
+    headers: req.headers,
+    body: req.body,
+  })
+}
+
+export const GET = handler
+export const POST = handler
+export const PUT = handler
+export const DELETE = handler
+export const OPTIONS = handler
+export const PATCH = handler
diff --git a/packages/console/app/src/routes/stats/index.ts b/packages/console/app/src/routes/stats/index.ts
new file mode 100644
index 0000000000..326ff2c117
--- /dev/null
+++ b/packages/console/app/src/routes/stats/index.ts
@@ -0,0 +1,22 @@
+import type { APIEvent } from "@solidjs/start/server"
+import { Resource } from "@opencode-ai/console-resource"
+
+async function handler(evt: APIEvent) {
+  const req = evt.request.clone()
+  const url = new URL(req.url)
+  const host = Resource.App.stage === "production" ? "stats.opencode.ai" : "stats.dev.opencode.ai"
+  const targetUrl = `https://${host}${url.pathname}${url.search}`
+
+  return fetch(targetUrl, {
+    method: req.method,
+    headers: req.headers,
+    body: req.body,
+  })
+}
+
+export const GET = handler
+export const POST = handler
+export const PUT = handler
+export const DELETE = handler
+export const OPTIONS = handler
+export const PATCH = handler
diff --git a/packages/stats/app/src/app.tsx b/packages/stats/app/src/app.tsx
index 3a356119b0..976633f295 100644
--- a/packages/stats/app/src/app.tsx
+++ b/packages/stats/app/src/app.tsx
@@ -16,6 +16,7 @@ function AppMeta() {
 export default function App() {
   return (
     <Router
+      base={import.meta.env.BASE_URL.replace(/\/$/, "")}
       explicitLinks={true}
       root={(props) => (
         <MetaProvider>
diff --git a/packages/stats/app/src/routes/index.tsx b/packages/stats/app/src/routes/index.tsx
index 0b1a801e7c..5ee4f5f2ec 100644
--- a/packages/stats/app/src/routes/index.tsx
+++ b/packages/stats/app/src/routes/index.tsx
@@ -1213,7 +1213,7 @@ function Header() {
   return (
     <header data-component="top" data-menu-open={menuOpen() ? "true" : undefined}>
       <div data-slot="header-bar">
-        <a data-slot="brand" href="/" aria-label="OpenCode home">
+        <a data-slot="brand" href={import.meta.env.BASE_URL} aria-label="Stats home">
           <StatsWordmark />
         </a>
         <nav data-component="section-nav" aria-label="Stats sections">
@@ -1436,7 +1436,7 @@ function SubscribeModal(props: { onClose: () => void }) {
               event.preventDefault()
               setStatus("pending")
               setMessage("")
-              fetch("/api/newsletter", {
+              fetch(`${import.meta.env.BASE_URL}api/newsletter`, {
                 method: "POST",
                 body: new FormData(event.currentTarget),
               }).then(
diff --git a/packages/stats/app/src/routes/stats/api/health.ts b/packages/stats/app/src/routes/stats/api/health.ts
new file mode 100644
index 0000000000..b0947eab79
--- /dev/null
+++ b/packages/stats/app/src/routes/stats/api/health.ts
@@ -0,0 +1 @@
+export { GET } from "../../api/health"
diff --git a/packages/stats/app/src/routes/stats/api/newsletter.ts b/packages/stats/app/src/routes/stats/api/newsletter.ts
new file mode 100644
index 0000000000..5ed523e30c
--- /dev/null
+++ b/packages/stats/app/src/routes/stats/api/newsletter.ts
@@ -0,0 +1 @@
+export { POST } from "../../api/newsletter"
diff --git a/packages/stats/app/vite.config.ts b/packages/stats/app/vite.config.ts
index 573939143f..adf384871b 100644
--- a/packages/stats/app/vite.config.ts
+++ b/packages/stats/app/vite.config.ts
@@ -3,6 +3,7 @@ import { nitro } from "nitro/vite"
 import { defineConfig, type PluginOption } from "vite"
 
 export default defineConfig({
+  base: "/stats/",
   plugins: [
     solidStart() as PluginOption,
     nitro({
diff --git a/sst.config.ts b/sst.config.ts
index 550f91c6f3..a159fa3041 100644
--- a/sst.config.ts
+++ b/sst.config.ts
@@ -30,10 +30,7 @@ export default $config({
   async run() {
     const stage = await import("./infra/stage.js")
     await import("./infra/app.js")
-    if (stage.deployAws) {
-      await import("./infra/lake.js")
-      await import("./infra/stats.js")
-    }
+    const stats = stage.deployAws ? await import("./infra/lake.js").then(() => import("./infra/stats.js")) : undefined
     const { stat } = await import("./infra/console.js")
     await import("./infra/enterprise.js")
     if ($app.stage === "production" || $app.stage === "vimtor") {
@@ -42,7 +39,7 @@ export default $config({
 
     return {
       StatWorkerUrl: stat.url,
-      // StatsUrl: stats.app.url,
+      ...(stats ? { StatsUrl: stats.app.url } : {}),
       AwsStage: stage.awsStage,
     }
   },