diff --git a/app/(auth)/signin/page.tsx b/app/(auth)/signin/page.tsx
index 2659ca6..fb65111 100644
--- a/app/(auth)/signin/page.tsx
+++ b/app/(auth)/signin/page.tsx
@@ -2,7 +2,7 @@ import { Metadata } from "next"
 import { redirect } from "next/navigation"
 import { UserAuthForm } from "@/components/modules/auth/UserAuthForm"
 import { getCurrentSession } from "@/lib/session"
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs"
+import { createClient } from "@/lib/supabase/server"
 import { cookies } from "next/headers"
 import { Heading3 } from "@/components/ui/typography"
 import { siteConfig } from "@/config/site"
@@ -12,13 +12,12 @@ export const metadata: Metadata = {
   description: "Sigin to your account",
 }
 
+export const runtime = "edge"
 export const dynamic = 'force-dynamic'
 
 export default async function LoginPage() {
   const cookieStore = cookies()
-  const supabase = createServerComponentClient({
-    cookies: () => cookieStore,
-  })
+  const supabase = createClient(cookieStore)
   const session = await getCurrentSession(supabase)
 
   if (session) {
diff --git a/app/(auth)/signup/page.tsx b/app/(auth)/signup/page.tsx
index 56f66e9..0428aa5 100644
--- a/app/(auth)/signup/page.tsx
+++ b/app/(auth)/signup/page.tsx
@@ -1,12 +1,13 @@
 import { Metadata } from "next"
 import { redirect } from "next/navigation"
 import { UserSignupForm } from "@/components/modules/auth/UserSignupForm"
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs"
+import { createClient } from "@/lib/supabase/server"
 import { getCurrentSession } from "@/lib/session"
 import { cookies } from "next/headers"
 import { Heading3 } from "@/components/ui/typography"
 import { siteConfig } from "@/config/site"
 
+export const runtime = "edge"
 export const metadata: Metadata = {
   title: "Signup",
   description: "Signup a new account",
@@ -16,9 +17,7 @@ export const dynamic = 'force-dynamic'
 
 export default async function LoginPage() {
   const cookieStore = cookies()
-  const supabase = createServerComponentClient({
-    cookies: () => cookieStore,
-  })
+  const supabase = createClient(cookieStore)
   const session = await getCurrentSession(supabase)
 
   if (session) {
diff --git a/app/api/auth/callback/route.ts b/app/api/auth/callback/route.ts
index b0bda1b..9927c7a 100644
--- a/app/api/auth/callback/route.ts
+++ b/app/api/auth/callback/route.ts
@@ -1,17 +1,20 @@
-import { createRouteHandlerClient } from '@supabase/auth-helpers-nextjs'
+import { NextResponse } from 'next/server'
 import { cookies } from 'next/headers'
-import { NextRequest, NextResponse } from 'next/server'
+import { createClient } from '@/lib/supabase/server'
 
-export const dynamic = 'force-dynamic'
-
-export async function GET(req: NextRequest) {
-  const supabase = createRouteHandlerClient({ cookies })
-  const { searchParams } = new URL(req.url)
-  const code = searchParams.get('code')
+export async function GET(request: Request) {
+  // The `/auth/callback` route is required for the server-side auth flow implemented
+  // by the Auth Helpers package. It exchanges an auth code for the user's session.
+  // https://supabase.com/docs/guides/auth/auth-helpers/nextjs#managing-sign-in-with-code-exchange
+  const requestUrl = new URL(request.url)
+  const code = requestUrl.searchParams.get('code')
 
   if (code) {
+    const cookieStore = cookies()
+    const supabase = createClient(cookieStore)
     await supabase.auth.exchangeCodeForSession(code)
   }
 
-  return NextResponse.redirect(new URL('/apps/chat', req.url))
-}
\ No newline at end of file
+  // URL to redirect to after sign in process completes
+  return NextResponse.redirect(requestUrl.origin)
+}
diff --git a/app/api/auth/logout/route.ts b/app/api/auth/logout/route.ts
index e82e013..d7347dc 100644
--- a/app/api/auth/logout/route.ts
+++ b/app/api/auth/logout/route.ts
@@ -1,11 +1,12 @@
-import { createRouteHandlerClient } from '@supabase/auth-helpers-nextjs'
+import { createClient } from '@/lib/supabase/server'
 import { cookies } from 'next/headers'
 import { type NextRequest, NextResponse } from 'next/server'
 
 export const dynamic = 'force-dynamic'
 
 export async function POST(req: NextRequest) {
-  const supabase = createRouteHandlerClient({ cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
 
   // Check if we have a session
   const {
diff --git a/app/api/chat/route.ts b/app/api/chat/route.ts
index c87fc45..abb25ae 100644
--- a/app/api/chat/route.ts
+++ b/app/api/chat/route.ts
@@ -1,13 +1,13 @@
-import { RequestCookies } from "@edge-runtime/cookies";
 import OpenAI from 'openai'
 import { OpenAIStream, StreamingTextResponse } from 'ai'
-import { createRouteHandlerClient } from '@supabase/auth-helpers-nextjs';
 import { pick } from 'lodash';
 import { AxiomRequest, withAxiom } from 'next-axiom';
 import { getCurrentSession } from '@/lib/session';
 import { createNewMessage, deleteMessagesFrom, getMessageById } from '@/lib/db/message';
 import { createNewChat } from '@/lib/db/chats';
 import { getAppBySlug } from '@/lib/db/apps';
+import { createClient } from "@/lib/supabase/server";
+import { cookies } from "next/headers";
 import {
   env
 } from '@/env.mjs';
@@ -25,8 +25,8 @@ export const POST = withAxiom(async (req: AxiomRequest) => {
     route: 'api/chat',
   });
   
-  const cookies = new RequestCookies(req.headers) as any;
-  const supabase = createRouteHandlerClient({ cookies: () => cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
   const params = await req.json()
   const {
     messages,
diff --git a/app/apps/chat/[id]/page.tsx b/app/apps/chat/[id]/page.tsx
index 9c2f06a..07d904a 100644
--- a/app/apps/chat/[id]/page.tsx
+++ b/app/apps/chat/[id]/page.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import { cookies } from "next/headers"
 import { Metadata } from "next"
 import { ChatPanel } from "@/components/modules/apps/chat/ChatPanel"
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs"
+import { createClient } from "@/lib/supabase/server"
 import { getChatById, getChats } from "@/lib/db/chats"
 import { getAppBySlug } from "@/lib/db/apps"
 import { getCurrentSession } from "@/lib/session"
@@ -10,6 +10,9 @@ import { Message } from "ai"
 import { getMessages } from "@/lib/db/message"
 import { ChatParams } from "@/components/modules/apps/chat/types"
 
+export const runtime = "edge"
+export const preferredRegion = "home"
+
 export const metadata: Metadata = {
   title: "Chat",
   description: "Chat with your AI assistant to generate new ideas and get inspired.",
@@ -18,7 +21,8 @@ export const metadata: Metadata = {
 export default async function ChatPage({ params }: { params: { id: string } }) {
   const chatId = params.id
 
-  const supabase = createServerComponentClient({ cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
   const session = await getCurrentSession(supabase)
   const currentApp = await getAppBySlug(supabase, '/apps/chat')
 
diff --git a/app/apps/chat/page.tsx b/app/apps/chat/page.tsx
index 1c633d5..ea3afab 100644
--- a/app/apps/chat/page.tsx
+++ b/app/apps/chat/page.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import { Metadata } from "next"
 import { ChatPanel } from "@/components/modules/apps/chat/ChatPanel"
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs"
+import { createClient } from "@/lib/supabase/server"
 import { cookies } from "next/headers"
 import { getAppBySlug } from "@/lib/db/apps"
 import { getCurrentSession } from "@/lib/session"
@@ -16,9 +16,7 @@ export default async function NewChatPage() {
   const chatId = uuidv4()
 
   const cookieStore = cookies()
-  const supabase = createServerComponentClient({
-    cookies: () => cookieStore,
-  })
+  const supabase = createClient(cookieStore)
   const session = await getCurrentSession(supabase)
   const currentApp = await getAppBySlug(supabase, '/apps/chat')
 
diff --git a/app/apps/layout.tsx b/app/apps/layout.tsx
index f4eb874..5480044 100644
--- a/app/apps/layout.tsx
+++ b/app/apps/layout.tsx
@@ -2,7 +2,7 @@ import { ChatHistory } from "@/components/modules/apps/chat/ChatHistory"
 import { getAppBySlug } from "@/lib/db/apps"
 import { getChats } from "@/lib/db/chats"
 import { getCurrentSession } from "@/lib/session"
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs"
+import { createClient } from "@/lib/supabase/server"
 import { cookies } from "next/headers"
 import { MainLayout } from '@/components/ui/common/MainLayout'
 
@@ -11,7 +11,8 @@ interface AppLayoutProps {
 }
 
 export default async function AppLayout({ children }: AppLayoutProps) {
-  const supabase = createServerComponentClient({ cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
   const session = await getCurrentSession(supabase)
   const currentApp = await getAppBySlug(supabase, '/apps/chat')
   
diff --git a/app/apps/page.tsx b/app/apps/page.tsx
index 25e8681..c3ccb58 100644
--- a/app/apps/page.tsx
+++ b/app/apps/page.tsx
@@ -1,7 +1,6 @@
 import { Heading1 } from "@/components/ui/typography"
 
 export const runtime = "edge"
-export const preferredRegion = "home"
 
 export default function Apps() {
   return (
diff --git a/app/page.tsx b/app/page.tsx
index d3b4417..3542cbe 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -14,6 +14,8 @@ export const metadata: Metadata = {
   description: siteConfig.description,
 }
 
+export const runtime = "edge"
+
 export default async function Home() {
   return (
     <MainLayout>
diff --git a/app/profile/page.tsx b/app/profile/page.tsx
index 6e586a7..c182c2c 100644
--- a/app/profile/page.tsx
+++ b/app/profile/page.tsx
@@ -3,13 +3,16 @@ import { ProfileForm } from "@/components/modules/profile/ProfileForm";
 import { ProfileFormValues } from "@/components/modules/profile/type";
 import { getCurrentProfile } from "@/lib/db/profile";
 import { getCurrentSession } from "@/lib/session";
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
+import { createClient } from "@/lib/supabase/server";
 import { cookies } from "next/headers";
 
 export const dynamic = 'force-dynamic'
 
+export const runtime = "edge"
+
 export default async function Profile() {
-  const supabase = createServerComponentClient({ cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
   const profile = await getCurrentProfile(supabase)
   const session = await getCurrentSession(supabase)
 
diff --git a/components/modules/apps/app-side-bar/AppSideBar.tsx b/components/modules/apps/app-side-bar/AppSideBar.tsx
index d972774..00c4f3c 100644
--- a/components/modules/apps/app-side-bar/AppSideBar.tsx
+++ b/components/modules/apps/app-side-bar/AppSideBar.tsx
@@ -1,11 +1,12 @@
 import React from 'react'
 import { cookies } from 'next/headers';
-import { createServerComponentClient } from '@supabase/auth-helpers-nextjs';
+import { createClient } from '@/lib/supabase/server';
 import { getApps } from '@/lib/db/apps';
 import { AppSideBarList } from './AppSideBarList';
 
 export const AppSideBar = async () => {
-  const supabase = await createServerComponentClient({ cookies })
+  const cookieStore = cookies()
+  const supabase = await createClient(cookieStore)
   const apps = await getApps(supabase)
   return (
     <aside className="sticky top-16 flex w-0 flex-col overflow-x-hidden bg-muted transition-[width] lg:w-[73px] lg:border-r lg:hover:w-80" aria-label="Sidenav">
diff --git a/components/modules/apps/chat/action.ts b/components/modules/apps/chat/action.ts
index c46ed66..4c2baa6 100644
--- a/components/modules/apps/chat/action.ts
+++ b/components/modules/apps/chat/action.ts
@@ -1,16 +1,17 @@
 'use server'
 
-import { Database, Update } from "@/lib/db"
+import { Update } from "@/lib/db"
 import { getAppBySlug } from "@/lib/db/apps"
 import { createNewChat as createNewChatDb, deleteChat as deleteChatDb, updateChat as updateChatDb } from "@/lib/db/chats"
 import { getCurrentSession } from "@/lib/session"
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs"
+import { createClient } from "@/lib/supabase/server"
 import { revalidatePath } from "next/cache"
 import { cookies } from "next/headers"
 import { redirect } from "next/navigation"
 
 export const createNewChat = async () => {
-  const supabase = createServerComponentClient<Database>({ cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
   const session = await getCurrentSession(supabase)
   const currentApp = await getAppBySlug(supabase, '/apps/chat')
 
@@ -32,7 +33,8 @@ export const createNewChat = async () => {
 }
 
 export const deleteChat = async (id: string) => {
-  const supabase = createServerComponentClient<Database>({ cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
 
   try {
     await deleteChatDb(supabase, id)
@@ -43,7 +45,8 @@ export const deleteChat = async (id: string) => {
 }
 
 export const updateChat = async (params: Update<'chats'>) => {
-  const supabase = createServerComponentClient<Database>({ cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
   const { id, ...rest } = params
   if (!id) {
     throw new Error('Missing ID')
diff --git a/components/modules/apps/chat/control-side-bar/action.ts b/components/modules/apps/chat/control-side-bar/action.ts
index 4cc7f6b..5986bc5 100644
--- a/components/modules/apps/chat/control-side-bar/action.ts
+++ b/components/modules/apps/chat/control-side-bar/action.ts
@@ -1,14 +1,15 @@
 'use server'
 
-import { Chat, Database, Update } from "@/lib/db"
+import { Chat, Update } from "@/lib/db"
 import { getAppBySlug } from "@/lib/db/apps"
 import { updateChat } from "@/lib/db/chats"
 import { getCurrentSession } from "@/lib/session"
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs"
+import { createClient } from "@/lib/supabase/server"
 import { cookies } from "next/headers"
 
 export const updateChatSettings = async (id: Chat['id'], params: Update<'chats'>['settings']) => {
-  const supabase = createServerComponentClient<Database>({ cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
   const session = await getCurrentSession(supabase)
   const currentApp = await getAppBySlug(supabase, '/apps/chat')
 
diff --git a/components/modules/auth/SocialLoginButton.tsx b/components/modules/auth/SocialLoginButton.tsx
index dd5b8b8..0ccc5ad 100644
--- a/components/modules/auth/SocialLoginButton.tsx
+++ b/components/modules/auth/SocialLoginButton.tsx
@@ -1,7 +1,7 @@
 import { Button, ButtonProps } from '@/components/ui/Button'
 import { useToast } from '@/components/ui/use-toast'
 import { getURL } from '@/config/site'
-import { createClientComponentClient } from '@supabase/auth-helpers-nextjs'
+import { createClient } from '@/lib/supabase/client'
 import { Provider } from '@supabase/supabase-js'
 import { Loader } from 'lucide-react'
 import React from 'react'
@@ -11,7 +11,7 @@ type SocialLoginButtonProps = ButtonProps & {
 }
 
 export const SocialLoginButton = ({ provider, children, ...rest }: SocialLoginButtonProps) => {
-  const supabase = createClientComponentClient()
+  const supabase = createClient()
   const [isLoading, setIsLoading] = React.useState<boolean>(false)
   const { toast } = useToast()
 
diff --git a/components/modules/auth/UserAuthForm.tsx b/components/modules/auth/UserAuthForm.tsx
index 25505d5..d604cad 100644
--- a/components/modules/auth/UserAuthForm.tsx
+++ b/components/modules/auth/UserAuthForm.tsx
@@ -9,18 +9,17 @@ import { zodResolver } from "@hookform/resolvers/zod"
 import { useToast } from "@/components/ui/use-toast"
 import { InputField } from "@/components/ui/form/form-fields"
 import { Loader } from "lucide-react"
-import { createClientComponentClient } from "@supabase/auth-helpers-nextjs"
-import { Database } from "@/lib/db"
 import Link from "next/link"
 import { credentialAuthSchema } from "./schema"
 import { SocialLoginOptions } from "./SocialLoginOptions"
+import { createClient } from "@/lib/supabase/client"
 
 type UserAuthFormProps = React.HTMLAttributes<HTMLDivElement>
 
 type FormData = z.infer<typeof credentialAuthSchema>
 
 export function UserAuthForm({ className, ...props }: UserAuthFormProps) {
-  const supabase = createClientComponentClient<Database>()
+  const supabase = createClient()
   const {
     register,
     formState,
diff --git a/components/modules/auth/UserSignupForm.tsx b/components/modules/auth/UserSignupForm.tsx
index cf03e6a..769a761 100644
--- a/components/modules/auth/UserSignupForm.tsx
+++ b/components/modules/auth/UserSignupForm.tsx
@@ -10,17 +10,16 @@ import { zodResolver } from "@hookform/resolvers/zod"
 import { useToast } from "@/components/ui/use-toast"
 import { InputField } from "@/components/ui/form/form-fields"
 import { Loader } from "lucide-react"
-import { createClientComponentClient } from "@supabase/auth-helpers-nextjs"
-import { Database } from "@/lib/db"
 import { registerProfileSchema } from "./schema"
 import Link from "next/link"
+import { createClient } from "@/lib/supabase/client"
 
 type UserSignupFormProps = React.HTMLAttributes<HTMLDivElement>
 
 type FormData = z.infer<typeof registerProfileSchema>
 
 export function UserSignupForm({ className, ...props }: UserSignupFormProps) {
-  const supabase = createClientComponentClient<Database>()
+  const supabase = createClient()
   const { replace } = useRouter()
   const {
     register,
diff --git a/components/modules/profile/AccountDropdownMenu.tsx b/components/modules/profile/AccountDropdownMenu.tsx
index 682ddd2..bdaeeb6 100644
--- a/components/modules/profile/AccountDropdownMenu.tsx
+++ b/components/modules/profile/AccountDropdownMenu.tsx
@@ -11,7 +11,7 @@ import {
   DropdownMenuTrigger,
 } from '@/components/ui/DropdownMenu';
 import { getCurrentProfile } from '@/lib/db/profile';
-import { createClientComponentClient } from '@supabase/auth-helpers-nextjs';
+import { createClient } from '@/lib/supabase/client'
 import { Loader, User } from 'lucide-react';
 import Link from 'next/link';
 import LogoutButton from '../auth/LogoutButton';
@@ -24,7 +24,7 @@ type AccountDropdownMenuProps = {
 }
 
 export const AccountDropdownMenu = ({ userEmail }: AccountDropdownMenuProps) => {
-  const supabase = createClientComponentClient()
+  const supabase = createClient()
   const [ isLoading, setIsLoading ] = React.useState<boolean>()
   const [isMounted, setIsMounted] = React.useState(false)
 
diff --git a/components/modules/profile/action.ts b/components/modules/profile/action.ts
index 683ece9..25087b3 100644
--- a/components/modules/profile/action.ts
+++ b/components/modules/profile/action.ts
@@ -1,9 +1,8 @@
 'use server'
 
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs"
+import { createClient } from "@/lib/supabase/server"
 import { ProfileFormValues } from "./type"
 import { cookies } from "next/headers"
-import { Database } from "@/lib/db"
 import { getCurrentSession } from "@/lib/session"
 import { revalidatePath } from "next/cache"
 
@@ -12,7 +11,8 @@ export async function updateProfile({
   username,
   website
 }: ProfileFormValues) {
-  const supabase = createServerComponentClient<Database>({ cookies })
+  const cookieStore = cookies()
+  const supabase = createClient(cookieStore)
   const session = await getCurrentSession(supabase)
 
   if (!session) {
diff --git a/components/navigation/NavigationBar.tsx b/components/navigation/NavigationBar.tsx
index d1708f9..78420ba 100644
--- a/components/navigation/NavigationBar.tsx
+++ b/components/navigation/NavigationBar.tsx
@@ -6,12 +6,13 @@ import { cn } from '@/lib/utils';
 import { buttonVariants } from '../ui/Button';
 import { AppLogo } from '../ui/common/AppLogo';
 import { NavigationMainMenu } from './NavigationMainMenu';
-import { createServerComponentClient } from '@supabase/auth-helpers-nextjs';
+import { createClient } from '@/lib/supabase/server';
 import { getCurrentSession } from '@/lib/session';
 import { cookies } from 'next/headers';
 
 export const NavigationBar = async () => {
-  const supabase = await createServerComponentClient({ cookies })
+  const cookieStore = cookies()
+  const supabase = await createClient(cookieStore)
   const currentSession = await getCurrentSession(supabase)
 
   return (
diff --git a/env.mjs b/env.mjs
index f68c08d..5d390fe 100644
--- a/env.mjs
+++ b/env.mjs
@@ -9,6 +9,8 @@ export const env = createEnv({
   },
   client: {
     NEXT_PUBLIC_APP_URL: z.string().min(1),
+    NEXT_PUBLIC_SUPABASE_URL: z.string().min(1),
+    NEXT_PUBLIC_SUPABASE_ANON_KEY: z.string().min(1),
   },
   runtimeEnv: {
     OPENAI_API_KEY: process.env.OPENAI_API_KEY,
diff --git a/lib/cache.ts b/lib/cache.ts
index a5b272b..fd5bc68 100644
--- a/lib/cache.ts
+++ b/lib/cache.ts
@@ -2,5 +2,6 @@ export const CACHE_TTL = 3600
 
 export const CACHE_KEYS = {
   CHATS: 'chats',
-  APPS: 'apps',
+  MESSAGES: 'messages',
+  APP_BY_SLUG: 'appBySlug',
 }
\ No newline at end of file
diff --git a/lib/db/apps.ts b/lib/db/apps.ts
index 525f3cb..38fa7a7 100644
--- a/lib/db/apps.ts
+++ b/lib/db/apps.ts
@@ -1,4 +1,4 @@
-import { SupabaseClient } from "@supabase/auth-helpers-nextjs"
+import { SupabaseClient } from "@supabase/supabase-js"
 import { App, Database } from "."
 import { Logger } from "next-axiom";
 import { LogLevel } from "next-axiom/dist/logger";
@@ -27,25 +27,23 @@ export const getApps = async (supabase: SupabaseClient<Database>) => {
   return data
 }
 
-export const getAppBySlug = (supabase: SupabaseClient<Database>, slug: App['slug']) => {
-  return unstable_cache(async (supabase: SupabaseClient<Database>, slug: App['slug']) => {
-    log.info(`${getAppBySlug.name} called`, { slug });
-    const { data, error, status } = await supabase
-      .from('apps')
-      .select('*')
-      .eq('slug', slug)
-      .single()
-  
-    if (error && status !== 406) {
-      log.error(getAppBySlug.name, { error, status });
-      return null
-    }
-  
-    log.info(`${getAppBySlug.name} fetched successfully`, { data });
-    return data
-  },
-  [CACHE_KEYS.APPS, slug],
-  {
-    revalidate: CACHE_TTL,
-  })(supabase, slug)
-}
\ No newline at end of file
+export const getAppBySlug = unstable_cache(async (supabase: SupabaseClient<Database>, slug: App['slug']) => {
+  log.info(`${getAppBySlug.name} called`, { slug });
+  const { data, error, status } = await supabase
+    .from('apps')
+    .select('*')
+    .eq('slug', slug)
+    .single()
+
+  if (error && status !== 406) {
+    log.error(getAppBySlug.name, { error, status });
+    return null
+  }
+
+  log.info(`${getAppBySlug.name} fetched successfully`, { data });
+  return data
+},
+[CACHE_KEYS.APP_BY_SLUG],
+{
+  revalidate: CACHE_TTL,
+})
\ No newline at end of file
diff --git a/lib/db/chats.ts b/lib/db/chats.ts
index f9f3db4..389ea1e 100644
--- a/lib/db/chats.ts
+++ b/lib/db/chats.ts
@@ -1,4 +1,4 @@
-import { SupabaseClient } from "@supabase/auth-helpers-nextjs"
+import { SupabaseClient } from "@supabase/supabase-js"
 import { Chat, Database, Insert, Update } from "."
 import { Logger } from "next-axiom";
 import { LogLevel } from "next-axiom/dist/logger";
@@ -14,29 +14,27 @@ const log = new Logger({
   }
 });
 
-export const getChats = (supabase: SupabaseClient<Database>, params: GetChatsParams) => {
-  return unstable_cache(async (supabase: SupabaseClient<Database>, params: GetChatsParams) => {
-    log.info(`${getChats.name} called`, params);
-    const { data, error, status } = await supabase
-      .from('chats')
-      .select('*')
-      .eq('appId', params.appId)
-      .eq('profileId', params.profileId)
-      .order('createdAt', { ascending: false })
-  
-    if (error && status !== 406) {
-      log.error(getChats.name, { error, status });
-      return null
-    }
-  
-    log.info(`${getChats.name} fetched successfully`, { data });
-    return data
-  },
-  [CACHE_KEYS.CHATS, params.appId, params.profileId],
-  {
-    revalidate: CACHE_TTL,
-  })(supabase, params)
-}
+export const getChats = unstable_cache(async (supabase: SupabaseClient<Database>, params: GetChatsParams) => {
+  log.info(`${getChats.name} called`, params);
+  const { data, error, status } = await supabase
+    .from('chats')
+    .select('*')
+    .eq('appId', params.appId)
+    .eq('profileId', params.profileId)
+    .order('createdAt', { ascending: false })
+
+  if (error && status !== 406) {
+    log.error(getChats.name, { error, status });
+    return null
+  }
+
+  log.info(`${getChats.name} fetched successfully`, { data });
+  return data
+},
+[CACHE_KEYS.CHATS],
+{
+  revalidate: CACHE_TTL,
+})
 
 export const getChatById = async (supabase: SupabaseClient<Database>, id: string) => {
   log.info(`${getChatById.name} called`, { id });
diff --git a/lib/db/message.ts b/lib/db/message.ts
index 10ec678..dc576da 100644
--- a/lib/db/message.ts
+++ b/lib/db/message.ts
@@ -1,7 +1,9 @@
-import { SupabaseClient } from "@supabase/auth-helpers-nextjs"
+import { SupabaseClient } from "@supabase/supabase-js"
 import { Message, Database } from "."
 import { Logger } from "next-axiom";
 import { LogLevel } from "next-axiom/dist/logger";
+import { unstable_cache } from "next/cache";
+import { CACHE_KEYS, CACHE_TTL } from "../cache";
 
 export type CreateNewMessageParams = Pick<Message, 'chatId' | 'content' | 'profileId' | 'role'> & Partial<Pick<Message, 'id'>>
 type GetMessagesParams = Pick<Message, 'chatId' | 'profileId'>
@@ -12,7 +14,7 @@ const log = new Logger({
   }
 });
 
-export const getMessages = async (supabase: SupabaseClient<Database>, params: GetMessagesParams) => {
+export const getMessages = unstable_cache(async (supabase: SupabaseClient<Database>, params: GetMessagesParams) => {
   log.info(`${getMessages.name} called`, { params });
   const { data, error, status } = await supabase
     .from('messages')
@@ -28,7 +30,11 @@ export const getMessages = async (supabase: SupabaseClient<Database>, params: Ge
 
   log.info(`${getMessages.name} fetched successfully`, { params, data });
   return data
-}
+},
+[CACHE_KEYS.MESSAGES],
+{
+  revalidate: CACHE_TTL
+})
 
 export const getMessageById = async (supabase: SupabaseClient<Database>, id: Message['id']) => {
   log.info(`${getMessageById.name} called`, { params: { id } });
diff --git a/lib/db/profile.ts b/lib/db/profile.ts
index ee58e1f..3ac5fa9 100644
--- a/lib/db/profile.ts
+++ b/lib/db/profile.ts
@@ -1,4 +1,4 @@
-import { SupabaseClient } from "@supabase/auth-helpers-nextjs"
+import { SupabaseClient } from "@supabase/supabase-js"
 import { getCurrentSession } from "../session"
 import { Database } from "."
 import { Logger } from "next-axiom";
diff --git a/lib/session.ts b/lib/session.ts
index 045ae87..3afacaa 100644
--- a/lib/session.ts
+++ b/lib/session.ts
@@ -1,4 +1,4 @@
-import { SupabaseClient } from "@supabase/auth-helpers-nextjs"
+import { SupabaseClient } from "@supabase/supabase-js"
 import { Database } from "./db"
 
 export const getCurrentSession = async (supabase: SupabaseClient<Database>) => {
diff --git a/lib/supabase/client.ts b/lib/supabase/client.ts
new file mode 100644
index 0000000..566cce2
--- /dev/null
+++ b/lib/supabase/client.ts
@@ -0,0 +1,8 @@
+import { env } from '@/env.mjs'
+import { createBrowserClient } from '@supabase/ssr'
+
+export const createClient = () =>
+  createBrowserClient(
+    env.NEXT_PUBLIC_SUPABASE_URL,
+    env.NEXT_PUBLIC_SUPABASE_ANON_KEY
+  )
diff --git a/lib/supabase/middleware.ts b/lib/supabase/middleware.ts
new file mode 100644
index 0000000..cc18b62
--- /dev/null
+++ b/lib/supabase/middleware.ts
@@ -0,0 +1,62 @@
+import { env } from '@/env.mjs'
+import { createServerClient, type CookieOptions } from '@supabase/ssr'
+import { type NextRequest, NextResponse } from 'next/server'
+
+export const createClient = (request: NextRequest) => {
+  // Create an unmodified response
+  let response = NextResponse.next({
+    request: {
+      headers: request.headers,
+    },
+  })
+
+  const supabase = createServerClient(
+    env.NEXT_PUBLIC_SUPABASE_URL,
+    env.NEXT_PUBLIC_SUPABASE_ANON_KEY,
+    {
+      cookies: {
+        get(name: string) {
+          return request.cookies.get(name)?.value
+        },
+        set(name: string, value: string, options: CookieOptions) {
+          // If the cookie is updated, update the cookies for the request and response
+          request.cookies.set({
+            name,
+            value,
+            ...options,
+          })
+          response = NextResponse.next({
+            request: {
+              headers: request.headers,
+            },
+          })
+          response.cookies.set({
+            name,
+            value,
+            ...options,
+          })
+        },
+        remove(name: string, options: CookieOptions) {
+          // If the cookie is removed, update the cookies for the request and response
+          request.cookies.set({
+            name,
+            value: '',
+            ...options,
+          })
+          response = NextResponse.next({
+            request: {
+              headers: request.headers,
+            },
+          })
+          response.cookies.set({
+            name,
+            value: '',
+            ...options,
+          })
+        },
+      },
+    }
+  )
+
+  return { supabase, response }
+}
diff --git a/lib/supabase/server.ts b/lib/supabase/server.ts
new file mode 100644
index 0000000..2801e93
--- /dev/null
+++ b/lib/supabase/server.ts
@@ -0,0 +1,35 @@
+import { env } from '@/env.mjs'
+import { createServerClient, type CookieOptions } from '@supabase/ssr'
+import { cookies } from 'next/headers'
+
+export const createClient = (cookieStore: ReturnType<typeof cookies>) => {
+  return createServerClient(
+    env.NEXT_PUBLIC_SUPABASE_URL,
+    env.NEXT_PUBLIC_SUPABASE_ANON_KEY,
+    {
+      cookies: {
+        get(name: string) {
+          return cookieStore.get(name)?.value
+        },
+        set(name: string, value: string, options: CookieOptions) {
+          try {
+            cookieStore.set({ name, value, ...options })
+          } catch (error) {
+            // The `set` method was called from a Server Component.
+            // This can be ignored if you have middleware refreshing
+            // user sessions.
+          }
+        },
+        remove(name: string, options: CookieOptions) {
+          try {
+            cookieStore.set({ name, value: '', ...options })
+          } catch (error) {
+            // The `delete` method was called from a Server Component.
+            // This can be ignored if you have middleware refreshing
+            // user sessions.
+          }
+        },
+      },
+    }
+  )
+}
diff --git a/middleware.ts b/middleware.ts
index 1b0e956..396b777 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -1,11 +1,10 @@
-import { createMiddlewareClient } from '@supabase/auth-helpers-nextjs'
 import { NextResponse } from 'next/server'
 
 import type { NextRequest } from 'next/server'
+import { createClient } from './lib/supabase/middleware'
 
 export async function middleware(req: NextRequest) {
-  const res = NextResponse.next()
-  const supabase = createMiddlewareClient({ req, res })
+  const { supabase, response } = createClient(req)
 
   const {
     data: { user },
@@ -15,7 +14,7 @@ export async function middleware(req: NextRequest) {
     return NextResponse.redirect(new URL('/signin', req.url))
   }
 
-  return res
+  return response
 }
 
 export const config = {
diff --git a/package.json b/package.json
index 70a5334..b5fa515 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "@radix-ui/react-tabs": "^1.0.4",
     "@radix-ui/react-toast": "^1.1.4",
     "@radix-ui/react-tooltip": "^1.0.6",
-    "@supabase/auth-helpers-nextjs": "^0.8.1",
+    "@supabase/ssr": "^0.0.5",
     "@supabase/supabase-js": "^2.37.0",
     "@t3-oss/env-nextjs": "^0.6.1",
     "@types/node": "20.4.9",
diff --git a/yarn.lock b/yarn.lock
index 0edc37c..7e872bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1145,21 +1145,6 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.5.1.tgz#5f1b518ec5fa54437c0b7c4a821546c64fed6922"
   integrity sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA==
 
-"@supabase/auth-helpers-nextjs@^0.8.1":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@supabase/auth-helpers-nextjs/-/auth-helpers-nextjs-0.8.1.tgz#30486617c7c12646f0e91ae49120555513942d48"
-  integrity sha512-ZO/UGDE9oaVXwPL4gpzGu2NpPwfKOgxTUnuK6no51So8Ah9BUuUUsTj+BdZlx7jJoZEIAkHWdRIx65WuQgWAiQ==
-  dependencies:
-    "@supabase/auth-helpers-shared" "0.5.0"
-    set-cookie-parser "^2.6.0"
-
-"@supabase/auth-helpers-shared@0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@supabase/auth-helpers-shared/-/auth-helpers-shared-0.5.0.tgz#e1fbe0732d9f171ab21135416ccf719aa596999f"
-  integrity sha512-kioUeYDBZ89cfqOTZFOLEFIO7kGczL0XJYZdVv/bKt5efXqhiY14NbzgGWiMvvD9o9Iluo0+YEV2tG3ZZ5W06A==
-  dependencies:
-    jose "^4.14.4"
-
 "@supabase/functions-js@^2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@supabase/functions-js/-/functions-js-2.1.5.tgz#ed1b85f499dfda21d40fe39b86ab923117cb572b"
@@ -1198,6 +1183,14 @@
     "@types/websocket" "^1.0.3"
     websocket "^1.0.34"
 
+"@supabase/ssr@^0.0.5":
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/@supabase/ssr/-/ssr-0.0.5.tgz#80e629853fbc540e8e737c0b97a41c9d663c8478"
+  integrity sha512-D7kfzODHzmSxdIVfJ0mzsX/9HjwrGbGyUQAdLss2tTVas2ry+g7KDZJC2kTURa5H+OJ3HEL7xz27S26kQ7li9g==
+  dependencies:
+    cookie "^0.5.0"
+    ramda "^0.29.0"
+
 "@supabase/storage-js@^2.5.4":
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/@supabase/storage-js/-/storage-js-2.5.4.tgz#15946fa03574e94cdeff2b7fa2cd5b85880239f5"
@@ -2014,6 +2007,11 @@ convert-source-map@^1.7.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
+cookie@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+
 cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -3399,11 +3397,6 @@ jiti@^1.18.2:
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.19.1.tgz#fa99e4b76a23053e0e7cde098efe1704a14c16f1"
   integrity sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==
 
-jose@^4.14.4:
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.1.tgz#7ccfdf15a4a251e12af32a0924991950d22de41d"
-  integrity sha512-CinpaEMmwb/59YG0N6SC3DY1imdTU5iNl08HPWR7NdyxACPeFuQbqjaocEjCDGq04KbnxSqQu702vL3ZTvKe5w==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -4522,6 +4515,11 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+ramda@^0.29.0:
+  version "0.29.1"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.29.1.tgz#408a6165b9555b7ba2fc62555804b6c5a2eca196"
+  integrity sha512-OfxIeWzd4xdUNxlWhgFazxsA/nl3mS4/jGZI5n00uWOoSSFRhC1b6gl6xvmzUamgmqELraWp0J/qqVlXYPDPyA==
+
 react-dom@18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
@@ -4851,11 +4849,6 @@ server-only@^0.0.1:
   resolved "https://registry.yarnpkg.com/server-only/-/server-only-0.0.1.tgz#0f366bb6afb618c37c9255a314535dc412cd1c9e"
   integrity sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==
 
-set-cookie-parser@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51"
-  integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==
-
 set-function-name@^2.0.0, set-function-name@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"