diff --git a/next.config.ts b/next.config.ts
index 03427940b..5cea33c68 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -109,7 +109,7 @@ let nextConfig: NextConfig = {
 };
 
 // Validate environment variables, if set at build time. Will be actually read and used at runtime.
-import { verifyBuildTimeVars } from '~/server/env';
+import { verifyBuildTimeVars } from '~/server/env.server';
 verifyBuildTimeVars();
 
 // PostHog error reporting with source maps for production builds
diff --git a/src/modules/backend/backend.router.ts b/src/modules/backend/backend.router.ts
index af85096de..e0bb6479d 100644
--- a/src/modules/backend/backend.router.ts
+++ b/src/modules/backend/backend.router.ts
@@ -3,7 +3,7 @@ import * as z from 'zod/v4';
 import { Release } from '~/common/app.release';
 
 import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server';
-import { env } from '~/server/env';
+import { env } from '~/server/env.server';
 import { fetchJsonOrTRPCThrow } from '~/server/trpc/trpc.router.fetchers';
 
 // critical to make sure we `import type` here
diff --git a/src/modules/browse/browse.router.ts b/src/modules/browse/browse.router.ts
index 7b0f3d094..3b1d30c51 100644
--- a/src/modules/browse/browse.router.ts
+++ b/src/modules/browse/browse.router.ts
@@ -6,7 +6,7 @@ import { default as TurndownService } from 'turndown';
 import { load as cheerioLoad } from 'cheerio';
 
 import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server';
-import { env } from '~/server/env';
+import { env } from '~/server/env.server';
 
 import { workerPuppeteerDownloadFileOrThrow } from './browse.files';
 
diff --git a/src/modules/elevenlabs/elevenlabs.router.ts b/src/modules/elevenlabs/elevenlabs.router.ts
index 942036490..894be50d0 100644
--- a/src/modules/elevenlabs/elevenlabs.router.ts
+++ b/src/modules/elevenlabs/elevenlabs.router.ts
@@ -1,7 +1,7 @@
 import * as z from 'zod/v4';
 
 import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server';
-import { env } from '~/server/env';
+import { env } from '~/server/env.server';
 import { fetchJsonOrTRPCThrow, fetchResponseOrTRPCThrow } from '~/server/trpc/trpc.router.fetchers';
 
 
diff --git a/src/modules/google/search.router.ts b/src/modules/google/search.router.ts
index b251242f3..7b30238b5 100644
--- a/src/modules/google/search.router.ts
+++ b/src/modules/google/search.router.ts
@@ -2,7 +2,7 @@ import { TRPCError } from '@trpc/server';
 import * as z from 'zod/v4';
 
 import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server';
-import { env } from '~/server/env';
+import { env } from '~/server/env.server';
 import { fetchJsonOrTRPCThrow } from '~/server/trpc/trpc.router.fetchers';
 
 import { Search } from './search.types';
diff --git a/src/modules/llms/server/anthropic/anthropic.router.ts b/src/modules/llms/server/anthropic/anthropic.router.ts
index 9f97ef9bc..c5184fd8a 100644
--- a/src/modules/llms/server/anthropic/anthropic.router.ts
+++ b/src/modules/llms/server/anthropic/anthropic.router.ts
@@ -2,7 +2,7 @@ import * as z from 'zod/v4';
 import { TRPCError } from '@trpc/server';
 
 import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server';
-import { env } from '~/server/env';
+import { env } from '~/server/env.server';
 import { fetchJsonOrTRPCThrow } from '~/server/trpc/trpc.router.fetchers';
 
 import { ListModelsResponse_schema } from '../llm.server.types';
diff --git a/src/modules/llms/server/gemini/gemini.router.ts b/src/modules/llms/server/gemini/gemini.router.ts
index 9d8d8130a..083f95788 100644
--- a/src/modules/llms/server/gemini/gemini.router.ts
+++ b/src/modules/llms/server/gemini/gemini.router.ts
@@ -1,6 +1,6 @@
 import * as z from 'zod/v4';
 import { TRPCError } from '@trpc/server';
-import { env } from '~/server/env';
+import { env } from '~/server/env.server';
 
 import packageJson from '../../../../../package.json';
 
diff --git a/src/modules/llms/server/ollama/ollama.router.ts b/src/modules/llms/server/ollama/ollama.router.ts
index 37fc1394d..aea565fa2 100644
--- a/src/modules/llms/server/ollama/ollama.router.ts
+++ b/src/modules/llms/server/ollama/ollama.router.ts
@@ -2,7 +2,7 @@ import * as z from 'zod/v4';
 import { TRPCError } from '@trpc/server';
 
 import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server';
-import { env } from '~/server/env';
+import { env } from '~/server/env.server';
 import { fetchTextOrTRPCThrow } from '~/server/trpc/trpc.router.fetchers';
 import { serverCapitalizeFirstLetter } from '~/server/wire';
 
diff --git a/src/modules/llms/server/openai/models/azure.models.ts b/src/modules/llms/server/openai/models/azure.models.ts
index 95bd207be..410972ef8 100644
--- a/src/modules/llms/server/openai/models/azure.models.ts
+++ b/src/modules/llms/server/openai/models/azure.models.ts
@@ -1,7 +1,7 @@
 import * as z from 'zod/v4';
 import { TRPCError } from '@trpc/server';
 
-import { env } from '~/server/env';
+import { env } from '~/server/env.server';
 
 // import { LLM_IF_HOTFIX_NoTemperature, LLM_IF_OAI_Chat, LLM_IF_OAI_Fn, LLM_IF_OAI_Json, LLM_IF_OAI_Vision } from '~/common/stores/llms/llms.types';
 import { LLM_IF_OAI_Chat } from '~/common/stores/llms/llms.types';
diff --git a/src/modules/llms/server/openai/openai.router.ts b/src/modules/llms/server/openai/openai.router.ts
index 1a298c6c3..7af938df4 100644
--- a/src/modules/llms/server/openai/openai.router.ts
+++ b/src/modules/llms/server/openai/openai.router.ts
@@ -2,7 +2,7 @@ import * as z from 'zod/v4';
 import { TRPCError } from '@trpc/server';
 
 import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server';
-import { env } from '~/server/env';
+import { env } from '~/server/env.server';
 import { fetchJsonOrTRPCThrow, TRPCFetcherError } from '~/server/trpc/trpc.router.fetchers';
 import { serverCapitalizeFirstLetter } from '~/server/wire';
 
diff --git a/src/server/env.ts b/src/server/env.server.ts
similarity index 100%
rename from src/server/env.ts
rename to src/server/env.server.ts