diff --git a/apps/app/public/fonts/geist/geist-sans-latin-400-normal.woff2 b/apps/app/public/fonts/geist/geist-sans-latin-400-normal.woff2
new file mode 100644
index 000000000..9867e874e
Binary files /dev/null and b/apps/app/public/fonts/geist/geist-sans-latin-400-normal.woff2 differ
diff --git a/apps/app/public/fonts/geist/geist-sans-latin-500-normal.woff2 b/apps/app/public/fonts/geist/geist-sans-latin-500-normal.woff2
new file mode 100644
index 000000000..f6ee691a9
Binary files /dev/null and b/apps/app/public/fonts/geist/geist-sans-latin-500-normal.woff2 differ
diff --git a/packages/email/emails/invite-portal.tsx b/packages/email/emails/invite-portal.tsx
index 69a96144f..be8ac4ee7 100644
--- a/packages/email/emails/invite-portal.tsx
+++ b/packages/email/emails/invite-portal.tsx
@@ -29,7 +29,7 @@ export const InvitePortalEmail = ({ email, inviteLink, organizationName }: Props
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-400-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-400-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={400}
@@ -40,7 +40,7 @@ export const InvitePortalEmail = ({ email, inviteLink, organizationName }: Props
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-500-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-500-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={500}
diff --git a/packages/email/emails/marketing/welcome.tsx b/packages/email/emails/marketing/welcome.tsx
index 3dfa6d07e..18aee645e 100644
--- a/packages/email/emails/marketing/welcome.tsx
+++ b/packages/email/emails/marketing/welcome.tsx
@@ -15,7 +15,7 @@ export const WelcomeEmail = ({ name }: Props) => {
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-400-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-400-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={400}
@@ -26,7 +26,7 @@ export const WelcomeEmail = ({ name }: Props) => {
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-500-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-500-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={500}
diff --git a/packages/email/emails/otp.tsx b/packages/email/emails/otp.tsx
index a753dff81..498af3766 100644
--- a/packages/email/emails/otp.tsx
+++ b/packages/email/emails/otp.tsx
@@ -26,7 +26,7 @@ export const OTPVerificationEmail = ({ email, otp }: Props) => {
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-400-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-400-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={400}
@@ -37,7 +37,7 @@ export const OTPVerificationEmail = ({ email, otp }: Props) => {
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-500-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-500-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={500}
diff --git a/packages/email/emails/reminders/task-reminder.tsx b/packages/email/emails/reminders/task-reminder.tsx
index 64b65025a..99948c0dd 100644
--- a/packages/email/emails/reminders/task-reminder.tsx
+++ b/packages/email/emails/reminders/task-reminder.tsx
@@ -32,7 +32,7 @@ export const TaskReminderEmail = ({ email, name, dueDate, recordId }: Props) =>
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-400-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-400-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={400}
@@ -43,7 +43,7 @@ export const TaskReminderEmail = ({ email, name, dueDate, recordId }: Props) =>
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-500-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-500-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={500}
diff --git a/packages/email/emails/waitlist.tsx b/packages/email/emails/waitlist.tsx
index 9ddaeff8f..a58679951 100644
--- a/packages/email/emails/waitlist.tsx
+++ b/packages/email/emails/waitlist.tsx
@@ -30,7 +30,7 @@ export const WaitlistEmail = ({ email }: Props) => {
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-400-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-400-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={400}
@@ -40,7 +40,7 @@ export const WaitlistEmail = ({ email }: Props) => {
             fontFamily="Geist"
             fallbackFontFamily="Helvetica"
             webFont={{
-              url: 'https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.1/files/geist-sans-latin-500-normal.woff2',
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-500-normal.woff2',
               format: 'woff2',
             }}
             fontWeight={500}