diff --git a/apps/web/app/(dashboard)/home/[account]/billing/page.tsx b/apps/web/app/(dashboard)/home/[account]/billing/page.tsx
index 396f28fd6..e33b7f0c4 100644
--- a/apps/web/app/(dashboard)/home/[account]/billing/page.tsx
+++ b/apps/web/app/(dashboard)/home/[account]/billing/page.tsx
@@ -1,3 +1,5 @@
+import { ExclamationTriangleIcon } from '@radix-ui/react-icons';
+
 import {
   BillingPortalCard,
   CurrentSubscriptionCard,
@@ -39,6 +41,31 @@ async function TeamAccountBillingPage({ params }: Params) {
   const canManageBilling =
     workspace.account.permissions.includes('billing.manage');
 
+  const Checkout = () => {
+    if (!canManageBilling) {
+      return <CannotManageBillingAlert />;
+    }
+
+    return (
+      <TeamAccountCheckoutForm customerId={customerId} accountId={accountId} />
+    );
+  };
+
+  const BillingPortal = () => {
+    if (!canManageBilling || !customerId) {
+      return null;
+    }
+
+    return (
+      <form action={createBillingPortalSession}>
+        <input type="hidden" name={'accountId'} value={accountId} />
+        <input type="hidden" name={'slug'} value={params.account} />
+
+        <BillingPortalCard />
+      </form>
+    );
+  };
+
   return (
     <>
       <PageHeader
@@ -48,39 +75,25 @@ async function TeamAccountBillingPage({ params }: Params) {
 
       <PageBody>
         <div className={'mx-auto w-full'}>
-          <If condition={!canManageBilling}>
-            <CannotManageBillingAlert />
-          </If>
-
           <div>
             <div className={'flex flex-col space-y-6'}>
               <If
                 condition={subscription}
                 fallback={
-                  <If condition={canManageBilling}>
-                    <TeamAccountCheckoutForm
-                      customerId={customerId}
-                      accountId={accountId}
-                    />
-                  </If>
+                  <>
+                    <Checkout />
+                  </>
                 }
               >
-                {(data) => (
+                {(subscription) => (
                   <CurrentSubscriptionCard
-                    subscription={data}
+                    subscription={subscription}
                     config={billingConfig}
                   />
                 )}
               </If>
 
-              <If condition={customerId && canManageBilling}>
-                <form action={createBillingPortalSession}>
-                  <input type="hidden" name={'accountId'} value={accountId} />
-                  <input type="hidden" name={'slug'} value={params.account} />
-
-                  <BillingPortalCard />
-                </form>
-              </If>
+              <BillingPortal />
             </div>
           </div>
         </div>
@@ -93,7 +106,9 @@ export default withI18n(TeamAccountBillingPage);
 
 function CannotManageBillingAlert() {
   return (
-    <Alert>
+    <Alert variant={'warning'}>
+      <ExclamationTriangleIcon className={'h-4'} />
+
       <AlertTitle>
         <Trans i18nKey={'billing:cannotManageBillingAlertTitle'} />
       </AlertTitle>
diff --git a/apps/web/app/(dashboard)/home/[account]/members/page.tsx b/apps/web/app/(dashboard)/home/[account]/members/page.tsx
index 4a492b51c..6a0160faa 100644
--- a/apps/web/app/(dashboard)/home/[account]/members/page.tsx
+++ b/apps/web/app/(dashboard)/home/[account]/members/page.tsx
@@ -131,10 +131,12 @@ async function TeamAccountMembersPage({ params }: Params) {
               <If condition={canManageInvitations}>
                 <InviteMembersDialogContainer
                   userRoleHierarchy={currentUserRoleHierarchy}
-                  account={account.slug}
+                  accountId={account.id}
+                  accountSlug={account.slug}
                 >
                   <Button size={'sm'}>
                     <PlusCircle className={'mr-2 w-4'} />
+
                     <span>
                       <Trans i18nKey={'teams:inviteMembersButton'} />
                     </span>
diff --git a/apps/web/app/api/database/webhook/route.ts b/apps/web/app/api/db/webhook/route.ts
similarity index 100%
rename from apps/web/app/api/database/webhook/route.ts
rename to apps/web/app/api/db/webhook/route.ts
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 89dc23642..de37ee858 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
@@ -197,6 +197,7 @@ function ActionsDropdown({
         <UpdateInvitationDialog
           isOpen
           setIsOpen={setIsUpdatingRole}
+          account={invitation.account_id}
           invitationId={invitation.id}
           userRole={invitation.role}
           userRoleHierarchy={permissions.currentUserRoleHierarchy}
diff --git a/packages/features/team-accounts/src/components/invitations/update-invitation-dialog.tsx b/packages/features/team-accounts/src/components/invitations/update-invitation-dialog.tsx
index cb6a7ab37..31c0e3ad0 100644
--- a/packages/features/team-accounts/src/components/invitations/update-invitation-dialog.tsx
+++ b/packages/features/team-accounts/src/components/invitations/update-invitation-dialog.tsx
@@ -36,9 +36,17 @@ export const UpdateInvitationDialog: React.FC<{
   isOpen: boolean;
   setIsOpen: (isOpen: boolean) => void;
   invitationId: number;
+  account: string;
   userRole: Role;
   userRoleHierarchy: number;
-}> = ({ isOpen, setIsOpen, invitationId, userRole, userRoleHierarchy }) => {
+}> = ({
+  isOpen,
+  setIsOpen,
+  invitationId,
+  userRole,
+  userRoleHierarchy,
+  account,
+}) => {
   return (
     <Dialog open={isOpen} onOpenChange={setIsOpen}>
       <DialogContent>
@@ -52,9 +60,13 @@ export const UpdateInvitationDialog: React.FC<{
           </DialogDescription>
         </DialogHeader>
 
-        <RolesDataProvider maxRoleHierarchy={userRoleHierarchy}>
+        <RolesDataProvider
+          accountId={account}
+          maxRoleHierarchy={userRoleHierarchy}
+        >
           {(roles) => (
             <UpdateInvitationForm
+              account={account}
               invitationId={invitationId}
               userRole={userRole}
               userRoleHierarchy={roles.length}
@@ -68,11 +80,13 @@ export const UpdateInvitationDialog: React.FC<{
 };
 
 function UpdateInvitationForm({
+  account,
   invitationId,
   userRole,
   userRoleHierarchy,
   setIsOpen,
 }: React.PropsWithChildren<{
+  account: string;
   invitationId: number;
   userRole: Role;
   userRoleHierarchy: number;
@@ -136,7 +150,10 @@ function UpdateInvitationForm({
                 </FormLabel>
 
                 <FormControl>
-                  <RolesDataProvider maxRoleHierarchy={userRoleHierarchy}>
+                  <RolesDataProvider
+                    accountId={account}
+                    maxRoleHierarchy={userRoleHierarchy}
+                  >
                     {(roles) => (
                       <MembershipRoleSelector
                         roles={roles}
diff --git a/packages/features/team-accounts/src/components/members/invite-members-dialog-container.tsx b/packages/features/team-accounts/src/components/members/invite-members-dialog-container.tsx
index 987882cff..615148e6b 100644
--- a/packages/features/team-accounts/src/components/members/invite-members-dialog-container.tsx
+++ b/packages/features/team-accounts/src/components/members/invite-members-dialog-container.tsx
@@ -42,11 +42,13 @@ type InviteModel = ReturnType<typeof createEmptyInviteModel>;
 type Role = string;
 
 export function InviteMembersDialogContainer({
-  account,
+  accountSlug,
+  accountId,
   userRoleHierarchy,
   children,
 }: React.PropsWithChildren<{
-  account: string;
+  accountSlug: string;
+  accountId: string;
   userRoleHierarchy: number;
 }>) {
   const [pending, startTransition] = useTransition();
@@ -67,7 +69,10 @@ export function InviteMembersDialogContainer({
           </DialogDescription>
         </DialogHeader>
 
-        <RolesDataProvider maxRoleHierarchy={userRoleHierarchy}>
+        <RolesDataProvider
+          accountId={accountId}
+          maxRoleHierarchy={userRoleHierarchy}
+        >
           {(roles) => (
             <InviteMembersForm
               pending={pending}
@@ -75,7 +80,7 @@ export function InviteMembersDialogContainer({
               onSubmit={(data) => {
                 startTransition(async () => {
                   await createInvitationsAction({
-                    account,
+                    accountSlug,
                     invitations: data.invitations,
                   });
 
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 3d6e65970..bcd8063a4 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
@@ -5,17 +5,15 @@ import { LoadingOverlay } from '@kit/ui/loading-overlay';
 
 export function RolesDataProvider(props: {
   maxRoleHierarchy: number;
+  accountId: string;
   children: (roles: string[]) => React.ReactNode;
 }) {
-  const rolesQuery = useFetchRoles({
-    maxRoleHierarchy: props.maxRoleHierarchy,
-  });
+  const rolesQuery = useFetchRoles(props);
 
   if (rolesQuery.isLoading) {
     return <LoadingOverlay fullPage={false} />;
   }
 
-  // TODO handle error
   if (rolesQuery.isError) {
     return null;
   }
@@ -23,7 +21,7 @@ export function RolesDataProvider(props: {
   return <>{props.children(rolesQuery.data ?? [])}</>;
 }
 
-function useFetchRoles(props: { maxRoleHierarchy: number }) {
+function useFetchRoles(props: { maxRoleHierarchy: number; accountId: string }) {
   const supabase = useSupabase();
 
   return useQuery({
@@ -33,6 +31,7 @@ function useFetchRoles(props: { maxRoleHierarchy: number }) {
         .from('roles')
         .select('name')
         .gte('hierarchy_level', props.maxRoleHierarchy)
+        .or(`account_id.eq.${props.accountId}, account_id.is.null`)
         .order('hierarchy_level', { ascending: true });
 
       if (error) {
diff --git a/packages/features/team-accounts/src/components/members/update-member-role-dialog.tsx b/packages/features/team-accounts/src/components/members/update-member-role-dialog.tsx
index 52f5351cc..3f107c5c2 100644
--- a/packages/features/team-accounts/src/components/members/update-member-role-dialog.tsx
+++ b/packages/features/team-accounts/src/components/members/update-member-role-dialog.tsx
@@ -60,7 +60,10 @@ export const UpdateMemberRoleDialog: React.FC<{
           </DialogDescription>
         </DialogHeader>
 
-        <RolesDataProvider maxRoleHierarchy={userRoleHierarchy}>
+        <RolesDataProvider
+          accountId={accountId}
+          maxRoleHierarchy={userRoleHierarchy}
+        >
           {(data) => (
             <UpdateMemberForm
               setIsOpen={setIsOpen}
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 d1bc9b340..273aa7f33 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
@@ -22,7 +22,7 @@ import { AccountInvitationsService } from '../services/account-invitations.servi
  * Creates invitations for inviting members.
  */
 export async function createInvitationsAction(params: {
-  account: string;
+  accountSlug: string;
   invitations: z.infer<typeof InviteMembersSchema>['invitations'];
 }) {
   const client = getSupabaseServerActionClient();
@@ -35,7 +35,10 @@ export async function createInvitationsAction(params: {
 
   const service = new AccountInvitationsService(client);
 
-  await service.sendInvitations({ invitations, account: params.account });
+  await service.sendInvitations({
+    invitations,
+    accountSlug: params.accountSlug,
+  });
 
   revalidateMemberPage();
 
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 8ec335c9c..646343dc5 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
@@ -69,21 +69,21 @@ export class AccountInvitationsService {
   }
 
   async sendInvitations({
-    account,
+    accountSlug,
     invitations,
   }: {
     invitations: z.infer<typeof InviteMembersSchema>['invitations'];
-    account: string;
+    accountSlug: string;
   }) {
     Logger.info(
-      { account, invitations, name: this.namespace },
+      { account: accountSlug, invitations, name: this.namespace },
       'Storing invitations',
     );
 
     const accountResponse = await this.client
       .from('accounts')
       .select('name')
-      .eq('slug', account)
+      .eq('slug', accountSlug)
       .single();
 
     if (!accountResponse.data) {
@@ -92,7 +92,7 @@ export class AccountInvitationsService {
 
     const response = await this.client.rpc('add_invitations_to_account', {
       invitations,
-      account_slug: account,
+      account_slug: accountSlug,
     });
 
     if (response.error) {
@@ -105,7 +105,7 @@ export class AccountInvitationsService {
 
     Logger.info(
       {
-        account,
+        account: accountSlug,
         count: responseInvitations.length,
         name: this.namespace,
       },
diff --git a/packages/supabase/src/clients/server-component.client.ts b/packages/supabase/src/clients/server-component.client.ts
index 7fcb39e08..a3bb91c57 100644
--- a/packages/supabase/src/clients/server-component.client.ts
+++ b/packages/supabase/src/clients/server-component.client.ts
@@ -10,7 +10,7 @@ import { getSupabaseClientKeys } from '../get-supabase-client-keys';
  * @name getSupabaseServerComponentClient
  * @description Get a Supabase client for use in the Server Components
  */
-export const getSupabaseServerComponentClient = <GenericSchema = Database>(
+export const getSupabaseServerComponentClient = (
   params = {
     admin: false,
   },
@@ -30,7 +30,7 @@ export const getSupabaseServerComponentClient = <GenericSchema = Database>(
       throw new Error('Supabase Service Role Key not provided');
     }
 
-    return createServerClient<GenericSchema>(keys.url, serviceRoleKey, {
+    return createServerClient<Database>(keys.url, serviceRoleKey, {
       auth: {
         persistSession: false,
       },
@@ -38,7 +38,7 @@ export const getSupabaseServerComponentClient = <GenericSchema = Database>(
     });
   }
 
-  return createServerClient<GenericSchema>(keys.url, keys.anonKey, {
+  return createServerClient<Database>(keys.url, keys.anonKey, {
     cookies: getCookiesStrategy(),
   });
 };
diff --git a/packages/supabase/src/database.types.ts b/packages/supabase/src/database.types.ts
index 3622eb6c0..8fa7f8193 100644
--- a/packages/supabase/src/database.types.ts
+++ b/packages/supabase/src/database.types.ts
@@ -4,1226 +4,1214 @@ export type Json =
   | boolean
   | null
   | { [key: string]: Json | undefined }
-  | Json[];
+  | Json[]
 
 export type Database = {
   graphql_public: {
     Tables: {
-      [_ in never]: never;
-    };
+      [_ in never]: never
+    }
     Views: {
-      [_ in never]: never;
-    };
+      [_ in never]: never
+    }
     Functions: {
       graphql: {
         Args: {
-          operationName?: string;
-          query?: string;
-          variables?: Json;
-          extensions?: Json;
-        };
-        Returns: Json;
-      };
-    };
+          operationName?: string
+          query?: string
+          variables?: Json
+          extensions?: Json
+        }
+        Returns: Json
+      }
+    }
     Enums: {
-      [_ in never]: never;
-    };
+      [_ in never]: never
+    }
     CompositeTypes: {
-      [_ in never]: never;
-    };
-  };
+      [_ in never]: never
+    }
+  }
   public: {
     Tables: {
       account_roles: {
         Row: {
-          account_id: string;
-          id: number;
-          role: string;
-        };
+          account_id: string
+          id: number
+          role: string
+        }
         Insert: {
-          account_id: string;
-          id?: number;
-          role: string;
-        };
+          account_id: string
+          id?: number
+          role: string
+        }
         Update: {
-          account_id?: string;
-          id?: number;
-          role?: string;
-        };
+          account_id?: string
+          id?: number
+          role?: string
+        }
         Relationships: [
           {
-            foreignKeyName: 'account_roles_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "account_roles_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'account_roles_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_account_workspace';
-            referencedColumns: ['id'];
+            foreignKeyName: "account_roles_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_account_workspace"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'account_roles_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "account_roles_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'account_roles_role_fkey';
-            columns: ['role'];
-            isOneToOne: false;
-            referencedRelation: 'roles';
-            referencedColumns: ['name'];
+            foreignKeyName: "account_roles_role_fkey"
+            columns: ["role"]
+            isOneToOne: false
+            referencedRelation: "roles"
+            referencedColumns: ["name"]
           },
-        ];
-      };
+        ]
+      }
       accounts: {
         Row: {
-          created_at: string | null;
-          created_by: string | null;
-          email: string | null;
-          id: string;
-          is_personal_account: boolean;
-          name: string;
-          picture_url: string | null;
-          primary_owner_user_id: string;
-          slug: string | null;
-          updated_at: string | null;
-          updated_by: string | null;
-        };
+          created_at: string | null
+          created_by: string | null
+          email: string | null
+          id: string
+          is_personal_account: boolean
+          name: string
+          picture_url: string | null
+          primary_owner_user_id: string
+          slug: string | null
+          updated_at: string | null
+          updated_by: string | null
+        }
         Insert: {
-          created_at?: string | null;
-          created_by?: string | null;
-          email?: string | null;
-          id?: string;
-          is_personal_account?: boolean;
-          name: string;
-          picture_url?: string | null;
-          primary_owner_user_id?: string;
-          slug?: string | null;
-          updated_at?: string | null;
-          updated_by?: string | null;
-        };
+          created_at?: string | null
+          created_by?: string | null
+          email?: string | null
+          id?: string
+          is_personal_account?: boolean
+          name: string
+          picture_url?: string | null
+          primary_owner_user_id?: string
+          slug?: string | null
+          updated_at?: string | null
+          updated_by?: string | null
+        }
         Update: {
-          created_at?: string | null;
-          created_by?: string | null;
-          email?: string | null;
-          id?: string;
-          is_personal_account?: boolean;
-          name?: string;
-          picture_url?: string | null;
-          primary_owner_user_id?: string;
-          slug?: string | null;
-          updated_at?: string | null;
-          updated_by?: string | null;
-        };
+          created_at?: string | null
+          created_by?: string | null
+          email?: string | null
+          id?: string
+          is_personal_account?: boolean
+          name?: string
+          picture_url?: string | null
+          primary_owner_user_id?: string
+          slug?: string | null
+          updated_at?: string | null
+          updated_by?: string | null
+        }
         Relationships: [
           {
-            foreignKeyName: 'accounts_created_by_fkey';
-            columns: ['created_by'];
-            isOneToOne: false;
-            referencedRelation: 'users';
-            referencedColumns: ['id'];
+            foreignKeyName: "accounts_created_by_fkey"
+            columns: ["created_by"]
+            isOneToOne: false
+            referencedRelation: "users"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'accounts_primary_owner_user_id_fkey';
-            columns: ['primary_owner_user_id'];
-            isOneToOne: false;
-            referencedRelation: 'users';
-            referencedColumns: ['id'];
+            foreignKeyName: "accounts_primary_owner_user_id_fkey"
+            columns: ["primary_owner_user_id"]
+            isOneToOne: false
+            referencedRelation: "users"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'accounts_updated_by_fkey';
-            columns: ['updated_by'];
-            isOneToOne: false;
-            referencedRelation: 'users';
-            referencedColumns: ['id'];
+            foreignKeyName: "accounts_updated_by_fkey"
+            columns: ["updated_by"]
+            isOneToOne: false
+            referencedRelation: "users"
+            referencedColumns: ["id"]
           },
-        ];
-      };
+        ]
+      }
       accounts_memberships: {
         Row: {
-          account_id: string;
-          account_role: string;
-          created_at: string;
-          created_by: string | null;
-          updated_at: string;
-          updated_by: string | null;
-          user_id: string;
-        };
+          account_id: string
+          account_role: string
+          created_at: string
+          created_by: string | null
+          updated_at: string
+          updated_by: string | null
+          user_id: string
+        }
         Insert: {
-          account_id: string;
-          account_role: string;
-          created_at?: string;
-          created_by?: string | null;
-          updated_at?: string;
-          updated_by?: string | null;
-          user_id: string;
-        };
+          account_id: string
+          account_role: string
+          created_at?: string
+          created_by?: string | null
+          updated_at?: string
+          updated_by?: string | null
+          user_id: string
+        }
         Update: {
-          account_id?: string;
-          account_role?: string;
-          created_at?: string;
-          created_by?: string | null;
-          updated_at?: string;
-          updated_by?: string | null;
-          user_id?: string;
-        };
+          account_id?: string
+          account_role?: string
+          created_at?: string
+          created_by?: string | null
+          updated_at?: string
+          updated_by?: string | null
+          user_id?: string
+        }
         Relationships: [
           {
-            foreignKeyName: 'accounts_memberships_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "accounts_memberships_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'accounts_memberships_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_account_workspace';
-            referencedColumns: ['id'];
+            foreignKeyName: "accounts_memberships_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_account_workspace"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'accounts_memberships_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "accounts_memberships_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'accounts_memberships_account_role_fkey';
-            columns: ['account_role'];
-            isOneToOne: false;
-            referencedRelation: 'roles';
-            referencedColumns: ['name'];
+            foreignKeyName: "accounts_memberships_account_role_fkey"
+            columns: ["account_role"]
+            isOneToOne: false
+            referencedRelation: "roles"
+            referencedColumns: ["name"]
           },
           {
-            foreignKeyName: 'accounts_memberships_created_by_fkey';
-            columns: ['created_by'];
-            isOneToOne: false;
-            referencedRelation: 'users';
-            referencedColumns: ['id'];
+            foreignKeyName: "accounts_memberships_created_by_fkey"
+            columns: ["created_by"]
+            isOneToOne: false
+            referencedRelation: "users"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'accounts_memberships_updated_by_fkey';
-            columns: ['updated_by'];
-            isOneToOne: false;
-            referencedRelation: 'users';
-            referencedColumns: ['id'];
+            foreignKeyName: "accounts_memberships_updated_by_fkey"
+            columns: ["updated_by"]
+            isOneToOne: false
+            referencedRelation: "users"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'accounts_memberships_user_id_fkey';
-            columns: ['user_id'];
-            isOneToOne: false;
-            referencedRelation: 'users';
-            referencedColumns: ['id'];
+            foreignKeyName: "accounts_memberships_user_id_fkey"
+            columns: ["user_id"]
+            isOneToOne: false
+            referencedRelation: "users"
+            referencedColumns: ["id"]
           },
-        ];
-      };
+        ]
+      }
       billing_customers: {
         Row: {
-          account_id: string;
-          customer_id: string;
-          email: string | null;
-          id: number;
-          provider: Database['public']['Enums']['billing_provider'];
-        };
+          account_id: string
+          customer_id: string
+          email: string | null
+          id: number
+          provider: Database["public"]["Enums"]["billing_provider"]
+        }
         Insert: {
-          account_id: string;
-          customer_id: string;
-          email?: string | null;
-          id?: number;
-          provider: Database['public']['Enums']['billing_provider'];
-        };
+          account_id: string
+          customer_id: string
+          email?: string | null
+          id?: number
+          provider: Database["public"]["Enums"]["billing_provider"]
+        }
         Update: {
-          account_id?: string;
-          customer_id?: string;
-          email?: string | null;
-          id?: number;
-          provider?: Database['public']['Enums']['billing_provider'];
-        };
+          account_id?: string
+          customer_id?: string
+          email?: string | null
+          id?: number
+          provider?: Database["public"]["Enums"]["billing_provider"]
+        }
         Relationships: [
           {
-            foreignKeyName: 'billing_customers_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "billing_customers_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'billing_customers_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_account_workspace';
-            referencedColumns: ['id'];
+            foreignKeyName: "billing_customers_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_account_workspace"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'billing_customers_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "billing_customers_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_accounts"
+            referencedColumns: ["id"]
           },
-        ];
-      };
+        ]
+      }
       config: {
         Row: {
-          billing_provider: Database['public']['Enums']['billing_provider'];
-          enable_account_billing: boolean;
-          enable_organization_accounts: boolean;
-          enable_organization_billing: boolean;
-        };
+          billing_provider: Database["public"]["Enums"]["billing_provider"]
+          enable_account_billing: boolean
+          enable_team_account_billing: boolean
+          enable_team_accounts: boolean
+        }
         Insert: {
-          billing_provider?: Database['public']['Enums']['billing_provider'];
-          enable_account_billing?: boolean;
-          enable_organization_accounts?: boolean;
-          enable_organization_billing?: boolean;
-        };
+          billing_provider?: Database["public"]["Enums"]["billing_provider"]
+          enable_account_billing?: boolean
+          enable_team_account_billing?: boolean
+          enable_team_accounts?: boolean
+        }
         Update: {
-          billing_provider?: Database['public']['Enums']['billing_provider'];
-          enable_account_billing?: boolean;
-          enable_organization_accounts?: boolean;
-          enable_organization_billing?: boolean;
-        };
-        Relationships: [];
-      };
+          billing_provider?: Database["public"]["Enums"]["billing_provider"]
+          enable_account_billing?: boolean
+          enable_team_account_billing?: boolean
+          enable_team_accounts?: boolean
+        }
+        Relationships: []
+      }
       invitations: {
         Row: {
-          account_id: string;
-          created_at: string;
-          email: string;
-          expires_at: string;
-          id: number;
-          invite_token: string;
-          invited_by: string;
-          role: string;
-          updated_at: string;
-        };
+          account_id: string
+          created_at: string
+          email: string
+          expires_at: string
+          id: number
+          invite_token: string
+          invited_by: string
+          role: string
+          updated_at: string
+        }
         Insert: {
-          account_id: string;
-          created_at?: string;
-          email: string;
-          expires_at?: string;
-          id?: number;
-          invite_token: string;
-          invited_by: string;
-          role: string;
-          updated_at?: string;
-        };
+          account_id: string
+          created_at?: string
+          email: string
+          expires_at?: string
+          id?: number
+          invite_token: string
+          invited_by: string
+          role: string
+          updated_at?: string
+        }
         Update: {
-          account_id?: string;
-          created_at?: string;
-          email?: string;
-          expires_at?: string;
-          id?: number;
-          invite_token?: string;
-          invited_by?: string;
-          role?: string;
-          updated_at?: string;
-        };
+          account_id?: string
+          created_at?: string
+          email?: string
+          expires_at?: string
+          id?: number
+          invite_token?: string
+          invited_by?: string
+          role?: string
+          updated_at?: string
+        }
         Relationships: [
           {
-            foreignKeyName: 'invitations_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "invitations_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'invitations_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_account_workspace';
-            referencedColumns: ['id'];
+            foreignKeyName: "invitations_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_account_workspace"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'invitations_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "invitations_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'invitations_invited_by_fkey';
-            columns: ['invited_by'];
-            isOneToOne: false;
-            referencedRelation: 'users';
-            referencedColumns: ['id'];
+            foreignKeyName: "invitations_invited_by_fkey"
+            columns: ["invited_by"]
+            isOneToOne: false
+            referencedRelation: "users"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'invitations_role_fkey';
-            columns: ['role'];
-            isOneToOne: false;
-            referencedRelation: 'roles';
-            referencedColumns: ['name'];
+            foreignKeyName: "invitations_role_fkey"
+            columns: ["role"]
+            isOneToOne: false
+            referencedRelation: "roles"
+            referencedColumns: ["name"]
           },
-        ];
-      };
+        ]
+      }
       order_items: {
         Row: {
-          created_at: string;
-          order_id: string;
-          price_amount: number | null;
-          product_id: string;
-          quantity: number;
-          updated_at: string;
-          variant_id: string;
-        };
+          created_at: string
+          order_id: string
+          price_amount: number | null
+          product_id: string
+          quantity: number
+          updated_at: string
+          variant_id: string
+        }
         Insert: {
-          created_at?: string;
-          order_id: string;
-          price_amount?: number | null;
-          product_id: string;
-          quantity?: number;
-          updated_at?: string;
-          variant_id: string;
-        };
+          created_at?: string
+          order_id: string
+          price_amount?: number | null
+          product_id: string
+          quantity?: number
+          updated_at?: string
+          variant_id: string
+        }
         Update: {
-          created_at?: string;
-          order_id?: string;
-          price_amount?: number | null;
-          product_id?: string;
-          quantity?: number;
-          updated_at?: string;
-          variant_id?: string;
-        };
+          created_at?: string
+          order_id?: string
+          price_amount?: number | null
+          product_id?: string
+          quantity?: number
+          updated_at?: string
+          variant_id?: string
+        }
         Relationships: [
           {
-            foreignKeyName: 'order_items_order_id_fkey';
-            columns: ['order_id'];
-            isOneToOne: false;
-            referencedRelation: 'orders';
-            referencedColumns: ['id'];
+            foreignKeyName: "order_items_order_id_fkey"
+            columns: ["order_id"]
+            isOneToOne: false
+            referencedRelation: "orders"
+            referencedColumns: ["id"]
           },
-        ];
-      };
+        ]
+      }
       orders: {
         Row: {
-          account_id: string;
-          billing_customer_id: number;
-          billing_provider: Database['public']['Enums']['billing_provider'];
-          created_at: string;
-          currency: string;
-          id: string;
-          status: Database['public']['Enums']['payment_status'];
-          total_amount: number;
-          updated_at: string;
-        };
+          account_id: string
+          billing_customer_id: number
+          billing_provider: Database["public"]["Enums"]["billing_provider"]
+          created_at: string
+          currency: string
+          id: string
+          status: Database["public"]["Enums"]["payment_status"]
+          total_amount: number
+          updated_at: string
+        }
         Insert: {
-          account_id: string;
-          billing_customer_id: number;
-          billing_provider: Database['public']['Enums']['billing_provider'];
-          created_at?: string;
-          currency: string;
-          id: string;
-          status: Database['public']['Enums']['payment_status'];
-          total_amount: number;
-          updated_at?: string;
-        };
+          account_id: string
+          billing_customer_id: number
+          billing_provider: Database["public"]["Enums"]["billing_provider"]
+          created_at?: string
+          currency: string
+          id: string
+          status: Database["public"]["Enums"]["payment_status"]
+          total_amount: number
+          updated_at?: string
+        }
         Update: {
-          account_id?: string;
-          billing_customer_id?: number;
-          billing_provider?: Database['public']['Enums']['billing_provider'];
-          created_at?: string;
-          currency?: string;
-          id?: string;
-          status?: Database['public']['Enums']['payment_status'];
-          total_amount?: number;
-          updated_at?: string;
-        };
+          account_id?: string
+          billing_customer_id?: number
+          billing_provider?: Database["public"]["Enums"]["billing_provider"]
+          created_at?: string
+          currency?: string
+          id?: string
+          status?: Database["public"]["Enums"]["payment_status"]
+          total_amount?: number
+          updated_at?: string
+        }
         Relationships: [
           {
-            foreignKeyName: 'orders_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "orders_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'orders_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_account_workspace';
-            referencedColumns: ['id'];
+            foreignKeyName: "orders_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_account_workspace"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'orders_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "orders_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'orders_billing_customer_id_fkey';
-            columns: ['billing_customer_id'];
-            isOneToOne: false;
-            referencedRelation: 'billing_customers';
-            referencedColumns: ['id'];
+            foreignKeyName: "orders_billing_customer_id_fkey"
+            columns: ["billing_customer_id"]
+            isOneToOne: false
+            referencedRelation: "billing_customers"
+            referencedColumns: ["id"]
           },
-        ];
-      };
+        ]
+      }
       role_permissions: {
         Row: {
-          id: number;
-          permission: Database['public']['Enums']['app_permissions'];
-          role: string;
-        };
+          id: number
+          permission: Database["public"]["Enums"]["app_permissions"]
+          role: string
+        }
         Insert: {
-          id?: number;
-          permission: Database['public']['Enums']['app_permissions'];
-          role: string;
-        };
+          id?: number
+          permission: Database["public"]["Enums"]["app_permissions"]
+          role: string
+        }
         Update: {
-          id?: number;
-          permission?: Database['public']['Enums']['app_permissions'];
-          role?: string;
-        };
+          id?: number
+          permission?: Database["public"]["Enums"]["app_permissions"]
+          role?: string
+        }
         Relationships: [
           {
-            foreignKeyName: 'role_permissions_role_fkey';
-            columns: ['role'];
-            isOneToOne: false;
-            referencedRelation: 'roles';
-            referencedColumns: ['name'];
+            foreignKeyName: "role_permissions_role_fkey"
+            columns: ["role"]
+            isOneToOne: false
+            referencedRelation: "roles"
+            referencedColumns: ["name"]
           },
-        ];
-      };
+        ]
+      }
       roles: {
         Row: {
-          account_id: string | null;
-          hierarchy_level: number;
-          is_custom: boolean;
-          name: string;
-        };
+          account_id: string | null
+          hierarchy_level: number
+          name: string
+        }
         Insert: {
-          account_id?: string | null;
-          hierarchy_level: number;
-          is_custom?: boolean;
-          name: string;
-        };
+          account_id?: string | null
+          hierarchy_level: number
+          name: string
+        }
         Update: {
-          account_id?: string | null;
-          hierarchy_level?: number;
-          is_custom?: boolean;
-          name?: string;
-        };
+          account_id?: string | null
+          hierarchy_level?: number
+          name?: string
+        }
         Relationships: [
           {
-            foreignKeyName: 'roles_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "roles_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'roles_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_account_workspace';
-            referencedColumns: ['id'];
+            foreignKeyName: "roles_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_account_workspace"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'roles_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "roles_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_accounts"
+            referencedColumns: ["id"]
           },
-        ];
-      };
+        ]
+      }
       subscription_items: {
         Row: {
-          created_at: string;
-          interval: string;
-          interval_count: number;
-          price_amount: number | null;
-          product_id: string;
-          quantity: number;
-          subscription_id: string;
-          updated_at: string;
-          variant_id: string;
-        };
+          created_at: string
+          interval: string
+          interval_count: number
+          price_amount: number | null
+          product_id: string
+          quantity: number
+          subscription_id: string
+          updated_at: string
+          variant_id: string
+        }
         Insert: {
-          created_at?: string;
-          interval: string;
-          interval_count: number;
-          price_amount?: number | null;
-          product_id: string;
-          quantity?: number;
-          subscription_id: string;
-          updated_at?: string;
-          variant_id: string;
-        };
+          created_at?: string
+          interval: string
+          interval_count: number
+          price_amount?: number | null
+          product_id: string
+          quantity?: number
+          subscription_id: string
+          updated_at?: string
+          variant_id: string
+        }
         Update: {
-          created_at?: string;
-          interval?: string;
-          interval_count?: number;
-          price_amount?: number | null;
-          product_id?: string;
-          quantity?: number;
-          subscription_id?: string;
-          updated_at?: string;
-          variant_id?: string;
-        };
+          created_at?: string
+          interval?: string
+          interval_count?: number
+          price_amount?: number | null
+          product_id?: string
+          quantity?: number
+          subscription_id?: string
+          updated_at?: string
+          variant_id?: string
+        }
         Relationships: [
           {
-            foreignKeyName: 'subscription_items_subscription_id_fkey';
-            columns: ['subscription_id'];
-            isOneToOne: false;
-            referencedRelation: 'subscriptions';
-            referencedColumns: ['id'];
+            foreignKeyName: "subscription_items_subscription_id_fkey"
+            columns: ["subscription_id"]
+            isOneToOne: false
+            referencedRelation: "subscriptions"
+            referencedColumns: ["id"]
           },
-        ];
-      };
+        ]
+      }
       subscriptions: {
         Row: {
-          account_id: string;
-          active: boolean;
-          billing_customer_id: number;
-          billing_provider: Database['public']['Enums']['billing_provider'];
-          cancel_at_period_end: boolean;
-          created_at: string;
-          currency: string;
-          id: string;
-          period_ends_at: string;
-          period_starts_at: string;
-          status: Database['public']['Enums']['subscription_status'];
-          total_amount: number;
-          trial_ends_at: string | null;
-          trial_starts_at: string | null;
-          type: Database['public']['Enums']['subscription_type'];
-          updated_at: string;
-        };
+          account_id: string
+          active: boolean
+          billing_customer_id: number
+          billing_provider: Database["public"]["Enums"]["billing_provider"]
+          cancel_at_period_end: boolean
+          created_at: string
+          currency: string
+          id: string
+          period_ends_at: string
+          period_starts_at: string
+          status: Database["public"]["Enums"]["subscription_status"]
+          trial_ends_at: string | null
+          trial_starts_at: string | null
+          updated_at: string
+        }
         Insert: {
-          account_id: string;
-          active: boolean;
-          billing_customer_id: number;
-          billing_provider: Database['public']['Enums']['billing_provider'];
-          cancel_at_period_end: boolean;
-          created_at?: string;
-          currency: string;
-          id: string;
-          period_ends_at: string;
-          period_starts_at: string;
-          status: Database['public']['Enums']['subscription_status'];
-          total_amount: number;
-          trial_ends_at?: string | null;
-          trial_starts_at?: string | null;
-          type?: Database['public']['Enums']['subscription_type'];
-          updated_at?: string;
-        };
+          account_id: string
+          active: boolean
+          billing_customer_id: number
+          billing_provider: Database["public"]["Enums"]["billing_provider"]
+          cancel_at_period_end: boolean
+          created_at?: string
+          currency: string
+          id: string
+          period_ends_at: string
+          period_starts_at: string
+          status: Database["public"]["Enums"]["subscription_status"]
+          trial_ends_at?: string | null
+          trial_starts_at?: string | null
+          updated_at?: string
+        }
         Update: {
-          account_id?: string;
-          active?: boolean;
-          billing_customer_id?: number;
-          billing_provider?: Database['public']['Enums']['billing_provider'];
-          cancel_at_period_end?: boolean;
-          created_at?: string;
-          currency?: string;
-          id?: string;
-          period_ends_at?: string;
-          period_starts_at?: string;
-          status?: Database['public']['Enums']['subscription_status'];
-          total_amount?: number;
-          trial_ends_at?: string | null;
-          trial_starts_at?: string | null;
-          type?: Database['public']['Enums']['subscription_type'];
-          updated_at?: string;
-        };
+          account_id?: string
+          active?: boolean
+          billing_customer_id?: number
+          billing_provider?: Database["public"]["Enums"]["billing_provider"]
+          cancel_at_period_end?: boolean
+          created_at?: string
+          currency?: string
+          id?: string
+          period_ends_at?: string
+          period_starts_at?: string
+          status?: Database["public"]["Enums"]["subscription_status"]
+          trial_ends_at?: string | null
+          trial_starts_at?: string | null
+          updated_at?: string
+        }
         Relationships: [
           {
-            foreignKeyName: 'subscriptions_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "subscriptions_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'subscriptions_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_account_workspace';
-            referencedColumns: ['id'];
+            foreignKeyName: "subscriptions_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_account_workspace"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'subscriptions_account_id_fkey';
-            columns: ['account_id'];
-            isOneToOne: false;
-            referencedRelation: 'user_accounts';
-            referencedColumns: ['id'];
+            foreignKeyName: "subscriptions_account_id_fkey"
+            columns: ["account_id"]
+            isOneToOne: false
+            referencedRelation: "user_accounts"
+            referencedColumns: ["id"]
           },
           {
-            foreignKeyName: 'subscriptions_billing_customer_id_fkey';
-            columns: ['billing_customer_id'];
-            isOneToOne: false;
-            referencedRelation: 'billing_customers';
-            referencedColumns: ['id'];
+            foreignKeyName: "subscriptions_billing_customer_id_fkey"
+            columns: ["billing_customer_id"]
+            isOneToOne: false
+            referencedRelation: "billing_customers"
+            referencedColumns: ["id"]
           },
-        ];
-      };
-    };
+        ]
+      }
+    }
     Views: {
       user_account_workspace: {
         Row: {
-          id: string | null;
-          name: string | null;
-          picture_url: string | null;
+          id: string | null
+          name: string | null
+          picture_url: string | null
           subscription_status:
-            | Database['public']['Enums']['subscription_status']
-            | null;
-        };
-        Relationships: [];
-      };
+            | Database["public"]["Enums"]["subscription_status"]
+            | null
+        }
+        Relationships: []
+      }
       user_accounts: {
         Row: {
-          id: string | null;
-          name: string | null;
-          picture_url: string | null;
-          role: string | null;
-          slug: string | null;
-        };
+          id: string | null
+          name: string | null
+          picture_url: string | null
+          role: string | null
+          slug: string | null
+        }
         Relationships: [
           {
-            foreignKeyName: 'accounts_memberships_account_role_fkey';
-            columns: ['role'];
-            isOneToOne: false;
-            referencedRelation: 'roles';
-            referencedColumns: ['name'];
+            foreignKeyName: "accounts_memberships_account_role_fkey"
+            columns: ["role"]
+            isOneToOne: false
+            referencedRelation: "roles"
+            referencedColumns: ["name"]
           },
-        ];
-      };
-    };
+        ]
+      }
+    }
     Functions: {
       accept_invitation: {
         Args: {
-          token: string;
-          user_id: string;
-        };
-        Returns: undefined;
-      };
+          token: string
+          user_id: string
+        }
+        Returns: undefined
+      }
       add_invitations_to_account: {
         Args: {
-          account_slug: string;
-          invitations: unknown[];
-        };
-        Returns: Database['public']['Tables']['invitations']['Row'][];
-      };
+          account_slug: string
+          invitations: unknown[]
+        }
+        Returns: Database["public"]["Tables"]["invitations"]["Row"][]
+      }
       create_account: {
         Args: {
-          account_name: string;
-        };
+          account_name: string
+        }
         Returns: {
-          created_at: string | null;
-          created_by: string | null;
-          email: string | null;
-          id: string;
-          is_personal_account: boolean;
-          name: string;
-          picture_url: string | null;
-          primary_owner_user_id: string;
-          slug: string | null;
-          updated_at: string | null;
-          updated_by: string | null;
-        };
-      };
+          created_at: string | null
+          created_by: string | null
+          email: string | null
+          id: string
+          is_personal_account: boolean
+          name: string
+          picture_url: string | null
+          primary_owner_user_id: string
+          slug: string | null
+          updated_at: string | null
+          updated_by: string | null
+        }
+      }
       create_invitation: {
         Args: {
-          account_id: string;
-          email: string;
-          role: string;
-        };
+          account_id: string
+          email: string
+          role: string
+        }
         Returns: {
-          account_id: string;
-          created_at: string;
-          email: string;
-          expires_at: string;
-          id: number;
-          invite_token: string;
-          invited_by: string;
-          role: string;
-          updated_at: string;
-        };
-      };
+          account_id: string
+          created_at: string
+          email: string
+          expires_at: string
+          id: number
+          invite_token: string
+          invited_by: string
+          role: string
+          updated_at: string
+        }
+      }
       get_account_invitations: {
         Args: {
-          account_slug: string;
-        };
+          account_slug: string
+        }
         Returns: {
-          id: number;
-          email: string;
-          account_id: string;
-          invited_by: string;
-          role: string;
-          created_at: string;
-          updated_at: string;
-          expires_at: string;
-          inviter_name: string;
-          inviter_email: string;
-        }[];
-      };
+          id: number
+          email: string
+          account_id: string
+          invited_by: string
+          role: string
+          created_at: string
+          updated_at: string
+          expires_at: string
+          inviter_name: string
+          inviter_email: string
+        }[]
+      }
       get_account_members: {
         Args: {
-          account_slug: string;
-        };
+          account_slug: string
+        }
         Returns: {
-          id: string;
-          user_id: string;
-          account_id: string;
-          role: string;
-          role_hierarchy_level: number;
-          primary_owner_user_id: string;
-          name: string;
-          email: string;
-          picture_url: string;
-          created_at: string;
-          updated_at: string;
-        }[];
-      };
+          id: string
+          user_id: string
+          account_id: string
+          role: string
+          role_hierarchy_level: number
+          primary_owner_user_id: string
+          name: string
+          email: string
+          picture_url: string
+          created_at: string
+          updated_at: string
+        }[]
+      }
       get_config: {
-        Args: Record<PropertyKey, never>;
-        Returns: Json;
-      };
+        Args: Record<PropertyKey, never>
+        Returns: Json
+      }
       get_user_accounts: {
-        Args: Record<PropertyKey, never>;
+        Args: Record<PropertyKey, never>
         Returns: {
-          created_at: string | null;
-          created_by: string | null;
-          email: string | null;
-          id: string;
-          is_personal_account: boolean;
-          name: string;
-          picture_url: string | null;
-          primary_owner_user_id: string;
-          slug: string | null;
-          updated_at: string | null;
-          updated_by: string | null;
-        }[];
-      };
+          created_at: string | null
+          created_by: string | null
+          email: string | null
+          id: string
+          is_personal_account: boolean
+          name: string
+          picture_url: string | null
+          primary_owner_user_id: string
+          slug: string | null
+          updated_at: string | null
+          updated_by: string | null
+        }[]
+      }
       has_more_elevated_role: {
         Args: {
-          target_user_id: string;
-          target_account_id: string;
-          role_name: string;
-        };
-        Returns: boolean;
-      };
+          target_user_id: string
+          target_account_id: string
+          role_name: string
+        }
+        Returns: boolean
+      }
       has_permission: {
         Args: {
-          user_id: string;
-          account_id: string;
-          permission_name: Database['public']['Enums']['app_permissions'];
-        };
-        Returns: boolean;
-      };
+          user_id: string
+          account_id: string
+          permission_name: Database["public"]["Enums"]["app_permissions"]
+        }
+        Returns: boolean
+      }
       has_role_on_account: {
         Args: {
-          account_id: string;
-          account_role?: string;
-        };
-        Returns: boolean;
-      };
+          account_id: string
+          account_role?: string
+        }
+        Returns: boolean
+      }
       is_account_owner: {
         Args: {
-          account_id: string;
-        };
-        Returns: boolean;
-      };
+          account_id: string
+        }
+        Returns: boolean
+      }
       is_set: {
         Args: {
-          field_name: string;
-        };
-        Returns: boolean;
-      };
+          field_name: string
+        }
+        Returns: boolean
+      }
       is_team_member: {
         Args: {
-          account_id: string;
-          user_id: string;
-        };
-        Returns: boolean;
-      };
+          account_id: string
+          user_id: string
+        }
+        Returns: boolean
+      }
       organization_account_workspace: {
         Args: {
-          account_slug: string;
-        };
+          account_slug: string
+        }
         Returns: {
-          id: string;
-          name: string;
-          picture_url: string;
-          slug: string;
-          role: string;
-          role_hierarchy_level: number;
-          primary_owner_user_id: string;
-          subscription_status: Database['public']['Enums']['subscription_status'];
-          permissions: Database['public']['Enums']['app_permissions'][];
-        }[];
-      };
+          id: string
+          name: string
+          picture_url: string
+          slug: string
+          role: string
+          role_hierarchy_level: number
+          primary_owner_user_id: string
+          subscription_status: Database["public"]["Enums"]["subscription_status"]
+          permissions: Database["public"]["Enums"]["app_permissions"][]
+        }[]
+      }
       transfer_team_account_ownership: {
         Args: {
-          target_account_id: string;
-          new_owner_id: string;
-        };
-        Returns: undefined;
-      };
+          target_account_id: string
+          new_owner_id: string
+        }
+        Returns: undefined
+      }
       unaccent: {
         Args: {
-          '': string;
-        };
-        Returns: string;
-      };
+          "": string
+        }
+        Returns: string
+      }
       unaccent_init: {
         Args: {
-          '': unknown;
-        };
-        Returns: unknown;
-      };
+          "": unknown
+        }
+        Returns: unknown
+      }
       upsert_order: {
         Args: {
-          target_account_id: string;
-          target_customer_id: string;
-          target_order_id: string;
-          status: Database['public']['Enums']['payment_status'];
-          billing_provider: Database['public']['Enums']['billing_provider'];
-          total_amount: number;
-          currency: string;
-          line_items: Json;
-        };
+          target_account_id: string
+          target_customer_id: string
+          target_order_id: string
+          status: Database["public"]["Enums"]["payment_status"]
+          billing_provider: Database["public"]["Enums"]["billing_provider"]
+          total_amount: number
+          currency: string
+          line_items: Json
+        }
         Returns: {
-          account_id: string;
-          billing_customer_id: number;
-          billing_provider: Database['public']['Enums']['billing_provider'];
-          created_at: string;
-          currency: string;
-          id: string;
-          status: Database['public']['Enums']['payment_status'];
-          total_amount: number;
-          updated_at: string;
-        };
-      };
+          account_id: string
+          billing_customer_id: number
+          billing_provider: Database["public"]["Enums"]["billing_provider"]
+          created_at: string
+          currency: string
+          id: string
+          status: Database["public"]["Enums"]["payment_status"]
+          total_amount: number
+          updated_at: string
+        }
+      }
       upsert_subscription: {
         Args: {
-          target_account_id: string;
-          target_customer_id: string;
-          target_subscription_id: string;
-          active: boolean;
-          status: Database['public']['Enums']['subscription_status'];
-          billing_provider: Database['public']['Enums']['billing_provider'];
-          cancel_at_period_end: boolean;
-          currency: string;
-          period_starts_at: string;
-          period_ends_at: string;
-          line_items: Json;
-          trial_starts_at?: string;
-          trial_ends_at?: string;
-          type?: Database['public']['Enums']['subscription_type'];
-        };
+          target_account_id: string
+          target_customer_id: string
+          target_subscription_id: string
+          active: boolean
+          status: Database["public"]["Enums"]["subscription_status"]
+          billing_provider: Database["public"]["Enums"]["billing_provider"]
+          cancel_at_period_end: boolean
+          currency: string
+          period_starts_at: string
+          period_ends_at: string
+          line_items: Json
+          trial_starts_at?: string
+          trial_ends_at?: string
+        }
         Returns: {
-          account_id: string;
-          active: boolean;
-          billing_customer_id: number;
-          billing_provider: Database['public']['Enums']['billing_provider'];
-          cancel_at_period_end: boolean;
-          created_at: string;
-          currency: string;
-          id: string;
-          period_ends_at: string;
-          period_starts_at: string;
-          status: Database['public']['Enums']['subscription_status'];
-          total_amount: number;
-          trial_ends_at: string | null;
-          trial_starts_at: string | null;
-          type: Database['public']['Enums']['subscription_type'];
-          updated_at: string;
-        };
-      };
-    };
+          account_id: string
+          active: boolean
+          billing_customer_id: number
+          billing_provider: Database["public"]["Enums"]["billing_provider"]
+          cancel_at_period_end: boolean
+          created_at: string
+          currency: string
+          id: string
+          period_ends_at: string
+          period_starts_at: string
+          status: Database["public"]["Enums"]["subscription_status"]
+          trial_ends_at: string | null
+          trial_starts_at: string | null
+          updated_at: string
+        }
+      }
+    }
     Enums: {
       app_permissions:
-        | 'roles.manage'
-        | 'billing.manage'
-        | 'settings.manage'
-        | 'members.manage'
-        | 'invites.manage';
-      billing_provider: 'stripe' | 'lemon-squeezy' | 'paddle';
-      payment_status: 'pending' | 'succeeded' | 'failed';
+        | "roles.manage"
+        | "billing.manage"
+        | "settings.manage"
+        | "members.manage"
+        | "invites.manage"
+      billing_provider: "stripe" | "lemon-squeezy" | "paddle"
+      payment_status: "pending" | "succeeded" | "failed"
       subscription_status:
-        | 'active'
-        | 'trialing'
-        | 'past_due'
-        | 'canceled'
-        | 'unpaid'
-        | 'incomplete'
-        | 'incomplete_expired'
-        | 'paused';
-      subscription_type: 'one-off' | 'recurring';
-    };
+        | "active"
+        | "trialing"
+        | "past_due"
+        | "canceled"
+        | "unpaid"
+        | "incomplete"
+        | "incomplete_expired"
+        | "paused"
+    }
     CompositeTypes: {
-      [_ in never]: never;
-    };
-  };
+      [_ in never]: never
+    }
+  }
   storage: {
     Tables: {
       buckets: {
         Row: {
-          allowed_mime_types: string[] | null;
-          avif_autodetection: boolean | null;
-          created_at: string | null;
-          file_size_limit: number | null;
-          id: string;
-          name: string;
-          owner: string | null;
-          owner_id: string | null;
-          public: boolean | null;
-          updated_at: string | null;
-        };
+          allowed_mime_types: string[] | null
+          avif_autodetection: boolean | null
+          created_at: string | null
+          file_size_limit: number | null
+          id: string
+          name: string
+          owner: string | null
+          owner_id: string | null
+          public: boolean | null
+          updated_at: string | null
+        }
         Insert: {
-          allowed_mime_types?: string[] | null;
-          avif_autodetection?: boolean | null;
-          created_at?: string | null;
-          file_size_limit?: number | null;
-          id: string;
-          name: string;
-          owner?: string | null;
-          owner_id?: string | null;
-          public?: boolean | null;
-          updated_at?: string | null;
-        };
+          allowed_mime_types?: string[] | null
+          avif_autodetection?: boolean | null
+          created_at?: string | null
+          file_size_limit?: number | null
+          id: string
+          name: string
+          owner?: string | null
+          owner_id?: string | null
+          public?: boolean | null
+          updated_at?: string | null
+        }
         Update: {
-          allowed_mime_types?: string[] | null;
-          avif_autodetection?: boolean | null;
-          created_at?: string | null;
-          file_size_limit?: number | null;
-          id?: string;
-          name?: string;
-          owner?: string | null;
-          owner_id?: string | null;
-          public?: boolean | null;
-          updated_at?: string | null;
-        };
-        Relationships: [];
-      };
+          allowed_mime_types?: string[] | null
+          avif_autodetection?: boolean | null
+          created_at?: string | null
+          file_size_limit?: number | null
+          id?: string
+          name?: string
+          owner?: string | null
+          owner_id?: string | null
+          public?: boolean | null
+          updated_at?: string | null
+        }
+        Relationships: []
+      }
       migrations: {
         Row: {
-          executed_at: string | null;
-          hash: string;
-          id: number;
-          name: string;
-        };
+          executed_at: string | null
+          hash: string
+          id: number
+          name: string
+        }
         Insert: {
-          executed_at?: string | null;
-          hash: string;
-          id: number;
-          name: string;
-        };
+          executed_at?: string | null
+          hash: string
+          id: number
+          name: string
+        }
         Update: {
-          executed_at?: string | null;
-          hash?: string;
-          id?: number;
-          name?: string;
-        };
-        Relationships: [];
-      };
+          executed_at?: string | null
+          hash?: string
+          id?: number
+          name?: string
+        }
+        Relationships: []
+      }
       objects: {
         Row: {
-          bucket_id: string | null;
-          created_at: string | null;
-          id: string;
-          last_accessed_at: string | null;
-          metadata: Json | null;
-          name: string | null;
-          owner: string | null;
-          owner_id: string | null;
-          path_tokens: string[] | null;
-          updated_at: string | null;
-          version: string | null;
-        };
+          bucket_id: string | null
+          created_at: string | null
+          id: string
+          last_accessed_at: string | null
+          metadata: Json | null
+          name: string | null
+          owner: string | null
+          owner_id: string | null
+          path_tokens: string[] | null
+          updated_at: string | null
+          version: string | null
+        }
         Insert: {
-          bucket_id?: string | null;
-          created_at?: string | null;
-          id?: string;
-          last_accessed_at?: string | null;
-          metadata?: Json | null;
-          name?: string | null;
-          owner?: string | null;
-          owner_id?: string | null;
-          path_tokens?: string[] | null;
-          updated_at?: string | null;
-          version?: string | null;
-        };
+          bucket_id?: string | null
+          created_at?: string | null
+          id?: string
+          last_accessed_at?: string | null
+          metadata?: Json | null
+          name?: string | null
+          owner?: string | null
+          owner_id?: string | null
+          path_tokens?: string[] | null
+          updated_at?: string | null
+          version?: string | null
+        }
         Update: {
-          bucket_id?: string | null;
-          created_at?: string | null;
-          id?: string;
-          last_accessed_at?: string | null;
-          metadata?: Json | null;
-          name?: string | null;
-          owner?: string | null;
-          owner_id?: string | null;
-          path_tokens?: string[] | null;
-          updated_at?: string | null;
-          version?: string | null;
-        };
+          bucket_id?: string | null
+          created_at?: string | null
+          id?: string
+          last_accessed_at?: string | null
+          metadata?: Json | null
+          name?: string | null
+          owner?: string | null
+          owner_id?: string | null
+          path_tokens?: string[] | null
+          updated_at?: string | null
+          version?: string | null
+        }
         Relationships: [
           {
-            foreignKeyName: 'objects_bucketId_fkey';
-            columns: ['bucket_id'];
-            isOneToOne: false;
-            referencedRelation: 'buckets';
-            referencedColumns: ['id'];
+            foreignKeyName: "objects_bucketId_fkey"
+            columns: ["bucket_id"]
+            isOneToOne: false
+            referencedRelation: "buckets"
+            referencedColumns: ["id"]
           },
-        ];
-      };
-    };
+        ]
+      }
+    }
     Views: {
-      [_ in never]: never;
-    };
+      [_ in never]: never
+    }
     Functions: {
       can_insert_object: {
         Args: {
-          bucketid: string;
-          name: string;
-          owner: string;
-          metadata: Json;
-        };
-        Returns: undefined;
-      };
+          bucketid: string
+          name: string
+          owner: string
+          metadata: Json
+        }
+        Returns: undefined
+      }
       extension: {
         Args: {
-          name: string;
-        };
-        Returns: string;
-      };
+          name: string
+        }
+        Returns: string
+      }
       filename: {
         Args: {
-          name: string;
-        };
-        Returns: string;
-      };
+          name: string
+        }
+        Returns: string
+      }
       foldername: {
         Args: {
-          name: string;
-        };
-        Returns: string[];
-      };
+          name: string
+        }
+        Returns: string[]
+      }
       get_size_by_bucket: {
-        Args: Record<PropertyKey, never>;
+        Args: Record<PropertyKey, never>
         Returns: {
-          size: number;
-          bucket_id: string;
-        }[];
-      };
+          size: number
+          bucket_id: string
+        }[]
+      }
       search: {
         Args: {
-          prefix: string;
-          bucketname: string;
-          limits?: number;
-          levels?: number;
-          offsets?: number;
-          search?: string;
-          sortcolumn?: string;
-          sortorder?: string;
-        };
+          prefix: string
+          bucketname: string
+          limits?: number
+          levels?: number
+          offsets?: number
+          search?: string
+          sortcolumn?: string
+          sortorder?: string
+        }
         Returns: {
-          name: string;
-          id: string;
-          updated_at: string;
-          created_at: string;
-          last_accessed_at: string;
-          metadata: Json;
-        }[];
-      };
-    };
+          name: string
+          id: string
+          updated_at: string
+          created_at: string
+          last_accessed_at: string
+          metadata: Json
+        }[]
+      }
+    }
     Enums: {
-      [_ in never]: never;
-    };
+      [_ in never]: never
+    }
     CompositeTypes: {
-      [_ in never]: never;
-    };
-  };
-};
+      [_ in never]: never
+    }
+  }
+}
 
-type PublicSchema = Database[Extract<keyof Database, 'public'>];
+type PublicSchema = Database[Extract<keyof Database, "public">]
 
 export type Tables<
   PublicTableNameOrOptions extends
-    | keyof (PublicSchema['Tables'] & PublicSchema['Views'])
+    | keyof (PublicSchema["Tables"] & PublicSchema["Views"])
     | { schema: keyof Database },
   TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-    ? keyof (Database[PublicTableNameOrOptions['schema']]['Tables'] &
-        Database[PublicTableNameOrOptions['schema']]['Views'])
+    ? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
+        Database[PublicTableNameOrOptions["schema"]]["Views"])
     : never = never,
 > = PublicTableNameOrOptions extends { schema: keyof Database }
-  ? (Database[PublicTableNameOrOptions['schema']]['Tables'] &
-      Database[PublicTableNameOrOptions['schema']]['Views'])[TableName] extends {
-      Row: infer R;
+  ? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
+      Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+      Row: infer R
     }
     ? R
     : never
-  : PublicTableNameOrOptions extends keyof (PublicSchema['Tables'] &
-        PublicSchema['Views'])
-    ? (PublicSchema['Tables'] &
-        PublicSchema['Views'])[PublicTableNameOrOptions] extends {
-        Row: infer R;
+  : PublicTableNameOrOptions extends keyof (PublicSchema["Tables"] &
+        PublicSchema["Views"])
+    ? (PublicSchema["Tables"] &
+        PublicSchema["Views"])[PublicTableNameOrOptions] extends {
+        Row: infer R
       }
       ? R
       : never
-    : never;
+    : never
 
 export type TablesInsert<
   PublicTableNameOrOptions extends
-    | keyof PublicSchema['Tables']
+    | keyof PublicSchema["Tables"]
     | { schema: keyof Database },
   TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicTableNameOrOptions['schema']]['Tables']
+    ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
     : never = never,
 > = PublicTableNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicTableNameOrOptions['schema']]['Tables'][TableName] extends {
-      Insert: infer I;
+  ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+      Insert: infer I
     }
     ? I
     : never
-  : PublicTableNameOrOptions extends keyof PublicSchema['Tables']
-    ? PublicSchema['Tables'][PublicTableNameOrOptions] extends {
-        Insert: infer I;
+  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
+    ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+        Insert: infer I
       }
       ? I
       : never
-    : never;
+    : never
 
 export type TablesUpdate<
   PublicTableNameOrOptions extends
-    | keyof PublicSchema['Tables']
+    | keyof PublicSchema["Tables"]
     | { schema: keyof Database },
   TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicTableNameOrOptions['schema']]['Tables']
+    ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
     : never = never,
 > = PublicTableNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicTableNameOrOptions['schema']]['Tables'][TableName] extends {
-      Update: infer U;
+  ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+      Update: infer U
     }
     ? U
     : never
-  : PublicTableNameOrOptions extends keyof PublicSchema['Tables']
-    ? PublicSchema['Tables'][PublicTableNameOrOptions] extends {
-        Update: infer U;
+  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
+    ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+        Update: infer U
       }
       ? U
       : never
-    : never;
+    : never
 
 export type Enums<
   PublicEnumNameOrOptions extends
-    | keyof PublicSchema['Enums']
+    | keyof PublicSchema["Enums"]
     | { schema: keyof Database },
   EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicEnumNameOrOptions['schema']]['Enums']
+    ? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
     : never = never,
 > = PublicEnumNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicEnumNameOrOptions['schema']]['Enums'][EnumName]
-  : PublicEnumNameOrOptions extends keyof PublicSchema['Enums']
-    ? PublicSchema['Enums'][PublicEnumNameOrOptions]
-    : never;
+  ? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
+  : PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
+    ? PublicSchema["Enums"][PublicEnumNameOrOptions]
+    : never
+
diff --git a/supabase/migrations/20221215192558_schema.sql b/supabase/migrations/20221215192558_schema.sql
index 06e28acb2..0ff78fe63 100644
--- a/supabase/migrations/20221215192558_schema.sql
+++ b/supabase/migrations/20221215192558_schema.sql
@@ -463,7 +463,6 @@ create trigger "on_auth_user_updated"
     after update of email on auth.users for each row
     execute procedure kit.handle_update_user_email();
 
-
 /*
  * -------------------------------------------------------
  * Section: Roles
@@ -475,13 +474,51 @@ create table if not exists public.roles(
     name varchar(50) not null,
     hierarchy_level int not null,
     account_id uuid references public.accounts(id) on delete cascade,
-    is_custom boolean not null default false,
-    unique (hierarchy_level, account_id, is_custom),
+    unique(name, account_id),
     primary key (name)
 );
 
 grant select on table public.roles to authenticated, service_role;
 
+-- define the system role uuid as a static UUID to be used as a default
+-- account_id for system roles when the account_id is null. Useful for constraints.
+create or replace function kit.get_system_role_uuid()
+    returns uuid
+    as $$
+begin
+    return 'fd4f287c-762e-42b7-8207-b1252f799670';
+end; $$ language plpgsql immutable;
+
+grant execute on function kit.get_system_role_uuid() to authenticated, service_role;
+
+create unique index idx_unique_hierarchy_per_account
+    on public.roles (hierarchy_level, coalesce(account_id, kit.get_system_role_uuid()));
+
+create unique index idx_unique_name_per_account
+    on public.roles (name, coalesce(account_id, kit.get_system_role_uuid()));
+
+create or replace function kit.check_non_personal_account_roles()
+    returns trigger
+    as $$
+begin
+    if new.account_id is not null and(
+        select
+            is_personal_account
+        from
+            public.accounts
+        where
+            id = new.account_id) then
+        raise exception 'Roles cannot be created for personal accounts';
+    end if;
+
+    return new;
+end; $$ language plpgsql;
+
+create constraint trigger tr_check_non_personal_account_roles
+    after insert or update on public.roles
+    for each row
+    execute procedure kit.check_non_personal_account_roles();
+
 -- Seed the roles table with default roles 'owner' and
 --   'member'
 insert into public.roles(
@@ -501,12 +538,6 @@ values (
 -- RLS
 alter table public.roles enable row level security;
 
--- SELECT: authenticated users can query roles
-create policy roles_read on public.roles
-    for select to authenticated
-        using (true);
-
-
 /*
  * -------------------------------------------------------
  * Section: Memberships
@@ -567,6 +598,7 @@ create or replace trigger prevent_account_owner_membership_delete_check
     before delete on public.accounts_memberships for each row
     execute function kit.prevent_account_owner_membership_delete();
 
+-- Functions
 create or replace function public.has_role_on_account(account_id
     uuid, account_role varchar(50) default null)
     returns boolean
@@ -590,6 +622,7 @@ $$;
 grant execute on function public.has_role_on_account(uuid, varchar)
     to authenticated;
 
+-- Function to check if a user is a team member of an account or not
 create or replace function public.is_team_member(account_id uuid,
     user_id uuid)
     returns boolean
@@ -611,7 +644,16 @@ $$;
 
 grant execute on function public.is_team_member(uuid, uuid) to authenticated;
 
--- Functions
+
+-- SELECT(roles): authenticated users can query roles if the role is public
+--  or the user has a role on the account the role is for
+create policy roles_read on public.roles
+    for select to authenticated
+        using (
+            account_id is null
+            or public.has_role_on_account(account_id)
+        );
+
 --    Function to check if a user can remove a member from an account
 create or replace function
     kit.can_remove_account_member(target_team_account_id uuid,
@@ -716,7 +758,6 @@ create policy accounts_team_read on public.accounts
             where
                 public.is_team_member(membership.account_id, id)));
 
-
 /*
  * -------------------------------------------------------
  * Section: Account Roles
diff --git a/supabase/seed.sql b/supabase/seed.sql
index 6270defb4..4030b01d4 100644
--- a/supabase/seed.sql
+++ b/supabase/seed.sql
@@ -6,7 +6,7 @@
 create trigger "accounts_memberships_insert" after insert
 on "public"."accounts_memberships" for each row
 execute function "supabase_functions"."http_request"(
-  'http://host.docker.internal:3000/api/database/webhook',
+  'http://host.docker.internal:3000/api/db/webhook',
   'POST',
   '{"Content-Type":"application/json", "X-Supabase-Event-Signature":"WEBHOOKSECRET"}',
   '{}',
@@ -17,7 +17,7 @@ execute function "supabase_functions"."http_request"(
 create trigger "account_membership_delete" after delete
 on "public"."accounts_memberships" for each row
 execute function "supabase_functions"."http_request"(
-  'http://host.docker.internal:3000/api/database/webhook',
+  'http://host.docker.internal:3000/api/db/webhook',
   'POST',
   '{"Content-Type":"application/json", "X-Supabase-Event-Signature":"WEBHOOKSECRET"}',
   '{}',
@@ -29,7 +29,7 @@ execute function "supabase_functions"."http_request"(
 create trigger "account_delete" after delete
 on "public"."subscriptions" for each row
 execute function "supabase_functions"."http_request"(
-  'http://host.docker.internal:3000/api/database/webhook',
+  'http://host.docker.internal:3000/api/db/webhook',
   'POST',
   '{"Content-Type":"application/json", "X-Supabase-Event-Signature":"WEBHOOKSECRET"}',
   '{}',
@@ -41,7 +41,7 @@ execute function "supabase_functions"."http_request"(
 create trigger "invitations_insert" after insert
 on "public"."invitations" for each row
 execute function "supabase_functions"."http_request"(
-  'http://host.docker.internal:3000/api/database/webhook',
+  'http://host.docker.internal:3000/api/db/webhook',
   'POST',
   '{"Content-Type":"application/json", "X-Supabase-Event-Signature":"WEBHOOKSECRET"}',
   '{}',