diff --git a/frontend/src/lib/db/index.ts b/frontend/src/lib/db/index.ts
index 6f55487..758392d 100644
--- a/frontend/src/lib/db/index.ts
+++ b/frontend/src/lib/db/index.ts
@@ -1,6 +1,7 @@
 import { drizzle } from 'drizzle-orm/postgres-js'
 import postgres from 'postgres'
 import * as schema from './schema'
+import { env } from '$env/dynamic/private'
 
-const client = postgres(Bun.env.DATABASE_URL ?? '')
+const client = postgres(env.DATABASE_URL)
 export const db = drizzle(client, { schema })
diff --git a/frontend/src/lib/env.ts b/frontend/src/lib/env.ts
deleted file mode 100644
index 11f0226..0000000
--- a/frontend/src/lib/env.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { z } from 'zod'
-
-const envSchema = z.object({
-	DATABASE_URL: z.string().url(),
-	PUBLIC_SHORTENER_URL: z.string(),
-})
-
-export const env = envSchema.parse(process.env)
diff --git a/frontend/src/routes/(app)/+layout.server.ts b/frontend/src/routes/(app)/+layout.server.ts
index e37f39e..907dd6a 100644
--- a/frontend/src/routes/(app)/+layout.server.ts
+++ b/frontend/src/routes/(app)/+layout.server.ts
@@ -1,3 +1,4 @@
+import { env } from '$env/dynamic/public'
 import type { LayoutServerLoad } from './$types'
 
 export const load = (async (event) => {
@@ -8,7 +9,7 @@ export const load = (async (event) => {
 	const page_title = 'Home'
 
 	return {
-		shortener_url: Bun.env.PUBLIC_SHORTENER_URL ?? '',
+		shortener_url: env.PUBLIC_SHORTENER_URL,
 		user: user,
 		breadcrumbs,
 		page_title,
diff --git a/frontend/src/routes/(auth)/login/+page.server.ts b/frontend/src/routes/(auth)/login/+page.server.ts
index a930f9d..4b53936 100644
--- a/frontend/src/routes/(auth)/login/+page.server.ts
+++ b/frontend/src/routes/(auth)/login/+page.server.ts
@@ -7,6 +7,7 @@ import { db } from '$lib/db'
 import { user as userSchema } from '$lib/db/schema'
 import { eq } from 'drizzle-orm'
 import { lucia } from '$lib/server/auth'
+import { env } from '$env/dynamic/private'
 
 export const load = (async (event) => {
 	return {
@@ -44,7 +45,7 @@ export const actions: Actions = {
 		event.cookies.set(sessionCookie.name, sessionCookie.value, {
 			...sessionCookie.attributes,
 			path: '/',
-			secure: Bun.env.APP_ENV === 'prod',
+			secure: env.APP_ENV === 'prod',
 		})
 
 		return {
diff --git a/frontend/src/routes/(auth)/signup/+page.server.ts b/frontend/src/routes/(auth)/signup/+page.server.ts
index 88f2b85..ecb7e2f 100644
--- a/frontend/src/routes/(auth)/signup/+page.server.ts
+++ b/frontend/src/routes/(auth)/signup/+page.server.ts
@@ -7,6 +7,7 @@ import { db } from '$lib/db'
 import { user as userSchema } from '$lib/db/schema'
 import { eq } from 'drizzle-orm'
 import { lucia } from '$lib/server/auth'
+import { env } from '$env/dynamic/private'
 
 export const load = (async (event) => {
 	return {
@@ -53,7 +54,7 @@ export const actions: Actions = {
 		event.cookies.set(sessionCookie.name, sessionCookie.value, {
 			...sessionCookie.attributes,
 			path: '/',
-			secure: Bun.env.APP_ENV === 'prod',
+			secure: env.APP_ENV === 'prod',
 		})
 
 		return {
diff --git a/frontend/src/routes/api/logout/+server.ts b/frontend/src/routes/api/logout/+server.ts
index b7305d3..97d55f9 100644
--- a/frontend/src/routes/api/logout/+server.ts
+++ b/frontend/src/routes/api/logout/+server.ts
@@ -1,3 +1,4 @@
+import { env } from '$env/dynamic/private'
 import { lucia } from '$lib/server/auth'
 import type { RequestHandler } from './$types'
 
@@ -19,7 +20,7 @@ export const POST: RequestHandler = async (event) => {
 	event.cookies.set(sessionCookie.name, sessionCookie.value, {
 		...sessionCookie.attributes,
 		path: '/',
-		secure: Bun.env.APP_ENV === 'prod',
+		secure: env.APP_ENV === 'prod',
 	})
 	return new Response(JSON.stringify({ success: true }))
 }
diff --git a/frontend/src/routes/api/shortener/[id]/qr/+server.ts b/frontend/src/routes/api/shortener/[id]/qr/+server.ts
index f9f244e..62df27c 100644
--- a/frontend/src/routes/api/shortener/[id]/qr/+server.ts
+++ b/frontend/src/routes/api/shortener/[id]/qr/+server.ts
@@ -4,8 +4,9 @@ import { eq } from 'drizzle-orm'
 import type { RequestHandler } from './$types'
 import QRCode from 'qrcode'
 import { redirect } from '@sveltejs/kit'
+import { env } from '$env/dynamic/private'
 
-const shortenerUrl = Bun.env.PUBLIC_SHORTENER_URL ?? ''
+const shortenerUrl = env.PUBLIC_SHORTENER_URL
 
 export const GET: RequestHandler = async (event) => {
 	const shortenerId = event.params.id