diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.courses._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.courses._index/route.tsx
index 2c47d36..b9d1108 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.courses._index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.courses._index/route.tsx
@@ -22,6 +22,7 @@ import {
 } from '@repo/ui/components/ui/empty'
 import { Kbd } from '@repo/ui/components/ui/kbd'
 import { cn } from '@repo/ui/lib/utils'
+import { cloudflareContext } from '@repo/auth/context'
 import { createSearch } from '@repo/util/meili'
 import { request as req } from '@repo/util/request'
 
@@ -49,12 +50,13 @@ export function meta({}: Route.MetaArgs) {
 }
 
 export async function loader({ context, request, params }: Route.LoaderArgs) {
+  const cloudflare = context.get(cloudflareContext)
   const courses = createSearch({
     index: 'saladeaula_courses',
     sort: ['created_at:desc'],
     filter: 'unlisted NOT EXISTS',
     hitsPerPage: 100,
-    env: context.cloudflare.env
+    env: cloudflare.env
   })
 
   const customPricing = req({
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id._index/route.tsx
index 5674605..82261ad 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id._index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id._index/route.tsx
@@ -12,9 +12,8 @@ import {
 import { request as req } from '@repo/util/request'
 
 export async function loader({ params, request, context }: Route.LoaderArgs) {
-  const { id } = params
   const r = await req({
-    url: `/enrollments/${id}`,
+    url: `/enrollments/${params.id}`,
     request,
     context
   })
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx
index 8584000..a8a60e5 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx
@@ -15,6 +15,7 @@ import { Button } from '@repo/ui/components/ui/button'
 import { ExportMenu } from '@repo/ui/components/export-menu'
 import { Kbd } from '@repo/ui/components/ui/kbd'
 import { createSearch } from '@repo/util/meili'
+import { cloudflareContext } from '@repo/auth/context'
 import { headers, sortings, statuses } from '@repo/ui/routes/enrollments/data'
 
 import { columns, type Enrollment } from './columns'
@@ -24,6 +25,7 @@ export function meta({}: Route.MetaArgs) {
 }
 
 export async function loader({ params, context, request }: Route.LoaderArgs) {
+  const cloudflare = context.get(cloudflareContext)
   const { searchParams } = new URL(request.url)
   const { orgid } = params
   const query = searchParams.get('q') || ''
@@ -52,7 +54,7 @@ export async function loader({ params, context, request }: Route.LoaderArgs) {
     query,
     page,
     hitsPerPage,
-    env: context.cloudflare.env
+    env: cloudflare.env
   })
 
   return {
@@ -85,7 +87,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) {
       </div>
 
       <Await resolve={data}>
-        {({ hits, page, hitsPerPage, totalHits }) => (
+        {({ hits, page = 1, hitsPerPage, totalHits }) => (
           <DataTable
             sort={[{ id: 'created_at', desc: true }]}
             columns={columns}
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx
index 6a13306..eb28d62 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx
@@ -66,6 +66,7 @@ import { createSearch } from '@repo/util/meili'
 import { cn } from '@repo/ui/lib/utils'
 import { HttpMethod, request as req } from '@repo/util/request'
 import { useIsMobile } from '@repo/ui/hooks/use-mobile'
+import { cloudflareContext } from '@repo/auth/context'
 
 import { formSchema, type Schema, MAX_ITEMS } from './data'
 import { AsyncCombobox } from './async-combobox'
@@ -76,12 +77,13 @@ export function meta({}: Route.MetaArgs) {
 }
 
 export async function loader({ context }: Route.LoaderArgs) {
+  const cloudflare = context.get(cloudflareContext)
   const courses = createSearch({
     index: 'saladeaula_courses',
     sort: ['created_at:desc'],
     filter: 'unlisted NOT EXISTS',
     hitsPerPage: 100,
-    env: context.cloudflare.env
+    env: cloudflare.env
   })
 
   return { courses }
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/route.tsx
index ad3c1dc..9e07833 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/route.tsx
@@ -7,6 +7,7 @@ import { MeiliSearchFilterBuilder } from 'meilisearch-helper'
 import { DataTable } from '@repo/ui/components/data-table'
 import { Skeleton } from '@repo/ui/components/skeleton'
 import { createSearch } from '@repo/util/meili'
+import { cloudflareContext } from '@repo/auth/context'
 
 import { columns, type Order } from './columns'
 
@@ -15,14 +16,18 @@ export function meta({}: Route.MetaArgs) {
 }
 
 export async function loader({ params, context, request }: Route.LoaderArgs) {
+  const cloudflare = context.get(cloudflareContext)
   const { searchParams } = new URL(request.url)
-  const { orgid } = params
   const query = searchParams.get('q') || ''
   const sort = searchParams.get('sort') || 'create_date:desc'
   const page = Number(searchParams.get('p')) + 1
   const hitsPerPage = Number(searchParams.get('perPage')) || 25
 
-  let builder = new MeiliSearchFilterBuilder().where('tenant_id', '=', orgid)
+  let builder = new MeiliSearchFilterBuilder().where(
+    'tenant_id',
+    '=',
+    params.orgid
+  )
 
   const orders = createSearch({
     index: 'betaeducacao-prod-orders',
@@ -31,7 +36,7 @@ export async function loader({ params, context, request }: Route.LoaderArgs) {
     query,
     page,
     hitsPerPage,
-    env: context.cloudflare.env
+    env: cloudflare.env
   })
 
   return {
@@ -53,7 +58,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) {
       </div>
 
       <Await resolve={data}>
-        {({ hits, page, hitsPerPage, totalHits }) => {
+        {({ hits, page = 1, hitsPerPage, totalHits }) => {
           return (
             <DataTable
               sort={[{ id: 'create_date', desc: true }]}
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.scheduled/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.scheduled/route.tsx
index d179154..ab95f05 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.scheduled/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.scheduled/route.tsx
@@ -5,7 +5,6 @@ import { useRequest, useToggle } from 'ahooks'
 import {
   AlertTriangleIcon,
   BanIcon,
-  CalendarClockIcon,
   CalendarIcon,
   CircleXIcon,
   ClockAlertIcon,
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id.emails/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id.emails/route.tsx
index ab7886e..a9f932d 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id.emails/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id.emails/route.tsx
@@ -19,7 +19,6 @@ import {
 import { request as req } from '@repo/util/request'
 
 import { Button } from '@repo/ui/components/ui/button'
-import type { User } from '../_.$orgid.users.$id/route'
 
 export async function loader({ params, request, context }: Route.LoaderArgs) {
   const { id } = params
@@ -33,7 +32,7 @@ export async function loader({ params, request, context }: Route.LoaderArgs) {
 }
 
 export default function Route({ loaderData: { data } }: Route.ComponentProps) {
-  const { user } = useOutletContext() as { user: User }
+  const { user } = useOutletContext()
 
   return (
     <Suspense fallback={<Skeleton />}>
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id/route.tsx
index c447298..55265f0 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id/route.tsx
@@ -34,9 +34,8 @@ export function meta() {
 }
 
 export async function loader({ params, request, context }: Route.LoaderArgs) {
-  const { id } = params
   const r = await req({
-    url: `/users/${id}`,
+    url: `/users/${params.id}`,
     request,
     context
   })
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/route.tsx
index 6514387..60df843 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/route.tsx
@@ -5,6 +5,7 @@ import { Suspense, useState } from 'react'
 import { Await, Link, useParams, useSearchParams } from 'react-router'
 import { MeiliSearchFilterBuilder } from 'meilisearch-helper'
 
+import { cloudflareContext } from '@repo/auth/context'
 import { DataTable } from '@repo/ui/components/data-table'
 import { SearchForm } from '@repo/ui/components/search-form'
 import { Skeleton } from '@repo/ui/components/skeleton'
@@ -27,14 +28,18 @@ export function meta({}: Route.MetaArgs) {
 }
 
 export async function loader({ params, context, request }: Route.LoaderArgs) {
+  const cloudflare = context.get(cloudflareContext)
   const { searchParams } = new URL(request.url)
-  const { orgid } = params
   const query = searchParams.get('q') || ''
   const sort = searchParams.get('sort') || 'createDate:desc'
   const page = Number(searchParams.get('p')) + 1
   const hitsPerPage = Number(searchParams.get('perPage')) || 25
 
-  let builder = new MeiliSearchFilterBuilder().where('tenant_id', '=', orgid)
+  let builder = new MeiliSearchFilterBuilder().where(
+    'tenant_id',
+    '=',
+    params.orgid
+  )
 
   const users = createSearch({
     index: 'betaeducacao-prod-users_d2o3r5gmm4it7j',
@@ -43,7 +48,7 @@ export async function loader({ params, context, request }: Route.LoaderArgs) {
     query,
     page,
     hitsPerPage,
-    env: context.cloudflare.env
+    env: cloudflare.env
   })
 
   return { data: users }
@@ -66,7 +71,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) {
       </div>
 
       <Await resolve={data}>
-        {({ hits, page, hitsPerPage, totalHits }) => {
+        {({ hits, page = 1, hitsPerPage, totalHits }) => {
           return (
             <DataTable
               sort={[{ id: 'createDate', desc: true }]}
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users[.]json/route.ts b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users[.]json/route.ts
index 4fd3924..640698d 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users[.]json/route.ts
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users[.]json/route.ts
@@ -4,8 +4,10 @@ import { MeiliSearchFilterBuilder } from 'meilisearch-helper'
 import { data } from 'react-router'
 
 import { createSearch } from '@repo/util/meili'
+import { cloudflareContext } from '@repo/auth/context'
 
 export async function loader({ params, context, request }: Route.LoaderArgs) {
+  const cloudflare = context.get(cloudflareContext)
   const { searchParams } = new URL(request.url)
   const { orgid } = params
   const query = searchParams.get('q') || ''
@@ -23,7 +25,7 @@ export async function loader({ params, context, request }: Route.LoaderArgs) {
     query,
     page,
     hitsPerPage,
-    env: context.cloudflare.env
+    env: cloudflare.env
   })
 
   return data(r)
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
index 7d97039..2ef473d 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
@@ -20,12 +20,12 @@ import { Toaster } from '@repo/ui/components/ui/sonner'
 import { request as req } from '@repo/util/request'
 
 import { AppSidebar } from '@/components/app-sidebar'
-import { Notification } from '@/components/notification'
+// import { Notification } from '@/components/notification'
 
 export const middleware: Route.MiddlewareFunction[] = [authMiddleware]
 
 export async function loader({ params, context, request }: Route.ActionArgs) {
-  const user = context.get(userContext)
+  const user = context.get(userContext)!
   const rawCookie = request.headers.get('cookie') || ''
   const parsedCookies = cookie.parse(rawCookie)
   const { sidebar_state = 'true' } = parsedCookies
diff --git a/apps/admin.saladeaula.digital/app/routes/_index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_index/route.tsx
index d633dfd..8235754 100644
--- a/apps/admin.saladeaula.digital/app/routes/_index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_index/route.tsx
@@ -9,7 +9,7 @@ import { request as req } from '@repo/util/request'
 export const middleware: Route.MiddlewareFunction[] = [authMiddleware]
 
 export async function loader({ context, request }: Route.ActionArgs) {
-  const user = context.get(userContext)
+  const user = context.get(userContext)!
 
   const r = await req({
     url: `/users/${user.sub}/orgs`,
diff --git a/apps/admin.saladeaula.digital/app/routes/login._index/route.ts b/apps/admin.saladeaula.digital/app/routes/login._index/route.ts
index b34e98f..8c3b464 100644
--- a/apps/admin.saladeaula.digital/app/routes/login._index/route.ts
+++ b/apps/admin.saladeaula.digital/app/routes/login._index/route.ts
@@ -3,24 +3,29 @@ import type { Route } from './+types/route'
 import { redirect } from 'react-router'
 
 import { createAuth, type User } from '@repo/auth/auth'
-import { requestIdContext } from '@repo/auth/context'
+import { requestIdContext, cloudflareContext } from '@repo/auth/context'
 import { createSessionStorage } from '@repo/auth/session'
 
-export async function loader({ request, context }: Route.ActionArgs) {
-  const sessionStorage = createSessionStorage(context.cloudflare.env)
+export async function loader({ request, context }: Route.LoaderArgs) {
+  const url = new URL(request.url)
+  const cloudflare = context.get(cloudflareContext)
+  const sessionStorage = createSessionStorage(cloudflare.env)
   const session = await sessionStorage.getSession(request.headers.get('cookie'))
-  const returnTo = session.has('returnTo') ? session.get('returnTo') : '/'
   const requestId = context.get(requestIdContext)
-  const user = session.get('user') as User | null
+  const user = session.get('user')
+  const returnTo = (session.get('returnTo') as string | undefined) ?? '/'
 
   if (user) {
     return redirect(returnTo)
   }
 
   try {
-    const authenticator = createAuth(context.cloudflare.env)
-    const user = await authenticator.authenticate('oidc', request)
-    session.set('user', user)
+    const authenticator = createAuth(cloudflare.env, `${url.origin}/login`)
+    const authenticatedUser = (await authenticator.authenticate(
+      'oidc',
+      request
+    )) as User
+    session.set('user', authenticatedUser)
 
     console.log(`[${requestId}] Redirecting the user to ${returnTo}`)
 
diff --git a/apps/admin.saladeaula.digital/app/routes/logout._index/route.ts b/apps/admin.saladeaula.digital/app/routes/logout._index/route.ts
index 53f0f92..aaa2e24 100644
--- a/apps/admin.saladeaula.digital/app/routes/logout._index/route.ts
+++ b/apps/admin.saladeaula.digital/app/routes/logout._index/route.ts
@@ -5,12 +5,14 @@ import type { OAuth2Strategy } from 'remix-auth-oauth2'
 
 import { createAuth, type User } from '@repo/auth/auth'
 import { createSessionStorage } from '@repo/auth/session'
+import { cloudflareContext } from '@repo/auth/context'
 
 export async function loader({ request, context }: Route.LoaderArgs) {
-  const authenticator = createAuth(context.cloudflare.env)
-  const sessionStorage = createSessionStorage(context.cloudflare.env)
+  const cloudflare = context.get(cloudflareContext)
+  const authenticator = createAuth(cloudflare.env)
+  const sessionStorage = createSessionStorage(cloudflare.env)
   const session = await sessionStorage.getSession(request.headers.get('cookie'))
-  const user = session.get('user') as User
+  const user = session.get('user')
   const strategy = authenticator.get<OAuth2Strategy<User>>('oidc')
 
   if (user?.accessToken && strategy) {
diff --git a/apps/admin.saladeaula.digital/app/routes/~.api.$/route.ts b/apps/admin.saladeaula.digital/app/routes/~.api.$/route.ts
index 78cf485..bda4455 100644
--- a/apps/admin.saladeaula.digital/app/routes/~.api.$/route.ts
+++ b/apps/admin.saladeaula.digital/app/routes/~.api.$/route.ts
@@ -1,7 +1,6 @@
 import type { Route } from './+types/route'
 
-import type { User } from '@repo/auth/auth'
-import { userContext } from '@repo/auth/context'
+import { userContext, cloudflareContext } from '@repo/auth/context'
 import { authMiddleware } from '@repo/auth/middleware/auth'
 
 export const middleware: Route.MiddlewareFunction[] = [authMiddleware]
@@ -13,8 +12,9 @@ async function proxy({
   context
 }: Route.ActionArgs): Promise<Response> {
   const pathname = new URL(request.url).pathname.replace(/^\/~\/api\//, '')
-  const user = context.get(userContext) as User
-  const url = new URL(pathname, context.cloudflare.env.API_URL)
+  const cloudflare = context.get(cloudflareContext)
+  const user = context.get(userContext)!
+  const url = new URL(pathname, cloudflare.env.API_URL)
   const headers = new Headers(request.headers)
 
   headers.set('Authorization', `Bearer ${user.accessToken}`)
diff --git a/apps/admin.saladeaula.digital/workers/app.ts b/apps/admin.saladeaula.digital/workers/app.ts
index 78f50ef..a6ca45a 100644
--- a/apps/admin.saladeaula.digital/workers/app.ts
+++ b/apps/admin.saladeaula.digital/workers/app.ts
@@ -1,12 +1,9 @@
 import { createRequestHandler, RouterContextProvider } from 'react-router'
+import { cloudflareContext } from '@repo/auth/context'
 
-declare module 'react-router' {
-  export interface AppLoadContext {
-    cloudflare: {
-      env: Env
-      ctx: ExecutionContext
-    }
-  }
+declare module '@repo/auth/context' {
+  interface CloudflareEnv extends Env {}
+  interface CloudflareCtx extends ExecutionContext {}
 }
 
 const requestHandler = createRequestHandler(
@@ -16,11 +13,10 @@ const requestHandler = createRequestHandler(
 
 export default {
   async fetch(request, env, ctx) {
-    const context = new RouterContextProvider()
-
-    return requestHandler(
-      request,
-      Object.assign(context, { cloudflare: { env, ctx } })
+    const context = new RouterContextProvider(
+      new Map([[cloudflareContext, { env, ctx }]])
     )
+
+    return requestHandler(request, context)
   }
 } satisfies ExportedHandler<Env>