diff --git a/app/server/core/config.ts b/app/server/core/config.ts
index a2d81db2..371a8b0e 100644
--- a/app/server/core/config.ts
+++ b/app/server/core/config.ts
@@ -48,7 +48,7 @@ const envSchema = type({
 	appVersion: s.APP_VERSION,
 	trustedOrigins: s.TRUSTED_ORIGINS?.split(",")
 		.map((origin) => origin.trim())
-		.push(s.BASE_URL) ?? [s.BASE_URL],
+		.concat(s.BASE_URL) ?? [s.BASE_URL],
 	disableRateLimiting: s.DISABLE_RATE_LIMITING === "true",
 	appSecret: s.APP_SECRET,
 	baseUrl: s.BASE_URL,
diff --git a/app/server/lib/auth.ts b/app/server/lib/auth.ts
index eb40499e..3cbb2855 100644
--- a/app/server/lib/auth.ts
+++ b/app/server/lib/auth.ts
@@ -23,7 +23,7 @@ export type AuthMiddlewareContext = MiddlewareContext<MiddlewareOptions, AuthCon
 const createBetterAuth = (secret: string) => {
 	return betterAuth({
 		secret,
-		baseURL: "http://localhost:3000",
+		baseURL: config.baseUrl,
 		trustedOrigins: config.trustedOrigins,
 		advanced: {
 			cookiePrefix: "zerobyte",
diff --git a/package.json b/package.json
index 6ab400db..ba020b79 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
 		"start": "bun run .output/server/index.mjs",
 		"preview": "bunx --bun vite preview",
 		"cli:dev": "bun run app/server/cli/main.ts",
-		"cli": "ZEROBYTE_CLI=1 bun ./dist/server/index.js",
+		"cli": "ZEROBYTE_CLI=1 bun .output/server/_ssr/index.mjs",
 		"tsc": "tsc --noEmit",
 		"start:dev": "docker compose down && docker compose up --build zerobyte-dev",
 		"start:prod": "docker compose down && docker compose up --build zerobyte-prod",