diff --git a/apps/web/public/locales/en/teams.json b/apps/web/public/locales/en/teams.json
index 095cb3224..a58b698fd 100644
--- a/apps/web/public/locales/en/teams.json
+++ b/apps/web/public/locales/en/teams.json
@@ -1,7 +1,13 @@
 {
   "settings": {
     "pageTitle": "Settings",
-    "pageDescription": "Manage your Team details"
+    "pageDescription": "Manage your Team details",
+    "teamLogo": "Team Logo",
+    "teamLogoDescription": "Update your team's logo to make it easier to identify",
+    "teamName": "Team Name",
+    "teamNameDescription": "Update your team's name",
+    "dangerZone": "Danger Zone",
+    "dangerZoneDescription": "This section contains actions that are irreversible"
   },
   "yourTeam": "Your Teams",
   "createTeam": "Create Team",
diff --git a/packages/features/accounts/src/server/services/delete-personal-account.service.ts b/packages/features/accounts/src/server/services/delete-personal-account.service.ts
index cb1b5f38b..5a43f387a 100644
--- a/packages/features/accounts/src/server/services/delete-personal-account.service.ts
+++ b/packages/features/accounts/src/server/services/delete-personal-account.service.ts
@@ -105,7 +105,7 @@ export class DeletePersonalAccountService {
     const { renderAccountDeleteEmail } = await import('@kit/email-templates');
     const mailer = new Mailer();
 
-    const html = await renderAccountDeleteEmail({
+    const html = renderAccountDeleteEmail({
       userDisplayName: params.userDisplayName,
       productName: params.productName,
     });
diff --git a/packages/features/team-accounts/src/components/settings/team-account-danger-zone.tsx b/packages/features/team-accounts/src/components/settings/team-account-danger-zone.tsx
index 5c28b0680..771d7346e 100644
--- a/packages/features/team-accounts/src/components/settings/team-account-danger-zone.tsx
+++ b/packages/features/team-accounts/src/components/settings/team-account-danger-zone.tsx
@@ -148,7 +148,7 @@ function DeleteTeamConfirmationForm({
             <div
               className={
                 'border-2 border-red-500 p-4 text-sm text-red-500' +
-                ' flex flex-col space-y-2'
+                ' my-4 flex flex-col space-y-2'
               }
             >
               <div>
diff --git a/packages/features/team-accounts/src/components/settings/team-account-settings-container.tsx b/packages/features/team-accounts/src/components/settings/team-account-settings-container.tsx
index dec250a78..8c946a871 100644
--- a/packages/features/team-accounts/src/components/settings/team-account-settings-container.tsx
+++ b/packages/features/team-accounts/src/components/settings/team-account-settings-container.tsx
@@ -7,6 +7,7 @@ import {
   CardHeader,
   CardTitle,
 } from '@kit/ui/card';
+import { Trans } from '@kit/ui/trans';
 
 import { TeamAccountDangerZone } from './team-account-danger-zone';
 import { UpdateTeamAccountImage } from './update-team-account-image-container';
@@ -31,10 +32,12 @@ export function TeamAccountSettingsContainer(props: {
     <div className={'flex flex-col space-y-8'}>
       <Card>
         <CardHeader>
-          <CardTitle>Team Logo</CardTitle>
+          <CardTitle>
+            <Trans i18nKey={'teams:settings.teamLogo'} />
+          </CardTitle>
 
           <CardDescription>
-            Update your team's logo to make it easier to identify
+            <Trans i18nKey={'teams:settings.teamLogoDescription'} />
           </CardDescription>
         </CardHeader>
 
@@ -45,9 +48,13 @@ export function TeamAccountSettingsContainer(props: {
 
       <Card>
         <CardHeader>
-          <CardTitle>Team Account Settings</CardTitle>
+          <CardTitle>
+            <Trans i18nKey={'teams:settings.teamName'} />
+          </CardTitle>
 
-          <CardDescription>Manage your team account settings</CardDescription>
+          <CardDescription>
+            <Trans i18nKey={'teams:settings.teamNameDescription'} />
+          </CardDescription>
         </CardHeader>
 
         <CardContent>
@@ -60,11 +67,12 @@ export function TeamAccountSettingsContainer(props: {
 
       <Card className={'border-destructive border-2'}>
         <CardHeader>
-          <CardTitle>Danger Zone</CardTitle>
+          <CardTitle>
+            <Trans i18nKey={'teams:settings.dangerZone'} />
+          </CardTitle>
 
           <CardDescription>
-            Please be careful when making changes in this section as they are
-            irreversible.
+            <Trans i18nKey={'teams:settings.dangerZoneDescription'} />
           </CardDescription>
         </CardHeader>
 
diff --git a/packages/stripe/src/services/stripe-webhook-handler.service.ts b/packages/stripe/src/services/stripe-webhook-handler.service.ts
index 3012fa924..d1ced848f 100644
--- a/packages/stripe/src/services/stripe-webhook-handler.service.ts
+++ b/packages/stripe/src/services/stripe-webhook-handler.service.ts
@@ -194,7 +194,7 @@ export class StripeWebhookHandlerService
       price_amount: params.amount,
       cancel_at_period_end: subscription.cancel_at_period_end ?? false,
       interval: interval as string,
-      currency: price?.currency!,
+      currency: price?.currency as string,
       product_id: price?.product as string,
       variant_id: priceId,
       interval_count: price?.recurring?.interval_count ?? 1,
diff --git a/supabase/package.json b/supabase/package.json
index ffb7dd2ca..7c2b5ac9f 100644
--- a/supabase/package.json
+++ b/supabase/package.json
@@ -8,8 +8,7 @@
     "reset": "supabase db reset || supabase start",
     "status": "supabase status",
     "test": "supabase db test",
-    "lint": "supabase db lint",
-    "lint:report": "supabase db lint",
+    "db:lint": "supabase db lint",
     "deploy": "supabase link --project-ref $SUPABASE_PROJECT_REF && supabase db push",
     "typegen": "supabase gen types typescript --local > ../packages/supabase/src/database.types.ts"
   },