diff --git a/app/(public)/company-offer/page.tsx b/app/(public)/company-offer/page.tsx
index bf68684..4f293e5 100644
--- a/app/(public)/company-offer/page.tsx
+++ b/app/(public)/company-offer/page.tsx
@@ -6,6 +6,7 @@ import { useRouter } from 'next/navigation';
 
 import { MedReportLogo } from '@/components/med-report-logo';
 import { SubmitButton } from '@/components/ui/submit-button';
+import { withI18n } from '@/lib/i18n/with-i18n';
 import { sendCompanyOfferEmail } from '@/lib/services/mailer.service';
 import { CompanySubmitData } from '@/lib/types/company';
 import { companyOfferSchema } from '@/lib/validations/company-offer.schema';
@@ -18,7 +19,7 @@ import { Input } from '@kit/ui/input';
 import { Label } from '@kit/ui/label';
 import { Trans } from '@kit/ui/trans';
 
-export default function CompanyOffer() {
+function CompanyOffer() {
   const router = useRouter();
   const {
     register,
@@ -100,3 +101,5 @@ export default function CompanyOffer() {
     </div>
   );
 }
+
+export default withI18n(CompanyOffer);
diff --git a/app/admin/accounts/[id]/page.tsx b/app/admin/accounts/[id]/page.tsx
index 02c9ee4..0417247 100644
--- a/app/admin/accounts/[id]/page.tsx
+++ b/app/admin/accounts/[id]/page.tsx
@@ -34,6 +34,7 @@ async function accountLoader(id: string) {
   const client = getSupabaseServerClient();
 
   const { data, error } = await client
+    .schema('medreport')
     .from('accounts')
     .select('*, memberships: accounts_memberships (*)')
     .eq('id', id)
diff --git a/app/auth/membership-confirmation/_components/membership-confirmation-notification.tsx b/app/auth/membership-confirmation/_components/membership-confirmation-notification.tsx
new file mode 100644
index 0000000..ad1e446
--- /dev/null
+++ b/app/auth/membership-confirmation/_components/membership-confirmation-notification.tsx
@@ -0,0 +1,34 @@
+'use client';
+
+import React from 'react';
+
+import pathsConfig from '@/config/paths.config';
+import { useTranslation } from 'react-i18next';
+
+import { usePersonalAccountData } from '@kit/accounts/hooks/use-personal-account-data';
+import { SuccessNotification } from '@kit/notifications/components';
+
+const MembershipConfirmationNotification: React.FC<{
+  userId: string;
+}> = ({ userId }) => {
+  const { t } = useTranslation();
+
+  const { data: accountData } = usePersonalAccountData(userId);
+
+  return (
+    <SuccessNotification
+      showLogo={false}
+      title={t('account:membershipConfirmation:successTitle', {
+        firstName: accountData?.name,
+        lastName: accountData?.last_name,
+      })}
+      descriptionKey="account:membershipConfirmation:successDescription"
+      buttonProps={{
+        buttonTitleKey: 'account:membershipConfirmation:successButton',
+        href: pathsConfig.app.selectPackage,
+      }}
+    />
+  );
+};
+
+export default MembershipConfirmationNotification;
diff --git a/app/auth/membership-confirmation/layout.tsx b/app/auth/membership-confirmation/layout.tsx
index 8212f3c..e3d32c7 100644
--- a/app/auth/membership-confirmation/layout.tsx
+++ b/app/auth/membership-confirmation/layout.tsx
@@ -8,4 +8,4 @@ async function SiteLayout(props: React.PropsWithChildren) {
   );
 }
 
-export default withI18n(SiteLayout);
+export default SiteLayout;
diff --git a/app/auth/membership-confirmation/page.tsx b/app/auth/membership-confirmation/page.tsx
index 8154abb..43c0f2c 100644
--- a/app/auth/membership-confirmation/page.tsx
+++ b/app/auth/membership-confirmation/page.tsx
@@ -1,16 +1,14 @@
 import { redirect } from 'next/navigation';
 
 import pathsConfig from '@/config/paths.config';
-import { useTranslation } from 'react-i18next';
 
-import { usePersonalAccountData } from '@kit/accounts/hooks/use-personal-account-data';
-import { SuccessNotification } from '@kit/notifications/components';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { withI18n } from '~/lib/i18n/with-i18n';
 
+import MembershipConfirmationNotification from './_components/membership-confirmation-notification';
+
 async function UpdateAccountSuccess() {
-  const { t } = useTranslation('account');
   const client = getSupabaseServerClient();
 
   const {
@@ -21,26 +19,7 @@ async function UpdateAccountSuccess() {
     redirect(pathsConfig.app.home);
   }
 
-  const { data: accountData } = usePersonalAccountData(user.id);
-
-  if (!accountData?.id) {
-    redirect(pathsConfig.app.home);
-  }
-
-  return (
-    <SuccessNotification
-      showLogo={false}
-      title={t('account:membershipConfirmation:successTitle', {
-        firstName: accountData?.name,
-        lastName: accountData?.last_name,
-      })}
-      descriptionKey="account:membershipConfirmation:successDescription"
-      buttonProps={{
-        buttonTitleKey: 'account:membershipConfirmation:successButton',
-        href: pathsConfig.app.selectPackage,
-      }}
-    />
-  );
+  return <MembershipConfirmationNotification userId={user.id} />;
 }
 
 export default withI18n(UpdateAccountSuccess);
diff --git a/app/healthcheck/route.ts b/app/healthcheck/route.ts
index ebb71b9..39d6fdf 100644
--- a/app/healthcheck/route.ts
+++ b/app/healthcheck/route.ts
@@ -26,7 +26,7 @@ async function getSupabaseHealthCheck() {
   try {
     const client = getSupabaseServerAdminClient();
 
-    const { error } = await client.rpc('is_set', {
+    const { error } = await client.schema('medreport').rpc('is_set', {
       field_name: 'billing_provider',
     });
 
diff --git a/app/home/[account]/members/_lib/server/members-page.loader.ts b/app/home/[account]/members/_lib/server/members-page.loader.ts
index e77fd3f..6025aba 100644
--- a/app/home/[account]/members/_lib/server/members-page.loader.ts
+++ b/app/home/[account]/members/_lib/server/members-page.loader.ts
@@ -46,9 +46,11 @@ async function loadAccountMembers(
   client: SupabaseClient<Database>,
   account: string,
 ) {
-  const { data, error } = await client.rpc('get_account_members', {
-    account_slug: account,
-  });
+  const { data, error } = await client
+    .schema('medreport')
+    .rpc('get_account_members', {
+      account_slug: account,
+    });
 
   if (error) {
     console.error(error);
@@ -67,9 +69,11 @@ async function loadInvitations(
   client: SupabaseClient<Database>,
   account: string,
 ) {
-  const { data, error } = await client.rpc('get_account_invitations', {
-    account_slug: account,
-  });
+  const { data, error } = await client
+    .schema('medreport')
+    .rpc('get_account_invitations', {
+      account_slug: account,
+    });
 
   if (error) {
     console.error(error);
diff --git a/app/join/page.tsx b/app/join/page.tsx
index ffe4674..1c1b061 100644
--- a/app/join/page.tsx
+++ b/app/join/page.tsx
@@ -79,12 +79,11 @@ async function JoinTeamAccountPage(props: JoinTeamAccountPageProps) {
   // we need to verify the user isn't already in the account
   // we do so by checking if the user can read the account
   // if the user can read the account, then they are already in the account
-  const { data: isAlreadyTeamMember } = await client.rpc(
-    'is_account_team_member',
-    {
+  const { data: isAlreadyTeamMember } = await client
+    .schema('medreport')
+    .rpc('is_account_team_member', {
       target_account_id: invitation.account.id,
-    },
-  );
+    });
 
   // if the user is already in the account redirect to the home page
   if (isAlreadyTeamMember) {
diff --git a/jobs/sync-analysis-groups.ts b/jobs/sync-analysis-groups.ts
index ab34056..e375248 100644
--- a/jobs/sync-analysis-groups.ts
+++ b/jobs/sync-analysis-groups.ts
@@ -137,6 +137,7 @@ async function syncData() {
     for (const analysisGroup of analysisGroups) {
       // SAVE ANALYSIS GROUP
       const { data: insertedAnalysisGroup, error } = await supabase
+        .schema('medreport')
         .from('analysis_groups')
         .upsert(
           {
@@ -174,6 +175,7 @@ async function syncData() {
         const analysisElement = item.UuringuElement;
 
         const { data: insertedAnalysisElement, error } = await supabase
+          .schema('medreport')
           .from('analysis_elements')
           .upsert(
             {
@@ -217,6 +219,7 @@ async function syncData() {
         if (analyses?.length) {
           for (const analysis of analyses) {
             const { data: insertedAnalysis, error } = await supabase
+              .schema('medreport')
               .from('analyses')
               .upsert(
                 {
@@ -259,7 +262,7 @@ async function syncData() {
       }
     }
 
-    await supabase.from('codes').upsert(codes);
+    await supabase.schema('medreport').from('codes').upsert(codes);
 
     await supabase.schema('audit').from('sync_entries').insert({
       operation: 'ANALYSES_SYNC',
diff --git a/jobs/sync-connected-online.ts b/jobs/sync-connected-online.ts
index 12e93fc..d2ad5c9 100644
--- a/jobs/sync-connected-online.ts
+++ b/jobs/sync-connected-online.ts
@@ -105,10 +105,12 @@ async function syncData() {
     });
 
     const { error: providersError } = await supabase
+      .schema('medreport')
       .from('connected_online_providers')
       .upsert(mappedClinics);
 
     const { error: servicesError } = await supabase
+      .schema('medreport')
       .from('connected_online_services')
       .upsert(mappedServices, { onConflict: 'id', ignoreDuplicates: false });
 
diff --git a/lib/services/connected-online.service.ts b/lib/services/connected-online.service.ts
index 8a42a21..b0ad1f6 100644
--- a/lib/services/connected-online.service.ts
+++ b/lib/services/connected-online.service.ts
@@ -1,5 +1,5 @@
- 'use server'
- 
+'use server';
+
 import logRequestResult from '@/lib/services/audit.service';
 import { RequestStatus } from '@/lib/types/audit';
 import {
@@ -9,7 +9,7 @@ import {
   ConnectedOnlineMethodName,
 } from '@/lib/types/connected-online';
 import { ExternalApi } from '@/lib/types/external';
-import { Tables } from '@/supabase/database.types';
+import { Tables } from '@/packages/supabase/src/database.types';
 import { createClient } from '@/utils/supabase/server';
 import axios from 'axios';
 
@@ -106,11 +106,13 @@ export async function bookAppointment(
       { data: dbService, error: serviceError },
     ] = await Promise.all([
       supabase
+        .schema('medreport')
         .from('connected_online_providers')
         .select('*')
         .eq('id', clinicId)
         .limit(1),
       supabase
+        .schema('medreport')
         .from('connected_online_services')
         .select('*')
         .eq('sync_id', serviceSyncId)
@@ -132,8 +134,14 @@ export async function bookAppointment(
       );
     }
 
-    const clinic: Tables<'connected_online_providers'> = dbClinic![0];
-    const service: Tables<'connected_online_services'> = dbService![0];
+    const clinic: Tables<
+      { schema: 'medreport' },
+      'connected_online_providers'
+    > = dbClinic![0];
+    const service: Tables<
+      { schema: 'medreport' },
+      'connected_online_services'
+    > = dbService![0];
 
     // TODO the dummy data needs to be replaced with real values once they're present on the user/account
     const response = await axios.post(
@@ -183,6 +191,7 @@ export async function bookAppointment(
     const responseParts = responseData.Value.split(',');
 
     const { error } = await supabase
+      .schema('medreport')
       .from('connected_online_reservation')
       .insert({
         booking_code: responseParts[1],
diff --git a/lib/services/medipost.service.ts b/lib/services/medipost.service.ts
index e4cf7ee..7952634 100644
--- a/lib/services/medipost.service.ts
+++ b/lib/services/medipost.service.ts
@@ -32,6 +32,7 @@ import { toArray } from '@/lib/utils';
 import axios from 'axios';
 import { XMLParser } from 'fast-xml-parser';
 import { uniqBy } from 'lodash';
+
 import { Tables } from '@kit/supabase/database';
 
 const BASE_URL = process.env.MEDIPOST_URL!;
@@ -196,6 +197,7 @@ async function saveAnalysisGroup(
   supabase: SupabaseClient,
 ) {
   const { data: insertedAnalysisGroup, error } = await supabase
+    .schema('medreport')
     .from('analysis_groups')
     .upsert(
       {
@@ -215,13 +217,14 @@ async function saveAnalysisGroup(
   const analysisGroupId = insertedAnalysisGroup[0].id;
 
   const analysisGroupCodes = toArray(analysisGroup.Kood);
-  const codes: Partial<Tables<'codes'>>[] = analysisGroupCodes.map((kood) => ({
-    hk_code: kood.HkKood,
-    hk_code_multiplier: kood.HkKoodiKordaja,
-    coefficient: kood.Koefitsient,
-    price: kood.Hind,
-    analysis_group_id: analysisGroupId,
-  }));
+  const codes: Partial<Tables<{ schema: 'medreport' }, 'codes'>>[] =
+    analysisGroupCodes.map((kood) => ({
+      hk_code: kood.HkKood,
+      hk_code_multiplier: kood.HkKoodiKordaja,
+      coefficient: kood.Koefitsient,
+      price: kood.Hind,
+      analysis_group_id: analysisGroupId,
+    }));
 
   const analysisGroupItems = toArray(analysisGroup.Uuring);
 
@@ -229,6 +232,7 @@ async function saveAnalysisGroup(
     const analysisElement = item.UuringuElement;
 
     const { data: insertedAnalysisElement, error } = await supabase
+      .schema('medreport')
       .from('analysis_elements')
       .upsert(
         {
@@ -270,6 +274,7 @@ async function saveAnalysisGroup(
     if (analyses?.length) {
       for (const analysis of analyses) {
         const { data: insertedAnalysis, error } = await supabase
+          .schema('medreport')
           .from('analyses')
           .upsert(
             {
@@ -310,6 +315,7 @@ async function saveAnalysisGroup(
   }
 
   const { error: codesError } = await supabase
+    .schema('medreport')
     .from('codes')
     .upsert(codes, { ignoreDuplicates: false });
 
@@ -404,34 +410,41 @@ export async function composeOrderXML(
   };
 
   const { data: analysisElements } = (await supabase
+    .schema('medreport')
     .from('analysis_elements')
     .select(`*, analysis_groups(*)`)
     .in('id', orderedElements)) as {
     data: ({
-      analysis_groups: Tables<'analysis_groups'>;
-    } & Tables<'analysis_elements'>)[];
+      analysis_groups: Tables<{ schema: 'medreport' }, 'analysis_groups'>;
+    } & Tables<{ schema: 'medreport' }, 'analysis_elements'>)[];
   };
   const { data: analyses } = (await supabase
+    .schema('medreport')
     .from('analyses')
     .select(`*, analysis_elements(*, analysis_groups(*))`)
     .in('id', orderedAnalyses)) as {
     data: ({
-      analysis_elements: Tables<'analysis_elements'> & {
-        analysis_groups: Tables<'analysis_groups'>;
+      analysis_elements: Tables<
+        { schema: 'medreport' },
+        'analysis_elements'
+      > & {
+        analysis_groups: Tables<{ schema: 'medreport' }, 'analysis_groups'>;
       };
-    } & Tables<'analyses'>)[];
+    } & Tables<{ schema: 'medreport' }, 'analyses'>)[];
   };
 
-  const analysisGroups: Tables<'analysis_groups'>[] = uniqBy(
-    (
-      analysisElements?.flatMap(({ analysis_groups }) => analysis_groups) ?? []
-    ).concat(
-      analyses?.flatMap(
-        ({ analysis_elements }) => analysis_elements.analysis_groups,
-      ) ?? [],
-    ),
-    'id',
-  );
+  const analysisGroups: Tables<{ schema: 'medreport' }, 'analysis_groups'>[] =
+    uniqBy(
+      (
+        analysisElements?.flatMap(({ analysis_groups }) => analysis_groups) ??
+        []
+      ).concat(
+        analyses?.flatMap(
+          ({ analysis_elements }) => analysis_elements.analysis_groups,
+        ) ?? [],
+      ),
+      'id',
+    );
 
   const specimenSection = [];
   const analysisSection = [];
@@ -545,6 +558,7 @@ export async function syncPrivateMessage(
   const status = response.TellimuseOlek;
 
   const { data: analysisOrder, error: analysisOrderError } = await supabase
+    .schema('medreport')
     .from('analysis_orders')
     .select('user_id')
     .eq('id', response.ValisTellimuseId);
@@ -556,6 +570,7 @@ export async function syncPrivateMessage(
   }
 
   const { data: analysisResponse, error } = await supabase
+    .schema('medreport')
     .from('analysis_responses')
     .upsert(
       {
@@ -576,7 +591,7 @@ export async function syncPrivateMessage(
   const analysisGroups = toArray(response.UuringuGrupp);
 
   const responses: Omit<
-    Tables<'analysis_response_elements'>,
+    Tables<{ schema: 'medreport' }, 'analysis_response_elements'>,
     'id' | 'created_at' | 'updated_at'
   >[] = [];
   for (const analysisGroup of analysisGroups) {
@@ -608,6 +623,7 @@ export async function syncPrivateMessage(
   }
 
   const { error: deleteError } = await supabase
+    .schema('medreport')
     .from('analysis_response_elements')
     .delete()
     .eq('analysis_response_id', analysisResponse[0].id);
@@ -619,6 +635,7 @@ export async function syncPrivateMessage(
   }
 
   const { error: elementInsertError } = await supabase
+    .schema('medreport')
     .from('analysis_response_elements')
     .insert(responses);
 
diff --git a/lib/templates/medipost-order.ts b/lib/templates/medipost-order.ts
index 9b045e6..9439438 100644
--- a/lib/templates/medipost-order.ts
+++ b/lib/templates/medipost-order.ts
@@ -1,5 +1,5 @@
 import { DATE_TIME_FORMAT } from '@/lib/constants';
-import { Tables } from '@/supabase/database.types';
+import { Tables } from '@/packages/supabase/src/database.types';
 import { format } from 'date-fns';
 
 const isProd = process.env.NODE_ENV === 'production';
@@ -160,7 +160,7 @@ export const getAnalysisGroup = (
   analysisGroupOriginalId: string,
   analysisGroupName: string,
   specimenOrderNr: number,
-  analysisElement: Tables<'analysis_elements'>,
+  analysisElement: Tables<{ schema: 'medreport' }, 'analysis_elements'>,
 ) =>
   `<UuringuGrupp>
 		<UuringuGruppId>${analysisGroupOriginalId}</UuringuGruppId>
diff --git a/middleware.ts b/middleware.ts
index c9283b7..1739283 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -139,7 +139,7 @@ function getPatterns() {
       handler: adminMiddleware,
     },
     {
-      pattern: new URLPattern({ pathname: '/auth/update-account' }),
+      pattern: new URLPattern({ pathname: '/auth/*?' }),
       handler: async (req: NextRequest, res: NextResponse) => {
         const {
           data: { user },
diff --git a/packages/billing/core/src/types/index.ts b/packages/billing/core/src/types/index.ts
index 91ad002..f666e88 100644
--- a/packages/billing/core/src/types/index.ts
+++ b/packages/billing/core/src/types/index.ts
@@ -1,7 +1,7 @@
 import { Database } from '@kit/supabase/database';
 
 export type UpsertSubscriptionParams =
-  Database['public']['Functions']['upsert_subscription']['Args'] & {
+  Database['medreport']['Functions']['upsert_subscription']['Args'] & {
     line_items: Array<LineItem>;
   };
 
@@ -19,4 +19,4 @@ interface LineItem {
 }
 
 export type UpsertOrderParams =
-  Database['public']['Functions']['upsert_order']['Args'];
+  Database['medreport']['Functions']['upsert_order']['Args'];
diff --git a/packages/billing/gateway/package.json b/packages/billing/gateway/package.json
index 7693df5..94446f3 100644
--- a/packages/billing/gateway/package.json
+++ b/packages/billing/gateway/package.json
@@ -32,8 +32,7 @@
     "lucide-react": "^0.510.0",
     "next": "15.3.2",
     "react": "19.1.0",
-    "react-hook-form": "^7.56.3",
-    "react-i18next": "^15.5.1"
+    "react-hook-form": "^7.56.3"
   },
   "typesVersions": {
     "*": {
diff --git a/packages/billing/gateway/src/components/current-lifetime-order-card.tsx b/packages/billing/gateway/src/components/current-lifetime-order-card.tsx
index 8001226..fd24ab0 100644
--- a/packages/billing/gateway/src/components/current-lifetime-order-card.tsx
+++ b/packages/billing/gateway/src/components/current-lifetime-order-card.tsx
@@ -14,8 +14,8 @@ import { Trans } from '@kit/ui/trans';
 import { CurrentPlanBadge } from './current-plan-badge';
 import { LineItemDetails } from './line-item-details';
 
-type Order = Tables<'orders'>;
-type LineItem = Tables<'order_items'>;
+type Order = Tables<{ schema: 'medreport' }, 'orders'>;
+type LineItem = Tables<{ schema: 'medreport' }, 'order_items'>;
 
 interface Props {
   order: Order & {
diff --git a/packages/billing/gateway/src/components/current-subscription-card.tsx b/packages/billing/gateway/src/components/current-subscription-card.tsx
index bf608e1..072118d 100644
--- a/packages/billing/gateway/src/components/current-subscription-card.tsx
+++ b/packages/billing/gateway/src/components/current-subscription-card.tsx
@@ -18,8 +18,8 @@ import { CurrentPlanAlert } from './current-plan-alert';
 import { CurrentPlanBadge } from './current-plan-badge';
 import { LineItemDetails } from './line-item-details';
 
-type Subscription = Tables<'subscriptions'>;
-type LineItem = Tables<'subscription_items'>;
+type Subscription = Tables<{ schema: 'medreport' }, 'subscriptions'>;
+type LineItem = Tables<{ schema: 'medreport' }, 'subscription_items'>;
 
 interface Props {
   subscription: Subscription & {
diff --git a/packages/billing/gateway/src/server/services/billing-event-handler/billing-event-handler.service.ts b/packages/billing/gateway/src/server/services/billing-event-handler/billing-event-handler.service.ts
index b5df880..eb8c458 100644
--- a/packages/billing/gateway/src/server/services/billing-event-handler/billing-event-handler.service.ts
+++ b/packages/billing/gateway/src/server/services/billing-event-handler/billing-event-handler.service.ts
@@ -86,6 +86,7 @@ class BillingEventHandlerService {
         logger.info(ctx, 'Processing subscription deleted event...');
 
         const { error } = await client
+          .schema('medreport')
           .from('subscriptions')
           .delete()
           .match({ id: subscriptionId });
@@ -109,7 +110,7 @@ class BillingEventHandlerService {
         logger.info(ctx, 'Successfully deleted subscription');
       },
       onSubscriptionUpdated: async (subscription) => {
-        const client = this.clientProvider();
+        const client = this.clientProvider().schema('medreport');
         const logger = await getLogger();
 
         const ctx = {
@@ -147,7 +148,7 @@ class BillingEventHandlerService {
       onCheckoutSessionCompleted: async (payload) => {
         // Handle the checkout session completed event
         // here we add the subscription to the database
-        const client = this.clientProvider();
+        const client = this.clientProvider().schema('medreport');
         const logger = await getLogger();
 
         // Check if the payload contains an order_id
@@ -212,7 +213,7 @@ class BillingEventHandlerService {
         }
       },
       onPaymentSucceeded: async (sessionId: string) => {
-        const client = this.clientProvider();
+        const client = this.clientProvider().schema('medreport');
         const logger = await getLogger();
 
         const ctx = {
@@ -244,7 +245,7 @@ class BillingEventHandlerService {
         logger.info(ctx, 'Successfully updated payment status');
       },
       onPaymentFailed: async (sessionId: string) => {
-        const client = this.clientProvider();
+        const client = this.clientProvider().schema('medreport');
         const logger = await getLogger();
 
         const ctx = {
diff --git a/packages/billing/gateway/src/server/services/billing-gateway/billing-gateway-provider-factory.ts b/packages/billing/gateway/src/server/services/billing-gateway/billing-gateway-provider-factory.ts
index 3f8dd47..2992681 100644
--- a/packages/billing/gateway/src/server/services/billing-gateway/billing-gateway-provider-factory.ts
+++ b/packages/billing/gateway/src/server/services/billing-gateway/billing-gateway-provider-factory.ts
@@ -21,6 +21,7 @@ export async function getBillingGatewayProvider(
 
 async function getBillingProvider(client: SupabaseClient<Database>) {
   const { data, error } = await client
+    .schema('medreport')
     .from('config')
     .select('billing_provider')
     .single();
diff --git a/packages/billing/gateway/src/server/services/billing-webhooks/billing-webhooks.service.ts b/packages/billing/gateway/src/server/services/billing-webhooks/billing-webhooks.service.ts
index bf564cc..ff33f4b 100644
--- a/packages/billing/gateway/src/server/services/billing-webhooks/billing-webhooks.service.ts
+++ b/packages/billing/gateway/src/server/services/billing-webhooks/billing-webhooks.service.ts
@@ -4,7 +4,7 @@ import { Tables } from '@kit/supabase/database';
 
 import { createBillingGatewayService } from '../billing-gateway/billing-gateway.service';
 
-type Subscription = Tables<'subscriptions'>;
+type Subscription = Tables<{ schema: 'medreport' }, 'subscriptions'>;
 
 export function createBillingWebhooksService() {
   return new BillingWebhooksService();
diff --git a/packages/billing/lemon-squeezy/src/services/lemon-squeezy-webhook-handler.service.ts b/packages/billing/lemon-squeezy/src/services/lemon-squeezy-webhook-handler.service.ts
index 83e0e2e..529a450 100644
--- a/packages/billing/lemon-squeezy/src/services/lemon-squeezy-webhook-handler.service.ts
+++ b/packages/billing/lemon-squeezy/src/services/lemon-squeezy-webhook-handler.service.ts
@@ -17,14 +17,14 @@ import { createLemonSqueezySubscriptionPayloadBuilderService } from './lemon-squ
 import { createHmac } from './verify-hmac';
 
 type UpsertSubscriptionParams =
-  Database['public']['Functions']['upsert_subscription']['Args'] & {
+  Database['medreport']['Functions']['upsert_subscription']['Args'] & {
     line_items: Array<LineItem>;
   };
 
 type UpsertOrderParams =
-  Database['public']['Functions']['upsert_order']['Args'];
+  Database['medreport']['Functions']['upsert_order']['Args'];
 
-type BillingProvider = Enums<'billing_provider'>;
+type BillingProvider = Enums<{ schema: 'medreport' }, 'billing_provider'>;
 
 interface LineItem {
   id: string;
diff --git a/packages/billing/stripe/src/services/stripe-webhook-handler.service.ts b/packages/billing/stripe/src/services/stripe-webhook-handler.service.ts
index 3227bd7..faa1a5c 100644
--- a/packages/billing/stripe/src/services/stripe-webhook-handler.service.ts
+++ b/packages/billing/stripe/src/services/stripe-webhook-handler.service.ts
@@ -9,7 +9,7 @@ import { createStripeClient } from './stripe-sdk';
 import { createStripeSubscriptionPayloadBuilderService } from './stripe-subscription-payload-builder.service';
 
 type UpsertSubscriptionParams =
-  Database['public']['Functions']['upsert_subscription']['Args'] & {
+  Database['medreport']['Functions']['upsert_subscription']['Args'] & {
     line_items: Array<LineItem>;
   };
 
@@ -27,9 +27,9 @@ interface LineItem {
 }
 
 type UpsertOrderParams =
-  Database['public']['Functions']['upsert_order']['Args'];
+  Database['medreport']['Functions']['upsert_order']['Args'];
 
-type BillingProvider = Enums<'billing_provider'>;
+type BillingProvider = Enums<{ schema: 'medreport' }, 'billing_provider'>;
 
 export class StripeWebhookHandlerService
   implements BillingWebhookHandlerService
diff --git a/packages/database-webhooks/src/server/record-change.type.ts b/packages/database-webhooks/src/server/record-change.type.ts
index fd1565f..f58b064 100644
--- a/packages/database-webhooks/src/server/record-change.type.ts
+++ b/packages/database-webhooks/src/server/record-change.type.ts
@@ -1,6 +1,6 @@
 import { Database } from '@kit/supabase/database';
 
-export type Tables = Database['public']['Tables'];
+export type Tables = Database['medreport']['Tables'];
 
 export type TableChangeType = 'INSERT' | 'UPDATE' | 'DELETE';
 
diff --git a/packages/features/accounts/package.json b/packages/features/accounts/package.json
index 67eee71..148e428 100644
--- a/packages/features/accounts/package.json
+++ b/packages/features/accounts/package.json
@@ -44,7 +44,6 @@
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "react-hook-form": "^7.56.3",
-    "react-i18next": "^15.5.1",
     "sonner": "^2.0.3"
   },
   "prettier": "@kit/prettier-config",
diff --git a/packages/features/accounts/src/components/personal-account-settings/update-account-details-form.tsx b/packages/features/accounts/src/components/personal-account-settings/update-account-details-form.tsx
index 921f766..8f9dbc8 100644
--- a/packages/features/accounts/src/components/personal-account-settings/update-account-details-form.tsx
+++ b/packages/features/accounts/src/components/personal-account-settings/update-account-details-form.tsx
@@ -19,7 +19,8 @@ import { Trans } from '@kit/ui/trans';
 import { useUpdateAccountData } from '../../hooks/use-update-account';
 import { AccountDetailsSchema } from '../../schema/account-details.schema';
 
-type UpdateUserDataParams = Database['public']['Tables']['accounts']['Update'];
+type UpdateUserDataParams =
+  Database['medreport']['Tables']['accounts']['Update'];
 
 export function UpdateAccountDetailsForm({
   displayName,
diff --git a/packages/features/accounts/src/components/personal-account-settings/update-account-image-container.tsx b/packages/features/accounts/src/components/personal-account-settings/update-account-image-container.tsx
index 0332779..93eac80 100644
--- a/packages/features/accounts/src/components/personal-account-settings/update-account-image-container.tsx
+++ b/packages/features/accounts/src/components/personal-account-settings/update-account-image-container.tsx
@@ -72,6 +72,7 @@ function UploadProfileAvatarForm(props: {
             uploadUserProfilePhoto(client, file, props.userId)
               .then((pictureUrl) => {
                 return client
+                  .schema('medreport')
                   .from('accounts')
                   .update({
                     picture_url: pictureUrl,
@@ -90,6 +91,7 @@ function UploadProfileAvatarForm(props: {
           removeExistingStorageFile()
             .then(() => {
               return client
+                .schema('medreport')
                 .from('accounts')
                 .update({
                   picture_url: null,
diff --git a/packages/features/accounts/src/components/user-workspace-context.tsx b/packages/features/accounts/src/components/user-workspace-context.tsx
index aced8d4..916727c 100644
--- a/packages/features/accounts/src/components/user-workspace-context.tsx
+++ b/packages/features/accounts/src/components/user-workspace-context.tsx
@@ -17,7 +17,9 @@ interface UserWorkspace {
     id: string | null;
     name: string | null;
     picture_url: string | null;
-    subscription_status: Tables<'subscriptions'>['status'] | null;
+    subscription_status:
+      | Tables<{ schema: 'medreport' }, 'subscriptions'>['status']
+      | null;
   };
 
   user: User;
diff --git a/packages/features/accounts/src/hooks/use-personal-account-data.ts b/packages/features/accounts/src/hooks/use-personal-account-data.ts
index 83e16bc..b5379a8 100644
--- a/packages/features/accounts/src/hooks/use-personal-account-data.ts
+++ b/packages/features/accounts/src/hooks/use-personal-account-data.ts
@@ -21,6 +21,7 @@ export function usePersonalAccountData(
     }
 
     const response = await client
+      .schema('medreport')
       .from('accounts')
       .select()
       .eq('primary_owner_user_id', userId)
diff --git a/packages/features/accounts/src/hooks/use-update-account.ts b/packages/features/accounts/src/hooks/use-update-account.ts
index d55d259..386efb8 100644
--- a/packages/features/accounts/src/hooks/use-update-account.ts
+++ b/packages/features/accounts/src/hooks/use-update-account.ts
@@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query';
 import { Database } from '@kit/supabase/database';
 import { useSupabase } from '@kit/supabase/hooks/use-supabase';
 
-type UpdateData = Database['public']['Tables']['accounts']['Update'];
+type UpdateData = Database['medreport']['Tables']['accounts']['Update'];
 
 export function useUpdateAccountData(accountId: string) {
   const client = useSupabase();
@@ -11,9 +11,13 @@ export function useUpdateAccountData(accountId: string) {
   const mutationKey = ['account:data', accountId];
 
   const mutationFn = async (data: UpdateData) => {
-    const response = await client.from('accounts').update(data).match({
-      id: accountId,
-    });
+    const response = await client
+      .schema('medreport')
+      .from('accounts')
+      .update(data)
+      .match({
+        id: accountId,
+      });
 
     if (response.error) {
       throw response.error;
diff --git a/packages/features/accounts/src/server/api.ts b/packages/features/accounts/src/server/api.ts
index 5409f24..fd0c9d1 100644
--- a/packages/features/accounts/src/server/api.ts
+++ b/packages/features/accounts/src/server/api.ts
@@ -17,6 +17,7 @@ class AccountsApi {
    */
   async getAccount(id: string) {
     const { data, error } = await this.client
+      .schema('medreport')
       .from('accounts')
       .select('*')
       .eq('id', id)
@@ -35,6 +36,7 @@ class AccountsApi {
    */
   async getAccountWorkspace() {
     const { data, error } = await this.client
+      .schema('medreport')
       .from('user_account_workspace')
       .select(`*`)
       .single();
@@ -63,6 +65,7 @@ class AccountsApi {
     const { user } = data;
 
     const { data: accounts, error } = await this.client
+      .schema('medreport')
       .from('accounts_memberships')
       .select(
         `
@@ -91,6 +94,7 @@ class AccountsApi {
 
   async loadTempUserAccounts() {
     const { data: accounts, error } = await this.client
+      .schema('medreport')
       .from('user_accounts')
       .select(`name, slug`);
 
@@ -131,6 +135,7 @@ class AccountsApi {
    */
   async getOrder(accountId: string) {
     const response = await this.client
+      .schema('medreport')
       .from('orders')
       .select('*, items: order_items !inner (*)')
       .eq('account_id', accountId)
@@ -151,6 +156,7 @@ class AccountsApi {
    */
   async getCustomerId(accountId: string) {
     const response = await this.client
+      .schema('medreport')
       .from('billing_customers')
       .select('customer_id')
       .eq('account_id', accountId)
diff --git a/packages/features/admin/src/components/admin-account-page.tsx b/packages/features/admin/src/components/admin-account-page.tsx
index 71f67bc..540a932 100644
--- a/packages/features/admin/src/components/admin-account-page.tsx
+++ b/packages/features/admin/src/components/admin-account-page.tsx
@@ -3,6 +3,11 @@ import { BadgeX, Ban, ShieldPlus, VenetianMask } from 'lucide-react';
 import { Tables } from '@kit/supabase/database';
 import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import {
+  AccountInvitationsTable,
+  AccountMembersTable,
+  InviteMembersDialogContainer,
+} from '@kit/team-accounts/components';
 import { Alert, AlertDescription, AlertTitle } from '@kit/ui/alert';
 import { AppBreadcrumbs } from '@kit/ui/app-breadcrumbs';
 import { Badge } from '@kit/ui/badge';
@@ -28,14 +33,8 @@ import { AdminMembersTable } from './admin-members-table';
 import { AdminMembershipsTable } from './admin-memberships-table';
 import { AdminReactivateUserDialog } from './admin-reactivate-user-dialog';
 
-import {
-  AccountInvitationsTable,
-  AccountMembersTable,
-  InviteMembersDialogContainer,
-} from '@kit/team-accounts/components';
-
-type Account = Tables<'accounts'>;
-type Membership = Tables<'accounts_memberships'>;
+type Account = Tables<{ schema: 'medreport' }, 'accounts'>;
+type Membership = Tables<{ schema: 'medreport' }, 'accounts_memberships'>;
 
 export function AdminAccountPage(props: {
   account: Account & { memberships: Membership[] };
@@ -231,6 +230,7 @@ async function SubscriptionsTable(props: { accountId: string }) {
   const client = getSupabaseServerClient();
 
   const { data: subscription, error } = await client
+    .schema('medreport')
     .from('subscriptions')
     .select('*, subscription_items !inner (*)')
     .eq('account_id', props.accountId)
@@ -372,6 +372,7 @@ async function getMemberships(userId: string) {
   const client = getSupabaseServerClient();
 
   const memberships = await client
+    .schema('medreport')
     .from('accounts_memberships')
     .select<
       string,
@@ -394,7 +395,7 @@ async function getMemberships(userId: string) {
 async function getMembers(accountSlug: string) {
   const client = getSupabaseServerClient();
 
-  const members = await client.rpc('get_account_members', {
+  const members = await client.schema('medreport').rpc('get_account_members', {
     account_slug: accountSlug,
   });
 
diff --git a/packages/features/admin/src/components/admin-accounts-table.tsx b/packages/features/admin/src/components/admin-accounts-table.tsx
index a6ee29e..0cde270 100644
--- a/packages/features/admin/src/components/admin-accounts-table.tsx
+++ b/packages/features/admin/src/components/admin-accounts-table.tsx
@@ -38,7 +38,7 @@ import { AdminDeleteUserDialog } from './admin-delete-user-dialog';
 import { AdminImpersonateUserDialog } from './admin-impersonate-user-dialog';
 import { AdminResetPasswordDialog } from './admin-reset-password-dialog';
 
-type Account = Database['public']['Tables']['accounts']['Row'];
+type Account = Database['medreport']['Tables']['accounts']['Row'];
 
 const FiltersSchema = z.object({
   type: z.enum(['all', 'team', 'personal']),
diff --git a/packages/features/admin/src/components/admin-members-table.tsx b/packages/features/admin/src/components/admin-members-table.tsx
index d970645..739d011 100644
--- a/packages/features/admin/src/components/admin-members-table.tsx
+++ b/packages/features/admin/src/components/admin-members-table.tsx
@@ -9,7 +9,7 @@ import { DataTable } from '@kit/ui/enhanced-data-table';
 import { ProfileAvatar } from '@kit/ui/profile-avatar';
 
 type Memberships =
-  Database['public']['Functions']['get_account_members']['Returns'][number];
+  Database['medreport']['Functions']['get_account_members']['Returns'][number];
 
 export function AdminMembersTable(props: { members: Memberships[] }) {
   return <DataTable data={props.members} columns={getColumns()} />;
diff --git a/packages/features/admin/src/components/admin-memberships-table.tsx b/packages/features/admin/src/components/admin-memberships-table.tsx
index a9ea2c3..2217eca 100644
--- a/packages/features/admin/src/components/admin-memberships-table.tsx
+++ b/packages/features/admin/src/components/admin-memberships-table.tsx
@@ -7,7 +7,7 @@ import { ColumnDef } from '@tanstack/react-table';
 import { Tables } from '@kit/supabase/database';
 import { DataTable } from '@kit/ui/enhanced-data-table';
 
-type Membership = Tables<'accounts_memberships'> & {
+type Membership = Tables<{ schema: 'medreport' }, 'accounts_memberships'> & {
   account: {
     id: string;
     name: string;
diff --git a/packages/features/admin/src/lib/server/admin-server-actions.ts b/packages/features/admin/src/lib/server/admin-server-actions.ts
index 7da94b9..e648b0b 100644
--- a/packages/features/admin/src/lib/server/admin-server-actions.ts
+++ b/packages/features/admin/src/lib/server/admin-server-actions.ts
@@ -15,13 +15,13 @@ import {
   ImpersonateUserSchema,
   ReactivateUserSchema,
 } from './schema/admin-actions.schema';
+import { CreateCompanySchema } from './schema/create-company.schema';
 import { CreateUserSchema } from './schema/create-user.schema';
 import { ResetPasswordSchema } from './schema/reset-password.schema';
 import { createAdminAccountsService } from './services/admin-accounts.service';
 import { createAdminAuthUserService } from './services/admin-auth-user.service';
-import { adminAction } from './utils/admin-action';
-import { CreateCompanySchema } from './schema/create-company.schema';
 import { createCreateCompanyAccountService } from './services/admin-create-company-account.service';
+import { adminAction } from './utils/admin-action';
 
 /**
  * @name banUserAction
@@ -183,12 +183,16 @@ export const createUserAction = adminAction(
       );
 
       const { error: accountError } = await adminClient
+        .schema('medreport')
         .from('accounts')
         .update({ personal_code: personalCode })
         .eq('id', data.user.id);
 
       if (accountError) {
-        logger.error({ accountError }, 'Error inserting personal code to accounts');
+        logger.error(
+          { accountError },
+          'Error inserting personal code to accounts',
+        );
         throw new Error(`Error saving personal code: ${accountError.message}`);
       }
 
diff --git a/packages/features/admin/src/lib/server/services/admin-accounts.service.ts b/packages/features/admin/src/lib/server/services/admin-accounts.service.ts
index 35815e0..e42e0e0 100644
--- a/packages/features/admin/src/lib/server/services/admin-accounts.service.ts
+++ b/packages/features/admin/src/lib/server/services/admin-accounts.service.ts
@@ -13,6 +13,7 @@ class AdminAccountsService {
 
   async deleteAccount(accountId: string) {
     const { error } = await this.adminClient
+      .schema('medreport')
       .from('accounts')
       .delete()
       .eq('id', accountId);
diff --git a/packages/features/admin/src/lib/server/services/admin-dashboard.service.ts b/packages/features/admin/src/lib/server/services/admin-dashboard.service.ts
index d699e76..d05d452 100644
--- a/packages/features/admin/src/lib/server/services/admin-dashboard.service.ts
+++ b/packages/features/admin/src/lib/server/services/admin-dashboard.service.ts
@@ -30,6 +30,7 @@ export class AdminDashboardService {
     };
 
     const subscriptionsPromise = this.client
+      .schema('medreport')
       .from('subscriptions')
       .select('*', selectParams)
       .eq('status', 'active')
@@ -47,6 +48,7 @@ export class AdminDashboardService {
       });
 
     const trialsPromise = this.client
+      .schema('medreport')
       .from('subscriptions')
       .select('*', selectParams)
       .eq('status', 'trialing')
@@ -64,6 +66,7 @@ export class AdminDashboardService {
       });
 
     const accountsPromise = this.client
+      .schema('medreport')
       .from('accounts')
       .select('*', selectParams)
       .eq('is_personal_account', true)
@@ -81,6 +84,7 @@ export class AdminDashboardService {
       });
 
     const teamAccountsPromise = this.client
+      .schema('medreport')
       .from('accounts')
       .select('*', selectParams)
       .eq('is_personal_account', false)
diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json
index 6c1dc77..2ca0885 100644
--- a/packages/features/auth/package.json
+++ b/packages/features/auth/package.json
@@ -35,7 +35,6 @@
     "lucide-react": "^0.510.0",
     "next": "15.3.2",
     "react-hook-form": "^7.56.3",
-    "react-i18next": "^15.5.1",
     "sonner": "^2.0.3"
   },
   "prettier": "@kit/prettier-config",
diff --git a/packages/features/auth/src/components/sign-in-methods-container.tsx b/packages/features/auth/src/components/sign-in-methods-container.tsx
index fd2d51d..83bda02 100644
--- a/packages/features/auth/src/components/sign-in-methods-container.tsx
+++ b/packages/features/auth/src/components/sign-in-methods-container.tsx
@@ -55,12 +55,11 @@ export function SignInMethodsContainer(props: {
       }
 
       try {
-        const { data: hasConsentPersonalData } = await client.rpc(
-          'has_consent_personal_data',
-          {
+        const { data: hasConsentPersonalData } = await client
+          .schema('medreport')
+          .rpc('has_consent_personal_data', {
             account_id: userId,
-          },
-        );
+          });
 
         if (hasConsentPersonalData) {
           router.replace(props.paths.returnPath);
diff --git a/packages/features/auth/src/server/api.ts b/packages/features/auth/src/server/api.ts
index ce82491..30ae995 100644
--- a/packages/features/auth/src/server/api.ts
+++ b/packages/features/auth/src/server/api.ts
@@ -86,7 +86,7 @@ class AuthApi {
     if (!user) {
       throw new Error('User not authenticated');
     }
-    console.log('test', user, data);
+
     const response = await this.client
       .schema('medreport')
       .from('account_params')
diff --git a/packages/features/medusa-storefront/src/middleware.ts b/packages/features/medusa-storefront/src/middleware.ts
index ff4609b..21290da 100644
--- a/packages/features/medusa-storefront/src/middleware.ts
+++ b/packages/features/medusa-storefront/src/middleware.ts
@@ -1,29 +1,28 @@
-import { HttpTypes } from "@medusajs/types"
-import { NextRequest, NextResponse } from "next/server"
+import { HttpTypes } from "@medusajs/types";
+import { NextRequest, NextResponse } from "next/server";
 
-const BACKEND_URL = process.env.MEDUSA_BACKEND_URL
-const PUBLISHABLE_API_KEY = process.env.NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY
-const DEFAULT_REGION = process.env.NEXT_PUBLIC_DEFAULT_REGION || "us"
+const BACKEND_URL = process.env.MEDUSA_BACKEND_URL;
+const PUBLISHABLE_API_KEY = process.env.NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY;
+const DEFAULT_REGION = process.env.NEXT_PUBLIC_DEFAULT_REGION || "us";
 
 const regionMapCache = {
   regionMap: new Map<string, HttpTypes.StoreRegion>(),
   regionMapUpdated: Date.now(),
-}
+};
 
 async function getRegionMap(cacheId: string) {
-  const { regionMap, regionMapUpdated } = regionMapCache
+  const { regionMap, regionMapUpdated } = regionMapCache;
 
   if (!BACKEND_URL) {
     throw new Error(
       "Middleware.ts: Error fetching regions. Did you set up regions in your Medusa Admin and define a MEDUSA_BACKEND_URL environment variable? Note that the variable is no longer named NEXT_PUBLIC_MEDUSA_BACKEND_URL."
-    )
+    );
   }
 
   if (
     !regionMap.keys().next().value ||
     regionMapUpdated < Date.now() - 3600 * 1000
   ) {
-    console.log("PUBLISHABLE_API_KEY", PUBLISHABLE_API_KEY)
     // Fetch regions from Medusa. We can't use the JS client here because middleware is running on Edge and the client needs a Node environment.
     const { regions } = await fetch(`${BACKEND_URL}/store/regions`, {
       headers: {
@@ -35,32 +34,32 @@ async function getRegionMap(cacheId: string) {
       },
       cache: "force-cache",
     }).then(async (response) => {
-      const json = await response.json()
+      const json = await response.json();
 
       if (!response.ok) {
-        throw new Error(json.message)
+        throw new Error(json.message);
       }
 
-      return json
-    })
+      return json;
+    });
 
     if (!regions?.length) {
       throw new Error(
         "No regions found. Please set up regions in your Medusa Admin."
-      )
+      );
     }
 
     // Create a map of country codes to regions.
     regions.forEach((region: HttpTypes.StoreRegion) => {
       region.countries?.forEach((c) => {
-        regionMapCache.regionMap.set(c.iso_2 ?? "", region)
-      })
-    })
+        regionMapCache.regionMap.set(c.iso_2 ?? "", region);
+      });
+    });
 
-    regionMapCache.regionMapUpdated = Date.now()
+    regionMapCache.regionMapUpdated = Date.now();
   }
 
-  return regionMapCache.regionMap
+  return regionMapCache.regionMap;
 }
 
 /**
@@ -73,30 +72,32 @@ async function getCountryCode(
   regionMap: Map<string, HttpTypes.StoreRegion | number>
 ) {
   try {
-    let countryCode
+    let countryCode;
 
     const vercelCountryCode = request.headers
       .get("x-vercel-ip-country")
-      ?.toLowerCase()
+      ?.toLowerCase();
 
-    const urlCountryCode = request.nextUrl.pathname.split("/")[1]?.toLowerCase()
+    const urlCountryCode = request.nextUrl.pathname
+      .split("/")[1]
+      ?.toLowerCase();
 
     if (urlCountryCode && regionMap.has(urlCountryCode)) {
-      countryCode = urlCountryCode
+      countryCode = urlCountryCode;
     } else if (vercelCountryCode && regionMap.has(vercelCountryCode)) {
-      countryCode = vercelCountryCode
+      countryCode = vercelCountryCode;
     } else if (regionMap.has(DEFAULT_REGION)) {
-      countryCode = DEFAULT_REGION
+      countryCode = DEFAULT_REGION;
     } else if (regionMap.keys().next().value) {
-      countryCode = regionMap.keys().next().value
+      countryCode = regionMap.keys().next().value;
     }
 
-    return countryCode
+    return countryCode;
   } catch (error) {
     if (process.env.NODE_ENV === "development") {
       console.error(
         "Middleware.ts: Error getting the country code. Did you set up regions in your Medusa Admin and define a MEDUSA_BACKEND_URL environment variable? Note that the variable is no longer named NEXT_PUBLIC_MEDUSA_BACKEND_URL."
-      )
+      );
     }
   }
 }
@@ -105,56 +106,56 @@ async function getCountryCode(
  * Middleware to handle region selection and onboarding status.
  */
 export async function middleware(request: NextRequest) {
-  let redirectUrl = request.nextUrl.href
+  let redirectUrl = request.nextUrl.href;
 
-  let response = NextResponse.redirect(redirectUrl, 307)
+  let response = NextResponse.redirect(redirectUrl, 307);
 
-  let cacheIdCookie = request.cookies.get("_medusa_cache_id")
+  let cacheIdCookie = request.cookies.get("_medusa_cache_id");
 
-  let cacheId = cacheIdCookie?.value || crypto.randomUUID()
+  let cacheId = cacheIdCookie?.value || crypto.randomUUID();
 
-  const regionMap = await getRegionMap(cacheId)
+  const regionMap = await getRegionMap(cacheId);
 
-  const countryCode = regionMap && (await getCountryCode(request, regionMap))
+  const countryCode = regionMap && (await getCountryCode(request, regionMap));
 
   const urlHasCountryCode =
-    countryCode && request.nextUrl.pathname.split("/")[1].includes(countryCode)
+    countryCode && request.nextUrl.pathname.split("/")[1].includes(countryCode);
 
   // if one of the country codes is in the url and the cache id is set, return next
   if (urlHasCountryCode && cacheIdCookie) {
-    return NextResponse.next()
+    return NextResponse.next();
   }
 
   // if one of the country codes is in the url and the cache id is not set, set the cache id and redirect
   if (urlHasCountryCode && !cacheIdCookie) {
     response.cookies.set("_medusa_cache_id", cacheId, {
       maxAge: 60 * 60 * 24,
-    })
+    });
 
-    return response
+    return response;
   }
 
   // check if the url is a static asset
   if (request.nextUrl.pathname.includes(".")) {
-    return NextResponse.next()
+    return NextResponse.next();
   }
 
   const redirectPath =
-    request.nextUrl.pathname === "/" ? "" : request.nextUrl.pathname
+    request.nextUrl.pathname === "/" ? "" : request.nextUrl.pathname;
 
-  const queryString = request.nextUrl.search ? request.nextUrl.search : ""
+  const queryString = request.nextUrl.search ? request.nextUrl.search : "";
 
   // If no country code is set, we redirect to the relevant region.
   if (!urlHasCountryCode && countryCode) {
-    redirectUrl = `${request.nextUrl.origin}/${countryCode}${redirectPath}${queryString}`
-    response = NextResponse.redirect(`${redirectUrl}`, 307)
+    redirectUrl = `${request.nextUrl.origin}/${countryCode}${redirectPath}${queryString}`;
+    response = NextResponse.redirect(`${redirectUrl}`, 307);
   }
 
-  return response
+  return response;
 }
 
 export const config = {
   matcher: [
     "/((?!api|_next/static|_next/image|favicon.ico|images|assets|png|svg|jpg|jpeg|gif|webp).*)",
   ],
-}
+};
diff --git a/packages/features/notifications/package.json b/packages/features/notifications/package.json
index 2debf14..5355d69 100644
--- a/packages/features/notifications/package.json
+++ b/packages/features/notifications/package.json
@@ -24,8 +24,7 @@
     "@types/react": "19.1.4",
     "lucide-react": "^0.510.0",
     "react": "19.1.0",
-    "react-dom": "19.1.0",
-    "react-i18next": "^15.5.1"
+    "react-dom": "19.1.0"
   },
   "prettier": "@kit/prettier-config",
   "typesVersions": {
diff --git a/packages/features/notifications/src/components/notifications-popover.tsx b/packages/features/notifications/src/components/notifications-popover.tsx
index 96030fc..946dfcb 100644
--- a/packages/features/notifications/src/components/notifications-popover.tsx
+++ b/packages/features/notifications/src/components/notifications-popover.tsx
@@ -14,7 +14,7 @@ import { cn } from '@kit/ui/utils';
 
 import { useDismissNotification, useFetchNotifications } from '../hooks';
 
-type Notification = Database['public']['Tables']['notifications']['Row'];
+type Notification = Database['medreport']['Tables']['notifications']['Row'];
 
 type PartialNotification = Pick<
   Notification,
@@ -121,7 +121,10 @@ export function NotificationsPopover(params: {
   return (
     <Popover modal open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
-        <Button className={'relative px-4 py-2 h-10 border-1 mr-0'} variant="ghost">
+        <Button
+          className={'relative mr-0 h-10 border-1 px-4 py-2'}
+          variant="ghost"
+        >
           <Bell className={'size-4'} />
 
           <span
diff --git a/packages/features/notifications/src/hooks/use-dismiss-notification.ts b/packages/features/notifications/src/hooks/use-dismiss-notification.ts
index 8c40960..6d0694d 100644
--- a/packages/features/notifications/src/hooks/use-dismiss-notification.ts
+++ b/packages/features/notifications/src/hooks/use-dismiss-notification.ts
@@ -8,6 +8,7 @@ export function useDismissNotification() {
   return useCallback(
     async (notification: number) => {
       const { error } = await client
+        .schema('medreport')
         .from('notifications')
         .update({ dismissed: true })
         .eq('id', notification);
diff --git a/packages/features/notifications/src/hooks/use-fetch-notifications.ts b/packages/features/notifications/src/hooks/use-fetch-notifications.ts
index 251038b..648fc00 100644
--- a/packages/features/notifications/src/hooks/use-fetch-notifications.ts
+++ b/packages/features/notifications/src/hooks/use-fetch-notifications.ts
@@ -49,6 +49,7 @@ function useFetchInitialNotifications(props: { accountIds: string[] }) {
     queryKey: ['notifications', ...props.accountIds],
     queryFn: async () => {
       const { data } = await client
+        .schema('medreport')
         .from('notifications')
         .select(
           `id, 
diff --git a/packages/features/notifications/src/server/api.ts b/packages/features/notifications/src/server/api.ts
index 8d19b2a..8a8b605 100644
--- a/packages/features/notifications/src/server/api.ts
+++ b/packages/features/notifications/src/server/api.ts
@@ -22,7 +22,7 @@ import { Database } from '@kit/supabase/database';
 
 import { createNotificationsService } from './notifications.service';
 
-type Notification = Database['public']['Tables']['notifications'];
+type Notification = Database['medreport']['Tables']['notifications'];
 
 /**
  * @name createNotificationsApi
diff --git a/packages/features/notifications/src/server/notifications.service.ts b/packages/features/notifications/src/server/notifications.service.ts
index d49f8f0..3bb8d4c 100644
--- a/packages/features/notifications/src/server/notifications.service.ts
+++ b/packages/features/notifications/src/server/notifications.service.ts
@@ -4,7 +4,7 @@ import { SupabaseClient } from '@supabase/supabase-js';
 
 import { Database } from '@kit/supabase/database';
 
-type Notification = Database['public']['Tables']['notifications'];
+type Notification = Database['medreport']['Tables']['notifications'];
 
 export function createNotificationsService(client: SupabaseClient<Database>) {
   return new NotificationsService(client);
@@ -14,7 +14,10 @@ class NotificationsService {
   constructor(private readonly client: SupabaseClient<Database>) {}
 
   async createNotification(params: Notification['Insert']) {
-    const { error } = await this.client.from('notifications').insert(params);
+    const { error } = await this.client
+      .schema('medreport')
+      .from('notifications')
+      .insert(params);
 
     if (error) {
       throw error;
diff --git a/packages/features/team-accounts/package.json b/packages/features/team-accounts/package.json
index 049cb3b..81c0c6d 100644
--- a/packages/features/team-accounts/package.json
+++ b/packages/features/team-accounts/package.json
@@ -45,7 +45,6 @@
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "react-hook-form": "^7.56.3",
-    "react-i18next": "^15.5.1",
     "sonner": "^2.0.3"
   },
   "prettier": "@kit/prettier-config",
diff --git a/packages/features/team-accounts/src/components/invitations/account-invitations-table.tsx b/packages/features/team-accounts/src/components/invitations/account-invitations-table.tsx
index 45a7a2a..e267ea7 100644
--- a/packages/features/team-accounts/src/components/invitations/account-invitations-table.tsx
+++ b/packages/features/team-accounts/src/components/invitations/account-invitations-table.tsx
@@ -27,7 +27,7 @@ import { RenewInvitationDialog } from './renew-invitation-dialog';
 import { UpdateInvitationDialog } from './update-invitation-dialog';
 
 type Invitations =
-  Database['public']['Functions']['get_account_invitations']['Returns'];
+  Database['medreport']['Functions']['get_account_invitations']['Returns'];
 
 type AccountInvitationsTableProps = {
   invitations: Invitations;
diff --git a/packages/features/team-accounts/src/components/members/account-members-table.tsx b/packages/features/team-accounts/src/components/members/account-members-table.tsx
index 5473213..0e461f9 100644
--- a/packages/features/team-accounts/src/components/members/account-members-table.tsx
+++ b/packages/features/team-accounts/src/components/members/account-members-table.tsx
@@ -27,7 +27,7 @@ import { TransferOwnershipDialog } from './transfer-ownership-dialog';
 import { UpdateMemberRoleDialog } from './update-member-role-dialog';
 
 type Members =
-  Database['public']['Functions']['get_account_members']['Returns'];
+  Database['medreport']['Functions']['get_account_members']['Returns'];
 
 interface Permissions {
   canUpdateRole: (roleHierarchy: number) => boolean;
@@ -87,7 +87,7 @@ export function AccountMembersTable({
 
       return (
         displayName.includes(searchString) ||
-        member.role.toLowerCase().includes(searchString) || 
+        member.role.toLowerCase().includes(searchString) ||
         (member.personal_code || '').includes(searchString)
       );
     })
diff --git a/packages/features/team-accounts/src/components/members/roles-data-provider.tsx b/packages/features/team-accounts/src/components/members/roles-data-provider.tsx
index 1075e5b..eae7935 100644
--- a/packages/features/team-accounts/src/components/members/roles-data-provider.tsx
+++ b/packages/features/team-accounts/src/components/members/roles-data-provider.tsx
@@ -21,7 +21,7 @@ export function RolesDataProvider(props: {
 }
 
 function useFetchRoles(props: { maxRoleHierarchy: number }) {
-  const supabase = useSupabase();
+  const supabase = useSupabase().schema('medreport');
 
   return useQuery({
     queryKey: ['roles', props.maxRoleHierarchy],
diff --git a/packages/features/team-accounts/src/components/settings/update-team-account-image-container.tsx b/packages/features/team-accounts/src/components/settings/update-team-account-image-container.tsx
index 6c4e871..9e8d5fa 100644
--- a/packages/features/team-accounts/src/components/settings/update-team-account-image-container.tsx
+++ b/packages/features/team-accounts/src/components/settings/update-team-account-image-container.tsx
@@ -53,6 +53,7 @@ export function UpdateTeamAccountImage(props: {
             uploadUserProfilePhoto(client, file, props.account.id).then(
               (pictureUrl) => {
                 return client
+                  .schema('medreport')
                   .from('accounts')
                   .update({
                     picture_url: pictureUrl,
@@ -68,6 +69,7 @@ export function UpdateTeamAccountImage(props: {
         const promise = () =>
           removeExistingStorageFile().then(() => {
             return client
+              .schema('medreport')
               .from('accounts')
               .update({
                 picture_url: null,
diff --git a/packages/features/team-accounts/src/components/team-account-workspace-context.tsx b/packages/features/team-accounts/src/components/team-account-workspace-context.tsx
index c3fa685..e7418a7 100644
--- a/packages/features/team-accounts/src/components/team-account-workspace-context.tsx
+++ b/packages/features/team-accounts/src/components/team-account-workspace-context.tsx
@@ -7,8 +7,8 @@ import { User } from '@supabase/supabase-js';
 import { Database } from '@kit/supabase/database';
 
 interface AccountWorkspace {
-  accounts: Database['public']['Views']['user_accounts']['Row'][];
-  account: Database['public']['Functions']['team_account_workspace']['Returns'][0];
+  accounts: Database['medreport']['Views']['user_accounts']['Row'][];
+  account: Database['medreport']['Functions']['team_account_workspace']['Returns'][0];
   user: User;
 }
 
diff --git a/packages/features/team-accounts/src/schema/create-team.schema.ts b/packages/features/team-accounts/src/schema/create-team.schema.ts
index feadea7..44da2e1 100644
--- a/packages/features/team-accounts/src/schema/create-team.schema.ts
+++ b/packages/features/team-accounts/src/schema/create-team.schema.ts
@@ -25,7 +25,6 @@ export const TeamNameSchema = z
   .max(50)
   .refine(
     (name) => {
-      console.log(name);
       return !SPECIAL_CHARACTERS_REGEX.test(name);
     },
     {
diff --git a/packages/features/team-accounts/src/server/actions/team-details-server-actions.ts b/packages/features/team-accounts/src/server/actions/team-details-server-actions.ts
index da5e417..e4e819a 100644
--- a/packages/features/team-accounts/src/server/actions/team-details-server-actions.ts
+++ b/packages/features/team-accounts/src/server/actions/team-details-server-actions.ts
@@ -22,6 +22,7 @@ export const updateTeamAccountName = enhanceAction(
     logger.info(ctx, `Updating team name...`);
 
     const { error, data } = await client
+      .schema('medreport')
       .from('accounts')
       .update({
         name,
diff --git a/packages/features/team-accounts/src/server/actions/team-invitations-server-actions.ts b/packages/features/team-accounts/src/server/actions/team-invitations-server-actions.ts
index 9a5bce9..74d69ce 100644
--- a/packages/features/team-accounts/src/server/actions/team-invitations-server-actions.ts
+++ b/packages/features/team-accounts/src/server/actions/team-invitations-server-actions.ts
@@ -41,6 +41,7 @@ export const createInvitationsAction = enhanceAction(
     );
 
     const { data: company, error: companyError } = await client
+      .schema('medreport')
       .from('accounts')
       .select('id')
       .eq('slug', accountSlug);
diff --git a/packages/features/team-accounts/src/server/actions/team-members-server-actions.ts b/packages/features/team-accounts/src/server/actions/team-members-server-actions.ts
index fc90826..92c0b5f 100644
--- a/packages/features/team-accounts/src/server/actions/team-members-server-actions.ts
+++ b/packages/features/team-accounts/src/server/actions/team-members-server-actions.ts
@@ -79,9 +79,11 @@ export const transferOwnershipAction = enhanceAction(
     logger.info(ctx, 'Processing team ownership transfer request...');
 
     // assert that the user is the owner of the account
-    const { data: isOwner, error } = await client.rpc('is_account_owner', {
-      account_id: data.accountId,
-    });
+    const { data: isOwner, error } = await client
+      .schema('medreport')
+      .rpc('is_account_owner', {
+        account_id: data.accountId,
+      });
 
     if (error || !isOwner) {
       logger.error(ctx, 'User is not the owner of this account');
diff --git a/packages/features/team-accounts/src/server/api.ts b/packages/features/team-accounts/src/server/api.ts
index 2e7a1f8..68599d2 100644
--- a/packages/features/team-accounts/src/server/api.ts
+++ b/packages/features/team-accounts/src/server/api.ts
@@ -17,6 +17,7 @@ export class TeamAccountsApi {
    */
   async getTeamAccount(slug: string) {
     const { data, error } = await this.client
+      .schema('medreport')
       .from('accounts')
       .select('*')
       .eq('slug', slug)
@@ -36,6 +37,7 @@ export class TeamAccountsApi {
    */
   async getTeamAccountById(accountId: string) {
     const { data, error } = await this.client
+      .schema('medreport')
       .from('accounts')
       .select('*')
       .eq('id', accountId)
@@ -55,6 +57,7 @@ export class TeamAccountsApi {
    */
   async getSubscription(accountId: string) {
     const { data, error } = await this.client
+      .schema('medreport')
       .from('subscriptions')
       .select('*, items: subscription_items !inner (*)')
       .eq('account_id', accountId)
@@ -73,6 +76,7 @@ export class TeamAccountsApi {
    */
   async getOrder(accountId: string) {
     const response = await this.client
+      .schema('medreport')
       .from('orders')
       .select('*, items: order_items !inner (*)')
       .eq('account_id', accountId)
@@ -91,13 +95,17 @@ export class TeamAccountsApi {
    * @param slug
    */
   async getAccountWorkspace(slug: string, userId: string) {
-    const accountPromise = this.client.rpc('team_account_workspace', {
-      account_slug: slug,
-    });
+    const accountPromise = this.client
+      .schema('medreport')
+      .rpc('team_account_workspace', {
+        account_slug: slug,
+      });
 
     const accountsPromise = this.client
+      .schema('medreport')
       .from('accounts_memberships')
-      .select(`
+      .select(
+        `
       account_id,
       user_accounts (
         id,
@@ -106,7 +114,8 @@ export class TeamAccountsApi {
         slug,
         picture_url
       )
-    `)
+    `,
+      )
       .eq('user_id', userId)
       .eq('account_role', 'owner');
 
@@ -114,7 +123,7 @@ export class TeamAccountsApi {
       accountPromise,
       accountsPromise,
     ]);
-    
+
     if (accountResult.error) {
       return {
         error: accountResult.error,
@@ -154,7 +163,7 @@ export class TeamAccountsApi {
   async hasPermission(params: {
     accountId: string;
     userId: string;
-    permission: Database['public']['Enums']['app_permissions'];
+    permission: Database['medreport']['Enums']['app_permissions'];
   }) {
     const { data, error } = await this.client.rpc('has_permission', {
       account_id: params.accountId,
@@ -176,6 +185,7 @@ export class TeamAccountsApi {
    */
   async getMembersCount(accountId: string) {
     const { count, error } = await this.client
+      .schema('medreport')
       .from('accounts_memberships')
       .select('*', {
         head: true,
@@ -197,6 +207,7 @@ export class TeamAccountsApi {
    */
   async getCustomerId(accountId: string) {
     const { data, error } = await this.client
+      .schema('medreport')
       .from('billing_customers')
       .select('customer_id')
       .eq('account_id', accountId)
@@ -217,6 +228,7 @@ export class TeamAccountsApi {
    */
   async getInvitation(adminClient: SupabaseClient<Database>, token: string) {
     const { data: invitation, error } = await adminClient
+      .schema('medreport')
       .from('invitations')
       .select<
         string,
diff --git a/packages/features/team-accounts/src/server/services/account-invitations.service.ts b/packages/features/team-accounts/src/server/services/account-invitations.service.ts
index 6d6615f..a118f19 100644
--- a/packages/features/team-accounts/src/server/services/account-invitations.service.ts
+++ b/packages/features/team-accounts/src/server/services/account-invitations.service.ts
@@ -43,6 +43,7 @@ class AccountInvitationsService {
     logger.info(ctx, 'Removing invitation...');
 
     const { data, error } = await this.client
+      .schema('medreport')
       .from('invitations')
       .delete()
       .match({
@@ -76,6 +77,7 @@ class AccountInvitationsService {
     logger.info(ctx, 'Updating invitation...');
 
     const { data, error } = await this.client
+      .schema('medreport')
       .from('invitations')
       .update({
         role: params.role,
@@ -105,12 +107,11 @@ class AccountInvitationsService {
     invitation: z.infer<typeof InviteMembersSchema>['invitations'][number],
     accountSlug: string,
   ) {
-    const { data: members, error } = await this.client.rpc(
-      'get_account_members',
-      {
+    const { data: members, error } = await this.client
+      .schema('medreport')
+      .rpc('get_account_members', {
         account_slug: accountSlug,
-      },
-    );
+      });
 
     if (error) {
       throw error;
@@ -169,6 +170,7 @@ class AccountInvitationsService {
     }
 
     const accountResponse = await this.client
+      .schema('medreport')
       .from('accounts')
       .select('name')
       .eq('slug', accountSlug)
@@ -183,10 +185,12 @@ class AccountInvitationsService {
       throw new Error('Account not found');
     }
 
-    const response = await this.client.rpc('add_invitations_to_account', {
-      invitations,
-      account_slug: accountSlug,
-    });
+    const response = await this.client
+      .schema('medreport')
+      .rpc('add_invitations_to_account', {
+        invitations,
+        account_slug: accountSlug,
+      });
 
     if (response.error) {
       logger.error(
@@ -232,10 +236,12 @@ class AccountInvitationsService {
 
     logger.info(ctx, 'Accepting invitation to team');
 
-    const { error, data } = await adminClient.rpc('accept_invitation', {
-      token: params.inviteToken,
-      user_id: params.userId,
-    });
+    const { error, data } = await adminClient
+      .schema('medreport')
+      .rpc('accept_invitation', {
+        token: params.inviteToken,
+        user_id: params.userId,
+      });
 
     if (error) {
       logger.error(
@@ -272,6 +278,7 @@ class AccountInvitationsService {
     const sevenDaysFromNow = formatISO(addDays(new Date(), 7));
 
     const { data, error } = await this.client
+      .schema('medreport')
       .from('invitations')
       .update({
         expires_at: sevenDaysFromNow,
diff --git a/packages/features/team-accounts/src/server/services/account-members.service.ts b/packages/features/team-accounts/src/server/services/account-members.service.ts
index 810a049..8e3e332 100644
--- a/packages/features/team-accounts/src/server/services/account-members.service.ts
+++ b/packages/features/team-accounts/src/server/services/account-members.service.ts
@@ -37,6 +37,7 @@ class AccountMembersService {
     logger.info(ctx, `Removing member from account...`);
 
     const { data, error } = await this.client
+      .schema('medreport')
       .from('accounts_memberships')
       .delete()
       .match({
@@ -88,7 +89,7 @@ class AccountMembersService {
     logger.info(ctx, `Validating permissions to update member role...`);
 
     const { data: canActionAccountMember, error: accountError } =
-      await this.client.rpc('can_action_account_member', {
+      await this.client.schema('medreport').rpc('can_action_account_member', {
         target_user_id: params.userId,
         target_team_account_id: params.accountId,
       });
@@ -112,6 +113,7 @@ class AccountMembersService {
     // for updating accounts_memberships. Instead, we use the can_action_account_member
     // RPC to validate permissions to update the role
     const { data, error } = await adminClient
+      .schema('medreport')
       .from('accounts_memberships')
       .update({
         account_role: params.role,
@@ -157,13 +159,12 @@ class AccountMembersService {
 
     logger.info(ctx, `Transferring ownership of account...`);
 
-    const { data, error } = await adminClient.rpc(
-      'transfer_team_account_ownership',
-      {
+    const { data, error } = await adminClient
+      .schema('medreport')
+      .rpc('transfer_team_account_ownership', {
         target_account_id: params.accountId,
         new_owner_id: params.userId,
-      },
-    );
+      });
 
     if (error) {
       logger.error(
diff --git a/packages/features/team-accounts/src/server/services/account-per-seat-billing.service.ts b/packages/features/team-accounts/src/server/services/account-per-seat-billing.service.ts
index 08f9eb0..43365b3 100644
--- a/packages/features/team-accounts/src/server/services/account-per-seat-billing.service.ts
+++ b/packages/features/team-accounts/src/server/services/account-per-seat-billing.service.ts
@@ -36,6 +36,7 @@ class AccountPerSeatBillingService {
     );
 
     const { data, error } = await this.client
+      .schema('medreport')
       .from('subscriptions')
       .select(
         `
diff --git a/packages/features/team-accounts/src/server/services/create-team-account.service.ts b/packages/features/team-accounts/src/server/services/create-team-account.service.ts
index 04d3371..a3fea05 100644
--- a/packages/features/team-accounts/src/server/services/create-team-account.service.ts
+++ b/packages/features/team-accounts/src/server/services/create-team-account.service.ts
@@ -22,9 +22,11 @@ class CreateTeamAccountService {
 
     logger.info(ctx, `Creating new team account...`);
 
-    const { error, data } = await this.client.rpc('create_team_account', {
-      account_name: params.name,
-    });
+    const { error, data } = await this.client
+      .schema('medreport')
+      .rpc('create_team_account', {
+        account_name: params.name,
+      });
 
     if (error) {
       logger.error(
diff --git a/packages/features/team-accounts/src/server/services/delete-team-account.service.ts b/packages/features/team-accounts/src/server/services/delete-team-account.service.ts
index 75e0b3b..09b9ff1 100644
--- a/packages/features/team-accounts/src/server/services/delete-team-account.service.ts
+++ b/packages/features/team-accounts/src/server/services/delete-team-account.service.ts
@@ -40,6 +40,7 @@ class DeleteTeamAccountService {
 
     // we can use the admin client to delete the account.
     const { error } = await adminClient
+      .schema('medreport')
       .from('accounts')
       .delete()
       .eq('id', params.accountId);
diff --git a/packages/features/team-accounts/src/server/services/leave-team-account.service.ts b/packages/features/team-accounts/src/server/services/leave-team-account.service.ts
index e039a2d..bd23256 100644
--- a/packages/features/team-accounts/src/server/services/leave-team-account.service.ts
+++ b/packages/features/team-accounts/src/server/services/leave-team-account.service.ts
@@ -45,6 +45,7 @@ class LeaveTeamAccountService {
     const { accountId, userId } = Schema.parse(params);
 
     const { error } = await this.adminClient
+      .schema('medreport')
       .from('accounts_memberships')
       .delete()
       .match({
diff --git a/packages/features/team-accounts/src/server/services/webhooks/account-invitations-webhook.service.ts b/packages/features/team-accounts/src/server/services/webhooks/account-invitations-webhook.service.ts
index 0bac00b..2edd142 100644
--- a/packages/features/team-accounts/src/server/services/webhooks/account-invitations-webhook.service.ts
+++ b/packages/features/team-accounts/src/server/services/webhooks/account-invitations-webhook.service.ts
@@ -5,7 +5,7 @@ import { z } from 'zod';
 import { getLogger } from '@kit/shared/logger';
 import { Database } from '@kit/supabase/database';
 
-type Invitation = Database['public']['Tables']['invitations']['Row'];
+type Invitation = Database['medreport']['Tables']['invitations']['Row'];
 
 const invitePath = '/join';
 
@@ -72,6 +72,7 @@ class AccountInvitationsWebhookService {
     );
 
     const inviter = await this.adminClient
+      .schema('medreport')
       .from('accounts')
       .select('email, name')
       .eq('id', invitation.invited_by)
@@ -90,6 +91,7 @@ class AccountInvitationsWebhookService {
     }
 
     const team = await this.adminClient
+      .schema('medreport')
       .from('accounts')
       .select('name')
       .eq('id', invitation.account_id)
diff --git a/packages/features/team-accounts/src/server/services/webhooks/account-webhooks.service.ts b/packages/features/team-accounts/src/server/services/webhooks/account-webhooks.service.ts
index 97992c3..65fce16 100644
--- a/packages/features/team-accounts/src/server/services/webhooks/account-webhooks.service.ts
+++ b/packages/features/team-accounts/src/server/services/webhooks/account-webhooks.service.ts
@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { getLogger } from '@kit/shared/logger';
 import { Database } from '@kit/supabase/database';
 
-type Account = Database['public']['Tables']['accounts']['Row'];
+type Account = Database['medreport']['Tables']['accounts']['Row'];
 
 export function createAccountWebhooksService() {
   return new AccountWebhooksService();
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index da58501..d962bb3 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -24,7 +24,7 @@
     "next": "15.3.2",
     "react": "19.1.0",
     "react-dom": "19.1.0",
-    "react-i18next": "^15.5.1"
+    "react-i18next": "^15.5.3"
   },
   "dependencies": {
     "i18next": "25.1.3",
diff --git a/packages/otp/src/server/otp.service.ts b/packages/otp/src/server/otp.service.ts
index a16b6d3..4e2f3b0 100644
--- a/packages/otp/src/server/otp.service.ts
+++ b/packages/otp/src/server/otp.service.ts
@@ -74,7 +74,7 @@ class OtpService {
     logger.info(ctx, 'Creating one-time token');
 
     try {
-      const result = await this.client.rpc('create_nonce', {
+      const result = await this.client.schema('medreport').rpc('create_nonce', {
         p_user_id: userId,
         p_purpose: purpose,
         p_expires_in_seconds: expiresInSeconds,
@@ -135,7 +135,7 @@ class OtpService {
     logger.info(ctx, 'Verifying one-time token');
 
     try {
-      const result = await this.client.rpc('verify_nonce', {
+      const result = await this.client.schema('medreport').rpc('verify_nonce', {
         p_token: token,
         p_user_id: params.userId,
         p_purpose: purpose,
@@ -184,10 +184,12 @@ class OtpService {
     logger.info(ctx, 'Revoking one-time token');
 
     try {
-      const { data, error } = await this.client.rpc('revoke_nonce', {
-        p_id: id,
-        p_reason: reason,
-      });
+      const { data, error } = await this.client
+        .schema('medreport')
+        .rpc('revoke_nonce', {
+          p_id: id,
+          p_reason: reason,
+        });
 
       if (error) {
         logger.error(
@@ -225,9 +227,11 @@ class OtpService {
     logger.info(ctx, 'Getting one-time token status');
 
     try {
-      const result = await this.client.rpc('get_nonce_status', {
-        p_id: id,
-      });
+      const result = await this.client
+        .schema('medreport')
+        .rpc('get_nonce_status', {
+          p_id: id,
+        });
 
       if (result.error) {
         logger.error(
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 7573244..51dcf25 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -55,7 +55,6 @@
     "prettier": "^3.5.3",
     "react-day-picker": "^8.10.1",
     "react-hook-form": "^7.56.3",
-    "react-i18next": "^15.5.1",
     "sonner": "^2.0.3",
     "tailwindcss": "4.1.7",
     "tailwindcss-animate": "^1.0.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cb23de9..2e5c761 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -312,9 +312,6 @@ importers:
       react-hook-form:
         specifier: ^7.56.3
         version: 7.57.0(react@19.1.0)
-      react-i18next:
-        specifier: ^15.5.1
-        version: 15.5.2(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
 
   packages/billing/lemon-squeezy:
     dependencies:
@@ -632,9 +629,6 @@ importers:
       react-hook-form:
         specifier: ^7.56.3
         version: 7.57.0(react@19.1.0)
-      react-i18next:
-        specifier: ^15.5.1
-        version: 15.5.2(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
       sonner:
         specifier: ^2.0.3
         version: 2.0.5(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -746,9 +740,6 @@ importers:
       react-hook-form:
         specifier: ^7.56.3
         version: 7.57.0(react@19.1.0)
-      react-i18next:
-        specifier: ^15.5.1
-        version: 15.5.2(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
       sonner:
         specifier: ^2.0.3
         version: 2.0.5(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -894,9 +885,6 @@ importers:
       react-dom:
         specifier: 19.1.0
         version: 19.1.0(react@19.1.0)
-      react-i18next:
-        specifier: ^15.5.1
-        version: 15.5.2(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
 
   packages/features/team-accounts:
     dependencies:
@@ -982,9 +970,6 @@ importers:
       react-hook-form:
         specifier: ^7.56.3
         version: 7.57.0(react@19.1.0)
-      react-i18next:
-        specifier: ^15.5.1
-        version: 15.5.2(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
       sonner:
         specifier: ^2.0.3
         version: 2.0.5(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -1026,8 +1011,8 @@ importers:
         specifier: 19.1.0
         version: 19.1.0(react@19.1.0)
       react-i18next:
-        specifier: ^15.5.1
-        version: 15.5.2(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
+        specifier: ^15.5.3
+        version: 15.5.3(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
 
   packages/mailers/core:
     devDependencies:
@@ -1482,9 +1467,6 @@ importers:
       react-hook-form:
         specifier: ^7.56.3
         version: 7.57.0(react@19.1.0)
-      react-i18next:
-        specifier: ^15.5.1
-        version: 15.5.2(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
       sonner:
         specifier: ^2.0.3
         version: 2.0.5(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -8384,22 +8366,6 @@ packages:
     peerDependencies:
       react: ^16.8.0 || ^17 || ^18 || ^19
 
-  react-i18next@15.5.2:
-    resolution: {integrity: sha512-ePODyXgmZQAOYTbZXQn5rRsSBu3Gszo69jxW6aKmlSgxKAI1fOhDwSu6bT4EKHciWPKQ7v7lPrjeiadR6Gi+1A==}
-    peerDependencies:
-      i18next: '>= 23.2.3'
-      react: '>= 16.8.0'
-      react-dom: '*'
-      react-native: '*'
-      typescript: ^5
-    peerDependenciesMeta:
-      react-dom:
-        optional: true
-      react-native:
-        optional: true
-      typescript:
-        optional: true
-
   react-i18next@15.5.3:
     resolution: {integrity: sha512-ypYmOKOnjqPEJZO4m1BI0kS8kWqkBNsKYyhVUfij0gvjy9xJNoG/VcGkxq5dRlVwzmrmY1BQMAmpbbUBLwC4Kw==}
     peerDependencies:
@@ -19948,16 +19914,6 @@ snapshots:
     dependencies:
       react: 19.1.0
 
-  react-i18next@15.5.2(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3):
-    dependencies:
-      '@babel/runtime': 7.27.6
-      html-parse-stringify: 3.0.1
-      i18next: 25.1.3(typescript@5.8.3)
-      react: 19.1.0
-    optionalDependencies:
-      react-dom: 19.1.0(react@19.1.0)
-      typescript: 5.8.3
-
   react-i18next@15.5.3(i18next@25.1.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3):
     dependencies:
       '@babel/runtime': 7.27.6
diff --git a/supabase/migrations/20250703145757_add_medreport_schema.sql b/supabase/migrations/20250703145757_add_medreport_schema.sql
index b9c956e..8e66630 100644
--- a/supabase/migrations/20250703145757_add_medreport_schema.sql
+++ b/supabase/migrations/20250703145757_add_medreport_schema.sql
@@ -2157,6 +2157,9 @@ AS $function$select
             or has_role_on_account.account_role is null)));$function$
 ;
 
+grant
+    execute on function medreport.has_role_on_account (uuid, varchar) to authenticated;
+
 CREATE OR REPLACE FUNCTION medreport.has_same_role_hierarchy_level(target_user_id uuid, target_account_id uuid, role_name character varying)
  RETURNS boolean
  LANGUAGE plpgsql
@@ -2221,6 +2224,10 @@ begin
 end;$function$
 ;
 
+grant
+    execute on function medreport.has_same_role_hierarchy_level (uuid, uuid, varchar) to authenticated,
+    service_role;
+
 CREATE OR REPLACE FUNCTION medreport.is_aal2()
  RETURNS boolean
  LANGUAGE plpgsql
@@ -2236,6 +2243,8 @@ end
 $function$
 ;
 
+grant execute on function medreport.is_aal2() to authenticated;
+
 CREATE OR REPLACE FUNCTION medreport.is_account_owner(account_id uuid)
  RETURNS boolean
  LANGUAGE sql
@@ -2251,6 +2260,10 @@ AS $function$select
           and primary_owner_user_id = auth.uid());$function$
 ;
 
+grant
+    execute on function medreport.is_account_owner (uuid) to authenticated,
+    service_role;
+
 CREATE OR REPLACE FUNCTION medreport.is_account_team_member(target_account_id uuid)
  RETURNS boolean
  LANGUAGE sql
@@ -2262,6 +2275,10 @@ AS $function$select exists(
 );$function$
 ;
 
+grant
+    execute on function medreport.is_account_team_member (uuid) to authenticated,
+    service_role;
+
 CREATE OR REPLACE FUNCTION medreport.is_mfa_compliant()
  RETURNS boolean
  LANGUAGE plpgsql
@@ -2280,6 +2297,8 @@ AS $function$begin
 end$function$
 ;
 
+grant execute on function medreport.is_mfa_compliant() to authenticated;
+
 CREATE OR REPLACE FUNCTION medreport.is_set(field_name text)
  RETURNS boolean
  LANGUAGE plpgsql
@@ -2294,6 +2313,9 @@ begin
 end;$function$
 ;
 
+grant
+    execute on function medreport.is_set (text) to authenticated;
+
 CREATE OR REPLACE FUNCTION medreport.is_super_admin()
  RETURNS boolean
  LANGUAGE plpgsql
@@ -2311,6 +2333,8 @@ begin
 end$function$
 ;
 
+grant execute on function medreport.is_super_admin() to authenticated;
+
 CREATE OR REPLACE FUNCTION medreport.is_team_member(account_id uuid, user_id uuid)
  RETURNS boolean
  LANGUAGE sql
@@ -2328,6 +2352,10 @@ AS $function$select
           and membership.account_id = is_team_member.account_id);$function$
 ;
 
+grant
+    execute on function medreport.is_team_member (uuid, uuid) to authenticated,
+    service_role;
+
 CREATE OR REPLACE FUNCTION medreport.revoke_nonce(p_id uuid, p_reason text DEFAULT NULL::text)
  RETURNS boolean
  LANGUAGE plpgsql
@@ -2350,6 +2378,8 @@ BEGIN
 END;$function$
 ;
 
+grant execute on function medreport.revoke_nonce to service_role;
+
 CREATE OR REPLACE FUNCTION medreport.team_account_workspace(account_slug text)
  RETURNS TABLE(id uuid, name character varying, picture_url character varying, slug text, role character varying, role_hierarchy_level integer, primary_owner_user_id uuid, subscription_status medreport.subscription_status, permissions medreport.app_permissions[])
  LANGUAGE plpgsql
@@ -2489,6 +2519,10 @@ AS $function$begin
 end;$function$
 ;
 
+grant
+execute on function medreport.update_account(p_name character varying, p_last_name text, p_personal_code text, p_phone text, p_city text, p_has_consent_personal_data boolean, p_uid uuid) to authenticated,
+service_role;
+
 CREATE OR REPLACE FUNCTION medreport.upsert_order(target_account_id uuid, target_customer_id character varying, target_order_id text, status medreport.payment_status, billing_provider medreport.billing_provider, total_amount numeric, currency character varying, line_items jsonb)
  RETURNS medreport.orders
  LANGUAGE plpgsql
@@ -2589,6 +2623,18 @@ begin
 end;$function$
 ;
 
+grant
+    execute on function medreport.upsert_order (
+    uuid,
+    varchar,
+    text,
+    medreport.payment_status,
+    medreport.billing_provider,
+    numeric,
+    varchar,
+    jsonb
+    ) to service_role;
+
 CREATE OR REPLACE FUNCTION medreport.upsert_subscription(target_account_id uuid, target_customer_id character varying, target_subscription_id text, active boolean, status medreport.subscription_status, billing_provider medreport.billing_provider, cancel_at_period_end boolean, currency character varying, period_starts_at timestamp with time zone, period_ends_at timestamp with time zone, line_items jsonb, trial_starts_at timestamp with time zone DEFAULT NULL::timestamp with time zone, trial_ends_at timestamp with time zone DEFAULT NULL::timestamp with time zone)
  RETURNS medreport.subscriptions
  LANGUAGE plpgsql
@@ -2716,6 +2762,23 @@ begin
 end;$function$
 ;
 
+grant
+    execute on function medreport.upsert_subscription (
+    uuid,
+    varchar,
+    text,
+    bool,
+    medreport.subscription_status,
+    medreport.billing_provider,
+    bool,
+    varchar,
+    timestamptz,
+    timestamptz,
+    jsonb,
+    timestamptz,
+    timestamptz
+    ) to service_role;
+
 create or replace view "medreport"."user_account_workspace" as  SELECT accounts.id,
     accounts.name,
     accounts.picture_url,
@@ -2727,6 +2790,10 @@ create or replace view "medreport"."user_account_workspace" as  SELECT accounts.
   WHERE ((accounts.primary_owner_user_id = ( SELECT auth.uid() AS uid)) AND (accounts.is_personal_account = true))
  LIMIT 1;
 
+grant
+    select
+    on medreport.user_account_workspace to authenticated,
+    service_role;
 
 create or replace view "medreport"."user_accounts" as  SELECT account.id,
     account.name,
@@ -2739,6 +2806,10 @@ create or replace view "medreport"."user_accounts" as  SELECT account.id,
            FROM medreport.accounts_memberships
           WHERE (accounts_memberships.user_id = ( SELECT auth.uid() AS uid)))));
 
+grant
+    select
+    on medreport.user_accounts to authenticated,
+    service_role;
 
 CREATE OR REPLACE FUNCTION medreport.verify_nonce(p_token text, p_purpose text, p_user_id uuid DEFAULT NULL::uuid, p_required_scopes text[] DEFAULT NULL::text[], p_max_verification_attempts integer DEFAULT 5, p_ip inet DEFAULT NULL::inet, p_user_agent text DEFAULT NULL::text)
  RETURNS jsonb
@@ -2836,6 +2907,10 @@ BEGIN
 END;$function$
 ;
 
+grant
+    execute on function medreport.verify_nonce to authenticated,
+    service_role;
+
 grant delete on table "medreport"."account_params" to "anon";
 
 grant insert on table "medreport"."account_params" to "anon";
diff --git a/supabase/migrations/20250707150416_membership_confirmation.sql b/supabase/migrations/20250707150416_membership_confirmation.sql
index 1485239..bcb738b 100644
--- a/supabase/migrations/20250707150416_membership_confirmation.sql
+++ b/supabase/migrations/20250707150416_membership_confirmation.sql
@@ -39,3 +39,5 @@ END;$function$
 
 grant execute on function medreport.has_consent_personal_data(uuid)
   to authenticated, anon;
+
+grant usage on schema medreport to authenticated;