diff --git a/apps/web/package.json b/apps/web/package.json
index b66a8ee..ed08734 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -19,6 +19,8 @@
     "@ffmpeg/util": "^0.12.2",
     "@hello-pangea/dnd": "^18.0.1",
     "@hookform/resolvers": "^3.9.1",
+    "@opencut/auth": "workspace:*",
+    "@opencut/db": "workspace:*",
     "@types/pg": "^8.15.4",
     "@upstash/ratelimit": "^2.0.5",
     "@upstash/redis": "^1.35.0",
diff --git a/apps/web/src/app/api/auth/[...all]/route.ts b/apps/web/src/app/api/auth/[...all]/route.ts
index 1fb5744..393fb7e 100644
--- a/apps/web/src/app/api/auth/[...all]/route.ts
+++ b/apps/web/src/app/api/auth/[...all]/route.ts
@@ -1,4 +1,4 @@
-import { auth } from "@/lib/auth";
+import { auth } from "@opencut/auth/server";
 import { toNextJsHandler } from "better-auth/next-js";
 
 export const { POST, GET } = toNextJsHandler(auth);
\ No newline at end of file
diff --git a/apps/web/src/components/auth-form.tsx b/apps/web/src/components/auth-form.tsx
index 3dd5603..72bddd3 100644
--- a/apps/web/src/components/auth-form.tsx
+++ b/apps/web/src/components/auth-form.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useRouter } from "next/navigation";
-import { signUp, signIn } from "@/lib/auth-client";
+import { signUp, signIn } from "@opencut/auth/client";
 import { Button } from "@/components/ui/button";
 import {
   Card,
diff --git a/apps/web/src/components/header.tsx b/apps/web/src/components/header.tsx
index 9f842b2..d1e0518 100644
--- a/apps/web/src/components/header.tsx
+++ b/apps/web/src/components/header.tsx
@@ -5,7 +5,7 @@ import Image from "next/image";
 import { Button } from "./ui/button";
 import { ArrowRight } from "lucide-react";
 import { HeaderBase } from "./header-base";
-import { useSession } from "@/lib/auth-client";
+import { useSession } from "@opencut/auth/client";
 import { getStars } from "@/lib/fetchGhStars";
 import { Star } from "lucide-react";
 import { useEffect, useState } from "react";
diff --git a/apps/web/src/lib/auth-client.ts b/apps/web/src/lib/auth-client.ts
deleted file mode 100644
index 1ab4e63..0000000
--- a/apps/web/src/lib/auth-client.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { createAuthClient } from "better-auth/react";
-export const { signIn, signUp, useSession } = createAuthClient({
-  baseURL: process.env.NEXT_PUBLIC_BETTER_AUTH_URL!,
-});
diff --git a/apps/web/src/lib/auth.ts b/apps/web/src/lib/auth.ts
deleted file mode 100644
index d0175c9..0000000
--- a/apps/web/src/lib/auth.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { betterAuth } from "better-auth";
-import { drizzleAdapter } from "better-auth/adapters/drizzle";
-import { db } from "./db";
-
-export const auth = betterAuth({
-  database: drizzleAdapter(db, {
-    provider: "pg",
-    usePlural: true,
-  }),
-  secret: process.env.BETTER_AUTH_SECRET!,
-  user: {
-    deleteUser: {
-      enabled: true,
-    },
-  },
-  emailAndPassword: {
-    enabled: true,
-  },
-  socialProviders: {  
-    google: {
-      clientId: process.env.GOOGLE_CLIENT_ID as string,
-      clientSecret: process.env.GOOGLE_CLIENT_SECRET as string,
-    },
-  },
-  appName: "OpenCut",
-  trustedOrigins: ["http://localhost:3000"],
-});
-
-export type Auth = typeof auth;
diff --git a/bun.lockb b/bun.lockb
index 2f51e8f..2871b5e 100644
Binary files a/bun.lockb and b/bun.lockb differ