diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a8c173..1438d3b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,6 +119,8 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Build all packages
+        env:
+          VITE_API_URL: ""
         run: pnpm build
 
   docker:
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
index eb110fa..f551990 100644
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -11,6 +11,8 @@ RUN pnpm install --frozen-lockfile
 
 # Build
 FROM deps AS builder
+ARG VITE_API_URL=
+ENV VITE_API_URL=
 COPY packages/types/ packages/types/
 COPY apps/web/ apps/web/
 RUN pnpm --filter @groombook/web build
diff --git a/apps/web/src/lib/auth-client.ts b/apps/web/src/lib/auth-client.ts
index 6a9939a..7c5db68 100644
--- a/apps/web/src/lib/auth-client.ts
+++ b/apps/web/src/lib/auth-client.ts
@@ -1,7 +1,7 @@
 import { createAuthClient } from "better-auth/react";
 
 export const authClient = createAuthClient({
-  baseURL: import.meta.env.VITE_API_URL ?? "",
+  baseURL: import.meta.env.VITE_API_URL || window.location.origin,
 });
 
 export const { signIn, signOut, useSession, changePassword } = authClient;
\ No newline at end of file