diff --git a/apps/builder/src/features/billing/api/procedures/createCheckoutSession.ts b/apps/builder/src/features/billing/api/procedures/createCheckoutSession.ts
index d224de25a..d7c7da24a 100644
--- a/apps/builder/src/features/billing/api/procedures/createCheckoutSession.ts
+++ b/apps/builder/src/features/billing/api/procedures/createCheckoutSession.ts
@@ -77,6 +77,10 @@ export const createCheckoutSession = authenticatedProcedure
         mode: 'subscription',
         metadata: { workspaceId, plan, additionalChats, additionalStorage },
         currency,
+        tax_id_collection: {
+          enabled: true,
+        },
+        billing_address_collection: 'required',
         automatic_tax: { enabled: true },
         line_items: parseSubscriptionItems(
           plan,