diff --git a/apps/builder/components/dashboard/WorkspaceSettingsModal/BillingContent/UsageContent/UsageContent.tsx b/apps/builder/components/dashboard/WorkspaceSettingsModal/BillingContent/UsageContent/UsageContent.tsx
index 8385aa850..493c00002 100644
--- a/apps/builder/components/dashboard/WorkspaceSettingsModal/BillingContent/UsageContent/UsageContent.tsx
+++ b/apps/builder/components/dashboard/WorkspaceSettingsModal/BillingContent/UsageContent/UsageContent.tsx
@@ -70,6 +70,7 @@ export const UsageContent = ({ workspace }: Props) => {
               (resets on 1st of every month)
             </Text>
           </HStack>
+
           <HStack>
             <Skeleton
               fontWeight="bold"
@@ -78,7 +79,12 @@ export const UsageContent = ({ workspace }: Props) => {
             >
               {parseNumberWithCommas(totalChatsUsed)}
             </Skeleton>
-            <Text>/ {parseNumberWithCommas(workspaceChatsLimit)}</Text>
+            <Text>
+              /{' '}
+              {workspaceChatsLimit === -1
+                ? 'Unlimited'
+                : parseNumberWithCommas(workspaceChatsLimit)}
+            </Text>
           </HStack>
         </Flex>
 
diff --git a/apps/builder/components/shared/PlanTag.tsx b/apps/builder/components/shared/PlanTag.tsx
index fe272cd93..a1b9d7909 100644
--- a/apps/builder/components/shared/PlanTag.tsx
+++ b/apps/builder/components/shared/PlanTag.tsx
@@ -3,7 +3,13 @@ import { Plan } from 'db'
 
 export const PlanTag = ({ plan, ...props }: { plan?: Plan } & TagProps) => {
   switch (plan) {
-    case Plan.LIFETIME:
+    case Plan.LIFETIME: {
+      return (
+        <Tag colorScheme="purple" data-testid="lifetime-plan-tag" {...props}>
+          Lifetime
+        </Tag>
+      )
+    }
     case Plan.PRO: {
       return (
         <Tag colorScheme="blue" data-testid="pro-plan-tag" {...props}>
diff --git a/apps/docs/docs/self-hosting/configuration/builder.mdx b/apps/docs/docs/self-hosting/configuration/builder.mdx
index 594406eb9..555709465 100644
--- a/apps/docs/docs/self-hosting/configuration/builder.mdx
+++ b/apps/docs/docs/self-hosting/configuration/builder.mdx
@@ -158,15 +158,15 @@ The related environment variables are listed here but you are probably not inter
 <details><summary><h4>Stripe</h4></summary>
 <p>
 
-| Parameter                     | Default | Description            |
-| ----------------------------- | ------- | ---------------------- |
-| NEXT_PUBLIC_STRIPE_PUBLIC_KEY | --      | Stripe public key      |
-| STRIPE_SECRET_KEY             | --      | Stripe secret key      |
-| STRIPE_PRICE_USD_ID           | --      | Pro plan USD price id  |
-| STRIPE_PRICE_EUR_ID           | --      | Pro plan EUR price id  |
-| STRIPE_PRICE_TEAM_USD_ID      | --      | Team plan USD price id |
-| STRIPE_PRICE_TEAM_EUR_ID      | --      | Team plan EUR price id |
-| STRIPE_WEBHOOK_SECRET         | --      | Stripe Webhook secret  |
+| Parameter                          | Default | Description                 |
+| ---------------------------------- | ------- | --------------------------- |
+| NEXT_PUBLIC_STRIPE_PUBLIC_KEY      | --      | Stripe public key           |
+| STRIPE_SECRET_KEY                  | --      | Stripe secret key           |
+| STRIPE_PRO_PRICE_ID                | --      | Pro plan price id           |
+| STRIPE_STARTER_PRICE_ID            | --      | Starter plan price id       |
+| STRIPE_ADDITIONAL_CHATS_PRICE_ID   | --      | Additional chats price id   |
+| STRIPE_ADDITIONAL_STORAGE_PRICE_ID | --      | Additional storage price id |
+| STRIPE_WEBHOOK_SECRET              | --      | Stripe Webhook secret       |
 
 </p></details>
 
diff --git a/apps/landing-page/pages/pricing.tsx b/apps/landing-page/pages/pricing.tsx
index 783552078..6d93b9e2a 100644
--- a/apps/landing-page/pages/pricing.tsx
+++ b/apps/landing-page/pages/pricing.tsx
@@ -107,7 +107,23 @@ const Pricing = () => {
                   name: 'Personal',
                   features: [
                     'Unlimited typebots',
-                    '300 chats included',
+                    <>
+                      <Text>
+                        <chakra.span fontWeight="bold">300 chats</chakra.span>{' '}
+                        included
+                      </Text>
+                      &nbsp;
+                      <Tooltip
+                        hasArrow
+                        placement="top"
+                        label="A chat is counted whenever a user starts a discussion. It is
+                  independant of the number of messages he sends and receives."
+                      >
+                        <chakra.span cursor="pointer" h="7">
+                          <HelpCircleIcon />
+                        </chakra.span>
+                      </Tooltip>
+                    </>,
                     'Native integrations',
                     'Webhooks',
                     'Custom Javascript & CSS',
@@ -151,7 +167,7 @@ const Pricing = () => {
                     </>,
                     <>
                       <Text>
-                        <chakra.span fontWeight="bold">2 GB chats</chakra.span>{' '}
+                        <chakra.span fontWeight="bold">2 GB</chakra.span>{' '}
                         included
                       </Text>
                       &nbsp;
@@ -214,7 +230,7 @@ const Pricing = () => {
                     </>,
                     <>
                       <Text>
-                        <chakra.span fontWeight="bold">10 GB chats</chakra.span>{' '}
+                        <chakra.span fontWeight="bold">10 GB</chakra.span>{' '}
                         included
                       </Text>
                       &nbsp;