diff --git a/packages/web/app/src/components/organization/billing/PlanSummary.tsx b/packages/web/app/src/components/organization/billing/PlanSummary.tsx
index 68d11dd2adb..839520db9c2 100644
--- a/packages/web/app/src/components/organization/billing/PlanSummary.tsx
+++ b/packages/web/app/src/components/organization/billing/PlanSummary.tsx
@@ -2,7 +2,7 @@ import { ReactElement, ReactNode } from 'react';
 import { Stat, Table, TBody, Td, TFoot, Th, THead, Tr } from '@/components/v2';
 import { FragmentType, graphql, useFragment } from '@/gql';
 import { BillingPlanType } from '@/gql/graphql';
-import { CurrencyFormatter } from './helpers';
+import { CurrencyFormatter, formatOperations } from './helpers';
 
 const PriceEstimationTable_PlanFragment = graphql(`
   fragment PriceEstimationTable_PlanFragment on BillingPlan {
@@ -48,7 +48,7 @@ function PriceEstimationTable(props: {
             <Td>
               Included Operations <span className="text-neutral-10">(free)</span>
             </Td>
-            <Td align="right">{includedOperationsInMillions}M</Td>
+            <Td align="right">{formatOperations(includedOperationsInMillions)}</Td>
             <Td align="right">{CurrencyFormatter.format(0)}</Td>
             <Td align="right">{CurrencyFormatter.format(0)}</Td>
           </Tr>
@@ -56,7 +56,7 @@ function PriceEstimationTable(props: {
         {plan.planType === BillingPlanType.Pro && (
           <Tr>
             <Td>Operations</Td>
-            <Td align="right">{additionalOperations}M</Td>
+            <Td align="right">{formatOperations(additionalOperations)}</Td>
             <Td align="right">{CurrencyFormatter.format(plan.pricePerOperationsUnit ?? 0)}</Td>
             <Td align="right">{CurrencyFormatter.format(operationsTotal)}</Td>
           </Tr>
@@ -114,7 +114,7 @@ export function PlanSummary({
         <Stat>
           <Stat.Label>Operations Limit</Stat.Label>
           <Stat.HelpText>up to</Stat.HelpText>
-          <Stat.Number>{operationsRateLimit}M</Stat.Number>
+          <Stat.Number>{formatOperations(operationsRateLimit)}</Stat.Number>
           <Stat.HelpText>per month</Stat.HelpText>
         </Stat>
         <Stat className="mb-8">
diff --git a/packages/web/app/src/components/organization/billing/helpers.ts b/packages/web/app/src/components/organization/billing/helpers.ts
index ac2981a70f2..ec83a205a15 100644
--- a/packages/web/app/src/components/organization/billing/helpers.ts
+++ b/packages/web/app/src/components/organization/billing/helpers.ts
@@ -9,3 +9,12 @@ export const DateFormatter = Intl.DateTimeFormat('en', {
   month: 'short',
   day: 'numeric',
 });
+
+/** Format millions of operations as "500M" or "2.5B" */
+export function formatOperations(millions: number): string {
+  if (millions >= 1000) {
+    const b = parseFloat((millions / 1000).toFixed(3));
+    return `${b}B`;
+  }
+  return `${millions}M`;
+}
diff --git a/packages/web/app/src/pages/organization-subscription-manage.tsx b/packages/web/app/src/pages/organization-subscription-manage.tsx
index d3f595c5d67..e7342a195d5 100644
--- a/packages/web/app/src/pages/organization-subscription-manage.tsx
+++ b/packages/web/app/src/pages/organization-subscription-manage.tsx
@@ -379,16 +379,18 @@ function Inner(props: {
                     <div className="mt-5 pl-2.5">
                       <Slider
                         min={1}
-                        max={300}
+                        max={5000}
                         disabled={isFetching}
                         value={[operationsRateLimit]}
                         onValueChange={onOperationsRateLimitChange}
                       />
                       <div className="flex justify-between">
                         <span>1M</span>
-                        <span>100M</span>
-                        <span>200M</span>
-                        <span>300M</span>
+                        <span>1B</span>
+                        <span>2B</span>
+                        <span>3B</span>
+                        <span>4B</span>
+                        <span>5B</span>
                       </div>
                     </div>
                   </div>
diff --git a/packages/web/docs/src/components/pricing/index.tsx b/packages/web/docs/src/components/pricing/index.tsx
index a189aae220f..1ac25c2c9f1 100644
--- a/packages/web/docs/src/components/pricing/index.tsx
+++ b/packages/web/docs/src/components/pricing/index.tsx
@@ -86,7 +86,7 @@ export function Pricing({ className }: { className?: string }): ReactElement {
         <PricingSlider
           className="mt-6 lg:mt-12"
           onChange={value => {
-            const newPlan = value === 1 ? 'Hobby' : value < 280 ? 'Pro' : 'Enterprise';
+            const newPlan = value === 1 ? 'Hobby' : value < 4800 ? 'Pro' : 'Enterprise';
             if (newPlan !== highlightedPlan) {
               setHighlightedPlan(newPlan);
               if (!scrollviewRef.current) return;
diff --git a/packages/web/docs/src/components/pricing/pricing-slider.tsx b/packages/web/docs/src/components/pricing/pricing-slider.tsx
index b0df47aafab..93792deee2b 100644
--- a/packages/web/docs/src/components/pricing/pricing-slider.tsx
+++ b/packages/web/docs/src/components/pricing/pricing-slider.tsx
@@ -4,6 +4,16 @@ import { CallToAction, cn } from '@theguild/components';
 import { BookIcon } from '../book-icon';
 import { Slider } from '../slider';
 
+function formatOps(millions: number): { label: string; chars: number } {
+  if (millions >= 1000) {
+    const b = parseFloat((millions / 1000).toFixed(3));
+    const label = `${b} B`;
+    return { label, chars: label.length - 1 };
+  }
+  const label = `${millions} M`;
+  return { label, chars: label.length - 1 };
+}
+
 export function PricingSlider({
   className,
   onChange,
@@ -13,29 +23,30 @@ export function PricingSlider({
   onChange: (value: number) => void;
 }) {
   const min = 1;
-  const max = 300;
+  const max = 5000;
 
   const [popoverOpen, setPopoverOpen] = useState(false);
+  const [opsLabel, setOpsLabel] = useState(() => formatOps(min).label);
   const rootRef = useRef<HTMLDivElement>(null);
 
   return (
     <div
       ref={rootRef}
       className={cn(
-        'relative isolate block select-none rounded-3xl border border-green-400 p-4 [counter-set:ops_calc(var(--ops))] sm:p-8',
+        'relative isolate block select-none rounded-3xl border border-green-400 p-4 sm:p-8',
         className,
       )}
       // 10$ base price + 10$ per 1M
-      style={{ '--ops': min, '--price': 'calc(10 + var(--ops) * 10)' }}
+      style={{ '--ops': min, '--ops-chars': 0, '--price': 'calc(10 + var(--ops) * 10)' }}
       {...rest}
     >
       <div
         aria-hidden
         className="text-green-1000 flex flex-wrap items-center text-2xl font-medium md:h-12 md:w-[calc(100%-260px)]"
       >
-        <div className="relative min-w-[clamp(calc(60.95px+14.47px*round(down,log(max(var(--ops),1),10),1)),(2-var(--ops))*111px,111px)] max-w-[clamp(calc(60.95px+14.47px*round(down,log(max(var(--ops),1),10),1)),(2-var(--ops))*111px,111px)] shrink grow motion-safe:transition-all">
-          <div className="flex w-full whitespace-pre rounded-[40px] bg-blue-300 px-3 py-1 tabular-nums leading-8 opacity-[calc(var(--ops)-1)] [transition-duration:calc(clamp(0,var(--ops)-1,1)*350ms)] before:tracking-[-0.12em] before:content-[''_counter(ops)_'_'] motion-safe:transition-all">
-            M
+        <div className="relative min-w-[clamp(calc(60.95px+14.47px*var(--ops-chars)),(2-var(--ops))*111px,111px)] max-w-[clamp(calc(60.95px+14.47px*var(--ops-chars)),(2-var(--ops))*111px,111px)] shrink grow motion-safe:transition-all">
+          <div className="flex w-full whitespace-pre rounded-[40px] bg-blue-300 px-3 py-1 tabular-nums leading-8 opacity-[calc(var(--ops)-1)] [transition-duration:calc(clamp(0,var(--ops)-1,1)*350ms)] tracking-[-0.12em] motion-safe:transition-all">
+            {opsLabel}
           </div>
           <div className="absolute left-0 top-0 whitespace-pre leading-10 opacity-[calc(2-var(--ops))] [transition-duration:calc(clamp(0,2-var(--ops),1)*350ms)] motion-safe:transition">
             How many
@@ -60,11 +71,14 @@ export function PricingSlider({
           counter="after:content-['$'_counter(price)_'_/_month'] after:[counter-set:price_calc(var(--price))]"
           onChange={event => {
             const value = event.currentTarget.valueAsNumber;
+            const display = formatOps(value);
             rootRef.current!.style.setProperty('--ops', `${value}`);
+            rootRef.current!.style.setProperty('--ops-chars', `${display.chars}`);
+            setOpsLabel(display.label);
             onChange(value);
           }}
         />
-        <span className="font-medium">{max}M</span>
+        <span className="font-medium">5B</span>
       </div>
       <Root delayDuration={0} open={popoverOpen} onOpenChange={setPopoverOpen}>
         <Trigger asChild>