diff --git a/apps/www/pages/pricing/index.tsx b/apps/www/pages/pricing/index.tsx
index fc52c9de4cd..2a3b6bb0717 100644
--- a/apps/www/pages/pricing/index.tsx
+++ b/apps/www/pages/pricing/index.tsx
@@ -8,7 +8,7 @@ import ReactMarkdown from 'react-markdown'
 import CTABanner from '~/components/CTABanner'
 import DefaultLayout from '~/components/Layouts/Default'
 import { PricingTableRowDesktop, PricingTableRowMobile } from '~/components/Pricing/PricingTableRow'
-import pricing from 'shared-data/Pricing.json'
+import { pricing } from 'shared-data/pricing'
 import pricingFaq from '~/data/PricingFAQ.json'
 import { useTheme } from 'common/Providers'
 import ComputePricingModal from '~/components/Pricing/ComputePricingModal'
@@ -522,7 +522,7 @@ export default function IndexPage() {
                     sectionId="realtime"
                   />
                   <PricingTableRowMobile
-                    category={pricing['edge-functions']}
+                    category={pricing['edge_functions']}
                     plan={'free'}
                     icon={Solutions['edge-functions'].icon}
                     sectionId="edge-functions"
@@ -578,7 +578,7 @@ export default function IndexPage() {
                     icon={Solutions['realtime'].icon}
                   />
                   <PricingTableRowMobile
-                    category={pricing['edge-functions']}
+                    category={pricing['edge_functions']}
                     plan={'pro'}
                     icon={Solutions['edge-functions'].icon}
                   />
@@ -630,7 +630,7 @@ export default function IndexPage() {
                     icon={Solutions['realtime'].icon}
                   />
                   <PricingTableRowMobile
-                    category={pricing['edge-functions']}
+                    category={pricing['edge_functions']}
                     plan={'team'}
                     icon={Solutions['edge-functions'].icon}
                   />
@@ -684,7 +684,7 @@ export default function IndexPage() {
                     icon={Solutions['realtime'].icon}
                   />
                   <PricingTableRowMobile
-                    category={pricing['edge-functions']}
+                    category={pricing['edge_functions']}
                     plan={'enterprise'}
                     icon={Solutions['edge-functions'].icon}
                   />
@@ -837,7 +837,7 @@ export default function IndexPage() {
                     sectionId="realtime"
                   />
                   <PricingTableRowDesktop
-                    category={pricing['edge-functions']}
+                    category={pricing['edge_functions']}
                     icon={Solutions['edge-functions'].icon}
                     sectionId="edge-functions"
                   />
diff --git a/packages/shared-data/Pricing.json b/packages/shared-data/Pricing.json
deleted file mode 100644
index 50eb140d3ca..00000000000
--- a/packages/shared-data/Pricing.json
+++ /dev/null
@@ -1,545 +0,0 @@
-{
-  "database": {
-    "title": "Database",
-    "icon": "M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4",
-    "features": [
-      {
-        "title": "Dedicated Postgres Database",
-        "tooltips": {
-          "main": "A Postgres database with no restrictions? You get it. No pseudo limited users, you are the postgres root user.  No caveats."
-        },
-        "plans": {
-          "free": true,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Unlimited API requests",
-        "plans": {
-          "free": true,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Database size",
-        "tooltips": {
-          "main": "Billing is based on the average daily database size in GB throughout the billing period."
-        },
-        "plans": {
-          "free": "500 MB",
-          "pro": "8 GB, then $0.125 per GB",
-          "team": "8 GB, then $0.125 per GB",
-          "enterprise": "Unlimited"
-        }
-      },
-      {
-        "title": "Automatic backups",
-        "tooltips": {
-          "main": "Backups are entire copies of your database that can be restored in the future.",
-          "pro": "7 days of backup (if > 1TB, contact for Enterprise pricing)",
-          "team": "14 days of backup (if > 1TB, contact for Enterprise pricing)"
-        },
-        "plans": {
-          "free": false,
-          "pro": "7 days",
-          "team": "14 days",
-          "enterprise": "Custom"
-        }
-      },
-      {
-        "title": "Point in time recovery",
-        "tooltips": {
-          "main": "PITR cannot be applied retroactively, projects can only be rolled back to the point from which PITR has been applied.",
-          "pro": "$100 per 7 days. If > 28 day rollback period, contact enterprise",
-          "team": "$100 per 7 days. If > 28 day rollback period, contact enterprise"
-        },
-        "plans": {
-          "free": false,
-          "pro": "$100 per 7 days",
-          "team": "$100 per 7 days",
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Pausing",
-        "tooltips": {
-          "main": "Projects that have no activity or API requests will be paused. They can be reactivated via the dashboard"
-        },
-        "plans": {
-          "free": "After 1 inactive week",
-          "pro": "Never",
-          "team": "Never",
-          "enterprise": "Never"
-        }
-      },
-      {
-        "title": "Database egress",
-        "tooltips": {
-          "main": "Billing is based on the total sum of outgoing traffic of your database in GB throughout your billing period."
-        },
-        "plans": {
-          "free": "2GB",
-          "pro": "50 GB, then $0.09 per GB",
-          "team": "50 GB, then $0.09 per GB",
-          "enterprise": "Unlimited"
-        }
-      }
-    ]
-  },
-  "auth": {
-    "title": "Auth",
-    "icon": "M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4",
-    "features": [
-      {
-        "title": "Total Users",
-        "tooltips": { "main": "The maximum number of users your project can have" },
-        "plans": {
-          "free": "Unlimited",
-          "pro": "Unlimited",
-          "team": "Unlimited",
-          "enterprise": "Unlimited"
-        }
-      },
-      {
-        "title": "MAUs",
-        "tooltips": {
-          "main": "Users who log in or refresh their token count towards MAU.\nBilling is based on the sum of distinct users requesting your API throughout the billing period. Resets every billing cycle."
-        },
-        "plans": {
-          "free": "50,000",
-          "pro": "100,000, then $0.00325 per MAU",
-          "team": "100,000, then $0.00325 per MAU",
-          "enterprise": "Unlimited"
-        }
-      },
-      {
-        "title": "Social OAuth providers",
-        "plans": {
-          "free": true,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Custom SMTP server",
-        "plans": {
-          "free": true,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Remove Supabase branding from emails",
-        "plans": {
-          "free": false,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Enterprise OAuth providers",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": false,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Audit trails",
-        "plans": {
-          "free": "1 hour",
-          "pro": "7 days",
-          "team": "28 days",
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Supabase Auth emails",
-        "tooltips": { "main": "Rate limits do not apply to Custom SMTP" },
-        "plans": {
-          "free": "30 / hour",
-          "pro": "100 / hour",
-          "team": "100 / hour",
-          "enterprise": "Contact Us"
-        }
-      },
-      {
-        "title": "Single Sign-On (SAML 2.0)",
-        "plans": {
-          "free": false,
-          "pro": "50 free, then $0.015 per MAU",
-          "team": "50 free, then $0.015 per MAU",
-          "enterprise": "Contact Us"
-        }
-      },
-      {
-        "title": "Advanced security features",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": false,
-          "enterprise": "Contact Us"
-        }
-      }
-    ]
-  },
-  "storage": {
-    "title": "Storage",
-    "icon": "M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4",
-
-    "features": [
-      {
-        "title": "Storage",
-        "tooltips": {
-          "main": "The sum of all objects' size in your storage buckets.\nBilling is based on the average daily size in GB throughout your billing period."
-        },
-        "plans": {
-          "free": "1 GB",
-          "pro": "100 GB, then $0.021 per GB",
-          "team": "100 GB, then $0.021 per GB",
-          "enterprise": "Unlimited"
-        }
-      },
-      {
-        "title": "Storage egress",
-        "tooltips": {
-          "main": "All requests to view and download your storage items go through our CDN. We sum up all outgoing traffic (egress) for storage related requests through our CDN. We do not differentiate between cache and no cache hits.\nBilling is based on the total amount of egress in GB throughout your billing period."
-        },
-        "plans": {
-          "free": "2 GB",
-          "pro": "200 GB, then $0.09 per GB",
-          "team": "200 GB, then $0.09 per GB",
-          "enterprise": "Unlimited"
-        }
-      },
-      {
-        "title": "Custom access controls",
-        "plans": {
-          "free": true,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Max file upload size",
-        "tooltips": { "main": "You can change the upload size in the dashboard" },
-        "plans": {
-          "free": "50MB",
-          "pro": "5GB",
-          "team": "5GB",
-          "enterprise": "Unlimited"
-        }
-      },
-      {
-        "title": "Image Transformations",
-        "tooltips": {
-          "main": "We count all images that were transformed in the billing period, ignoring any transformations.\nUsage example: You transform one image with four different size transformations and another image with just a single transformation. It counts as two, as only two images were transformed.\nBilling is based on the count of (origin) images that used transformations throughout the billing period. Resets every billing cycle."
-        },
-        "plans": {
-          "free": false,
-          "pro": "100 origin images, then $5 per 1000 origin images",
-          "team": "100 origin images, then $5 per 1000 origin images",
-          "enterprise": "Unlimited"
-        }
-      }
-    ]
-  },
-  "edge-functions": {
-    "title": "Edge Functions",
-    "icon": "M10 20l4-16m4 4l4 4-4 4M6 16l-4-4 4-4",
-    "features": [
-      {
-        "title": "Invocations",
-        "tooltips": {
-          "main": "Billing is based on the sum of all invocations, independent of response status, throughout your billing period."
-        },
-        "main": "Billing is based on the sum of all invocations, independent of response status, throughout your billing period.",
-        "plans": {
-          "free": "500K/month",
-          "pro": "2 Million, then $2 per 1 Million",
-          "team": "2 Million, then $2 per 1 Million",
-          "enterprise": "Unlimited"
-        }
-      },
-      {
-        "title": "Script size",
-        "plans": {
-          "free": "2 MB",
-          "pro": "10 MB",
-          "team": "10 MB",
-          "enterprise": "Unlimited"
-        }
-      },
-      {
-        "title": "Number of functions",
-        "tooltips": {
-          "main": "Billing is based on the maximum amount of functions at any point in time throughout your billing period."
-        },
-        "plans": {
-          "free": "10",
-          "pro": "100, then $10 per additional 100",
-          "team": "100, then $10 per additional 100",
-          "enterprise": "Unlimited"
-        }
-      }
-    ]
-  },
-  "realtime": {
-    "title": "Realtime",
-    "icon": "M15.042 21.672L13.684 16.6m0 0l-2.51 2.225.569-9.47 5.227 7.917-3.286-.672zM12 2.25V4.5m5.834.166l-1.591 1.591M20.25 10.5H18M7.757 14.743l-1.59 1.59M6 10.5H3.75m4.007-4.243l-1.59-1.59",
-    "features": [
-      {
-        "title": "Postgres Changes",
-        "plans": {
-          "free": true,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Concurrent Peak Connections",
-        "tooltips": {
-          "main": "Total number of successful connections. Connections attempts are not counted towards usage.\nBilling is based on the maximum amount of concurrent peak connections throughout your billing period."
-        },
-        "plans": {
-          "free": "200",
-          "pro": "500, then $10 per 1000",
-          "team": "500, then $10 per 1000",
-          "enterprise": "Unlimited concurrent connections and volume discount"
-        }
-      },
-      {
-        "title": "Messages Per Month",
-        "tooltips": {
-          "main": "Count of messages going through Realtime.\nUsage example: If you do a database change and 5 clients listen to that change via Realtime, that's 5 messages. If you broadcast a message and 4 clients listen to that, that's 5 messages (1 message sent, 4 received).\nBilling is based on the total amount of messages throughout your billing period."
-        },
-        "plans": {
-          "free": "2 Million",
-          "pro": "5 Million, then $2.50 per Million",
-          "team": "5 Million, then $2.50 per Million",
-          "enterprise": "Volume discounts on messages"
-        }
-      },
-      {
-        "title": "Max Message Size",
-        "plans": {
-          "free": "250 KB",
-          "pro": "3 MB",
-          "team": "3 MB",
-          "enterprise": "Custom"
-        }
-      }
-    ]
-  },
-  "dashboard": {
-    "title": "Dashboard",
-    "icon": "M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4",
-    "features": [
-      {
-        "title": "Team members",
-        "plans": {
-          "free": "Unlimited",
-          "pro": "Unlimited",
-          "team": "Unlimited",
-          "enterprise": "Unlimited"
-        }
-      },
-      {
-        "title": "Access controls",
-        "plans": {
-          "free": "Coming soon",
-          "pro": "Coming soon",
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Audit trails",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": true,
-          "enterprise": true
-        }
-      }
-    ]
-  },
-  "security": {
-    "title": "Platform Security and Compliance",
-    "icon": "M9 12.75L11.25 15 15 9.75m-3-7.036A11.959 11.959 0 013.598 6 11.99 11.99 0 003 9.749c0 5.592 3.824 10.29 9 11.623 5.176-1.332 9-6.03 9-11.622 0-1.31-.21-2.571-.598-3.751h-.152c-3.196 0-6.1-1.248-8.25-3.285z",
-    "features": [
-      {
-        "title": "On Premises / BYO cloud",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": false,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Log retention (API & Database)",
-        "plans": {
-          "free": "1 day",
-          "pro": "7 days",
-          "team": "28 days",
-          "enterprise": "90 days"
-        }
-      },
-      {
-        "title": "Log drain",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": "Coming soon",
-          "enterprise": "Coming soon"
-        }
-      },
-      {
-        "title": "Metrics endpoint",
-        "plans": {
-          "free": false,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "SOC2",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "SSO",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": "Contact Us",
-          "enterprise": "Contact Us"
-        }
-      },
-      {
-        "title": "99.9% SLA",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": false,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Access Roles",
-        "plans": {
-          "free": "Owner, Developer",
-          "pro": "Owner, Developer",
-          "team": "Additional owner(s), admin, read-only, billing admin, custom",
-          "enterprise": "Additional owner(s), admin, read-only, billing admin, custom"
-        }
-      },
-      {
-        "title": "Vanity URLs",
-        "plans": {
-          "free": false,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Custom Domains",
-        "tooltips": {
-          "enterprise": "Volume discounts available."
-        },
-        "plans": {
-          "free": false,
-          "pro": "$10 per domain per month per project add on",
-          "team": "$10 per domain per month per project add on",
-          "enterprise": "1, additional $10/domain/month"
-        }
-      }
-    ]
-  },
-  "support": {
-    "title": "Support",
-    "icon": "M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z",
-    "features": [
-      {
-        "title": "Community support",
-        "plans": {
-          "free": true,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Email support",
-        "plans": {
-          "free": false,
-          "pro": true,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Email support SLA",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": true,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Designated support",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": false,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "On Boarding Support",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": false,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Designated customer success engineer ",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": false,
-          "enterprise": true
-        }
-      },
-      {
-        "title": "Security Questionnaire Help",
-        "plans": {
-          "free": false,
-          "pro": false,
-          "team": true,
-          "enterprise": true
-        }
-      }
-    ]
-  }
-}
diff --git a/packages/shared-data/index.ts b/packages/shared-data/index.ts
index c55fe15a7b7..ad135754ea8 100644
--- a/packages/shared-data/index.ts
+++ b/packages/shared-data/index.ts
@@ -1,6 +1,7 @@
 import tweets from './tweets'
 import logConstants from './logConstants'
 import { plans, PricingInformation } from './plans'
+import { pricing } from './pricing'
 
-export { tweets, logConstants, plans }
+export { tweets, logConstants, plans, pricing }
 export type { PricingInformation }
diff --git a/packages/shared-data/pricing.ts b/packages/shared-data/pricing.ts
new file mode 100644
index 00000000000..e339ea72275
--- /dev/null
+++ b/packages/shared-data/pricing.ts
@@ -0,0 +1,622 @@
+type Pricing = {
+  database: PricingCategory
+  auth: PricingCategory
+  storage: PricingCategory
+  edge_functions: PricingCategory
+  realtime: PricingCategory
+  dashboard: PricingCategory
+  security: PricingCategory
+  support: PricingCategory
+}
+
+type PricingCategory = {
+  title: string
+  icon: string
+  features: PricingFeature[]
+}
+
+type PricingFeature = {
+  title: string
+  tooltips?: { main?: string; pro?: string; team?: string; enterprise?: string }
+  plans: {
+    free: boolean | string
+    pro: boolean | string
+    team: boolean | string
+    enterprise: boolean | string
+  }
+  usage_based: boolean
+}
+
+export const pricing: Pricing = {
+  database: {
+    title: 'Database',
+    icon: 'M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4',
+    features: [
+      {
+        title: 'Dedicated Postgres Database',
+        tooltips: {
+          main: 'A Postgres database with no restrictions? You get it. No pseudo limited users, you are the postgres root user.  No caveats.',
+        },
+        plans: {
+          free: true,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Unlimited API requests',
+        plans: {
+          free: true,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Database size',
+        tooltips: {
+          main: 'Billing is based on the average daily database size in GB throughout the billing period.',
+        },
+        plans: {
+          free: '500 MB included',
+          pro: '8 GB included, then $0.125 per GB',
+          team: '8 GB included, then $0.125 per GB',
+          enterprise: 'Unlimited',
+        },
+        usage_based: true,
+      },
+      {
+        title: 'Automatic backups',
+        tooltips: {
+          main: 'Backups are entire copies of your database that can be restored in the future.',
+          pro: '7 days of backup (if > 1TB, contact for Enterprise pricing)',
+          team: '14 days of backup (if > 1TB, contact for Enterprise pricing)',
+        },
+        plans: {
+          free: false,
+          pro: '7 days',
+          team: '14 days',
+          enterprise: 'Custom',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Point in time recovery',
+        tooltips: {
+          main: 'PITR cannot be applied retroactively, projects can only be rolled back to the point from which PITR has been applied.',
+          pro: '$100 per 7 days. If > 28 day rollback period, contact enterprise',
+          team: '$100 per 7 days. If > 28 day rollback period, contact enterprise',
+        },
+        plans: {
+          free: false,
+          pro: '$100 per 7 days',
+          team: '$100 per 7 days',
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Pausing',
+        tooltips: {
+          main: 'Projects that have no activity or API requests will be paused. They can be reactivated via the dashboard',
+        },
+        plans: {
+          free: 'After 1 inactive week',
+          pro: 'Never',
+          team: 'Never',
+          enterprise: 'Never',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Database egress',
+        tooltips: {
+          main: 'Billing is based on the total sum of outgoing traffic of your database in GB throughout your billing period.',
+        },
+        plans: {
+          free: '2GB included',
+          pro: '50 GB included, then $0.09 per GB',
+          team: '50 GB included, then $0.09 per GB',
+          enterprise: 'Unlimited',
+        },
+        usage_based: true,
+      },
+    ],
+  },
+  auth: {
+    title: 'Auth',
+    icon: 'M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4',
+    features: [
+      {
+        title: 'Total Users',
+        tooltips: { main: 'The maximum number of users your project can have' },
+        plans: {
+          free: 'Unlimited',
+          pro: 'Unlimited',
+          team: 'Unlimited',
+          enterprise: 'Unlimited',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'MAUs',
+        tooltips: {
+          main: 'Users who log in or refresh their token count towards MAU.\nBilling is based on the sum of distinct users requesting your API throughout the billing period. Resets every billing cycle.',
+        },
+        plans: {
+          free: '50,000 included',
+          pro: '100,000 included, then $0.00325 per MAU',
+          team: '100,000 included, then $0.00325 per MAU',
+          enterprise: 'Unlimited',
+        },
+        usage_based: true,
+      },
+      {
+        title: 'Social OAuth providers',
+        plans: {
+          free: true,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Custom SMTP server',
+        plans: {
+          free: true,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Remove Supabase branding from emails',
+        plans: {
+          free: false,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Enterprise OAuth providers',
+        plans: {
+          free: false,
+          pro: false,
+          team: false,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Audit trails',
+        plans: {
+          free: '1 hour',
+          pro: '7 days',
+          team: '28 days',
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Supabase Auth emails',
+        tooltips: { main: 'Rate limits do not apply to Custom SMTP' },
+        plans: {
+          free: '30 / hour',
+          pro: '100 / hour',
+          team: '100 / hour',
+          enterprise: 'Contact Us',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Single Sign-On (SAML 2.0)',
+        plans: {
+          free: false,
+          pro: '50 included, then $0.015 per MAU',
+          team: '50 included, then $0.015 per MAU',
+          enterprise: 'Contact Us',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Advanced security features',
+        plans: {
+          free: false,
+          pro: false,
+          team: false,
+          enterprise: 'Contact Us',
+        },
+        usage_based: false,
+      },
+    ],
+  },
+  storage: {
+    title: 'Storage',
+    icon: 'M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4',
+
+    features: [
+      {
+        title: 'Storage',
+        tooltips: {
+          main: "The sum of all objects' size in your storage buckets.\nBilling is based on the average daily size in GB throughout your billing period.",
+        },
+        plans: {
+          free: '1 GB included',
+          pro: '100 GB included, then $0.021 per GB',
+          team: '100 GB included, then $0.021 per GB',
+          enterprise: 'Unlimited',
+        },
+        usage_based: true,
+      },
+      {
+        title: 'Storage egress',
+        tooltips: {
+          main: 'All requests to view and download your storage items go through our CDN. We sum up all outgoing traffic (egress) for storage related requests through our CDN. We do not differentiate between cache and no cache hits.\nBilling is based on the total amount of egress in GB throughout your billing period.',
+        },
+        plans: {
+          free: '2 GB included',
+          pro: '200 GB included, then $0.09 per GB',
+          team: '200 GB included, then $0.09 per GB',
+          enterprise: 'Unlimited',
+        },
+        usage_based: true,
+      },
+      {
+        title: 'Custom access controls',
+        plans: {
+          free: true,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Max file upload size',
+        tooltips: { main: 'You can change the upload size in the dashboard' },
+        plans: {
+          free: '50MB',
+          pro: '5GB',
+          team: '5GB',
+          enterprise: 'Unlimited',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Image Transformations',
+        tooltips: {
+          main: 'We count all images that were transformed in the billing period, ignoring any transformations.\nUsage example: You transform one image with four different size transformations and another image with just a single transformation. It counts as two, as only two images were transformed.\nBilling is based on the count of (origin) images that used transformations throughout the billing period. Resets every billing cycle.',
+        },
+        plans: {
+          free: false,
+          pro: '100 origin images, then $5 per 1000 origin images',
+          team: '100 origin images, then $5 per 1000 origin images',
+          enterprise: 'Unlimited',
+        },
+        usage_based: true,
+      },
+    ],
+  },
+  edge_functions: {
+    title: 'Edge Functions',
+    icon: 'M10 20l4-16m4 4l4 4-4 4M6 16l-4-4 4-4',
+    features: [
+      {
+        title: 'Invocations',
+        tooltips: {
+          main: 'Billing is based on the sum of all invocations, independent of response status, throughout your billing period.',
+        },
+        plans: {
+          free: '500K/month included',
+          pro: '2 Million included, then $2 per 1 Million',
+          team: '2 Million included, then $2 per 1 Million',
+          enterprise: 'Unlimited',
+        },
+        usage_based: true,
+      },
+      {
+        title: 'Script size',
+        plans: {
+          free: '2 MB',
+          pro: '10 MB',
+          team: '10 MB',
+          enterprise: 'Unlimited',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Number of functions',
+        tooltips: {
+          main: 'Billing is based on the maximum amount of functions at any point in time throughout your billing period.',
+        },
+        plans: {
+          free: '10 included',
+          pro: '100 included, then $10 per additional 100',
+          team: '100 included, then $10 per additional 100',
+          enterprise: 'Unlimited',
+        },
+        usage_based: true,
+      },
+    ],
+  },
+  realtime: {
+    title: 'Realtime',
+    icon: 'M15.042 21.672L13.684 16.6m0 0l-2.51 2.225.569-9.47 5.227 7.917-3.286-.672zM12 2.25V4.5m5.834.166l-1.591 1.591M20.25 10.5H18M7.757 14.743l-1.59 1.59M6 10.5H3.75m4.007-4.243l-1.59-1.59',
+    features: [
+      {
+        title: 'Postgres Changes',
+        plans: {
+          free: true,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Concurrent Peak Connections',
+        tooltips: {
+          main: 'Total number of successful connections. Connections attempts are not counted towards usage.\nBilling is based on the maximum amount of concurrent peak connections throughout your billing period.',
+        },
+        plans: {
+          free: '200 included',
+          pro: '500 included, then $10 per 1000',
+          team: '500 included, then $10 per 1000',
+          enterprise: 'Unlimited concurrent connections and volume discount',
+        },
+        usage_based: true,
+      },
+      {
+        title: 'Messages Per Month',
+        tooltips: {
+          main: "Count of messages going through Realtime.\nUsage example: If you do a database change and 5 clients listen to that change via Realtime, that's 5 messages. If you broadcast a message and 4 clients listen to that, that's 5 messages (1 message sent, 4 received).\nBilling is based on the total amount of messages throughout your billing period.",
+        },
+        plans: {
+          free: '2 Million included',
+          pro: '5 Million included, then $2.50 per Million',
+          team: '5 Million included, then $2.50 per Million',
+          enterprise: 'Volume discounts on messages',
+        },
+        usage_based: true,
+      },
+      {
+        title: 'Max Message Size',
+        plans: {
+          free: '250 KB',
+          pro: '3 MB',
+          team: '3 MB',
+          enterprise: 'Custom',
+        },
+        usage_based: false,
+      },
+    ],
+  },
+  dashboard: {
+    title: 'Dashboard',
+    icon: 'M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4',
+    features: [
+      {
+        title: 'Team members',
+        plans: {
+          free: 'Unlimited',
+          pro: 'Unlimited',
+          team: 'Unlimited',
+          enterprise: 'Unlimited',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Access controls',
+        plans: {
+          free: 'Coming soon',
+          pro: 'Coming soon',
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Audit trails',
+        plans: {
+          free: false,
+          pro: false,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+    ],
+  },
+  security: {
+    title: 'Platform Security and Compliance',
+    icon: 'M9 12.75L11.25 15 15 9.75m-3-7.036A11.959 11.959 0 013.598 6 11.99 11.99 0 003 9.749c0 5.592 3.824 10.29 9 11.623 5.176-1.332 9-6.03 9-11.622 0-1.31-.21-2.571-.598-3.751h-.152c-3.196 0-6.1-1.248-8.25-3.285z',
+    features: [
+      {
+        title: 'On Premises / BYO cloud',
+        plans: {
+          free: false,
+          pro: false,
+          team: false,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Log retention (API & Database)',
+        plans: {
+          free: '1 day',
+          pro: '7 days',
+          team: '28 days',
+          enterprise: '90 days',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Log drain',
+        plans: {
+          free: false,
+          pro: false,
+          team: 'Coming soon',
+          enterprise: 'Coming soon',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Metrics endpoint',
+        plans: {
+          free: false,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'SOC2',
+        plans: {
+          free: false,
+          pro: false,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'SSO',
+        plans: {
+          free: false,
+          pro: false,
+          team: 'Contact Us',
+          enterprise: 'Contact Us',
+        },
+        usage_based: false,
+      },
+      {
+        title: '99.9% SLA',
+        plans: {
+          free: false,
+          pro: false,
+          team: false,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Access Roles',
+        plans: {
+          free: 'Owner, Developer',
+          pro: 'Owner, Developer',
+          team: 'Additional owner(s), admin, read-only, billing admin, custom',
+          enterprise: 'Additional owner(s), admin, read-only, billing admin, custom',
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Vanity URLs',
+        plans: {
+          free: false,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Custom Domains',
+        tooltips: {
+          enterprise: 'Volume discounts available.',
+        },
+        plans: {
+          free: false,
+          pro: '$10 per domain per month per project add on',
+          team: '$10 per domain per month per project add on',
+          enterprise: '1, additional $10/domain/month',
+        },
+        usage_based: false,
+      },
+    ],
+  },
+  support: {
+    title: 'Support',
+    icon: 'M18.364 5.636l-3.536 3.536m0 5.656l3.536 3.536M9.172 9.172L5.636 5.636m3.536 9.192l-3.536 3.536M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-5 0a4 4 0 11-8 0 4 4 0 018 0z',
+    features: [
+      {
+        title: 'Community support',
+        plans: {
+          free: true,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Email support',
+        plans: {
+          free: false,
+          pro: true,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Email support SLA',
+        plans: {
+          free: false,
+          pro: false,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Designated support',
+        plans: {
+          free: false,
+          pro: false,
+          team: false,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'On Boarding Support',
+        plans: {
+          free: false,
+          pro: false,
+          team: false,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Designated customer success engineer ',
+        plans: {
+          free: false,
+          pro: false,
+          team: false,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+      {
+        title: 'Security Questionnaire Help',
+        plans: {
+          free: false,
+          pro: false,
+          team: true,
+          enterprise: true,
+        },
+        usage_based: false,
+      },
+    ],
+  },
+}
diff --git a/studio/components/interfaces/BillingV2/Subscription/CostControl/SpendCapSidePanel.tsx b/studio/components/interfaces/BillingV2/Subscription/CostControl/SpendCapSidePanel.tsx
index 3549845d09c..e42e2863d17 100644
--- a/studio/components/interfaces/BillingV2/Subscription/CostControl/SpendCapSidePanel.tsx
+++ b/studio/components/interfaces/BillingV2/Subscription/CostControl/SpendCapSidePanel.tsx
@@ -9,8 +9,8 @@ import Link from 'next/link'
 import { useEffect, useState } from 'react'
 import { useSubscriptionPageStateSnapshot } from 'state/subscription-page'
 import { Alert, Button, Collapsible, IconChevronRight, IconExternalLink, SidePanel } from 'ui'
-import { BILLING_BREAKDOWN_METRICS } from '../Subscription.constants'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
+import { pricing } from 'shared-data/pricing'
 
 const SPEND_CAP_OPTIONS: {
   name: string
@@ -55,8 +55,6 @@ const SpendCapSidePanel = () => {
   const isTurningOnCap = !isSpendCapOn && selectedOption === 'on'
   const hasChanges = selectedOption !== (isSpendCapOn ? 'on' : 'off')
 
-  const largeNumberFormatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 })
-
   useEffect(() => {
     if (visible && subscription !== undefined) {
       setSelectedOption(isSpendCapOn ? 'on' : 'off')
@@ -88,9 +86,13 @@ const SpendCapSidePanel = () => {
     }
   }
 
-  const billingMetricCategories = Array.from(
-    new Set(BILLING_BREAKDOWN_METRICS.map((it) => it.category))
-  )
+  const billingMetricCategories: (keyof typeof pricing)[] = [
+    'database',
+    'auth',
+    'storage',
+    'realtime',
+    'edge_functions',
+  ]
 
   return (
     <SidePanel
@@ -147,42 +149,28 @@ const SpendCapSidePanel = () => {
                     </Table.th>
                   </>
                 }
-                body={billingMetricCategories.map((category) => {
-                  const categoryItems = BILLING_BREAKDOWN_METRICS.filter(
-                    (it) => it.category === category
-                  )
+                body={billingMetricCategories.map((categoryId) => {
+                  const category = pricing[categoryId]
+                  const usageItems = category.features.filter((it: any) => it.usage_based)
 
                   return (
                     <>
-                      <Table.tr key={category}>
+                      <Table.tr key={categoryId}>
                         <Table.td>
-                          <p className="text-xs text-scale-1200">{category}</p>
+                          <p className="text-xs text-scale-1200">{category.title}</p>
                         </Table.td>
                         <Table.td>{null}</Table.td>
                       </Table.tr>
-                      {categoryItems.map((item) => {
-                        const costs = subscription?.usage_fees?.find(
-                          (it) => it.metric === item.metric
-                        )
-
-                        if (!costs) return null
-
+                      {usageItems.map((item: any) => {
                         return (
                           <Table.tr key={item.name}>
                             <Table.td>
-                              <p className="text-xs pl-4">{item.name}</p>
+                              <p className="text-xs pl-4">{item.title}</p>
                             </Table.td>
                             <Table.td>
-                              {costs.pricingStrategy === 'UNIT' ? (
-                                <p className="text-xs">
-                                  ${costs.pricingOptions.perUnitPrice} per {item.unitName}
-                                </p>
-                              ) : costs.pricingStrategy === 'PACKAGE' ? (
-                                <p className="text-xs">
-                                  ${costs.pricingOptions.packagePrice} per{' '}
-                                  {largeNumberFormatter.format(costs.pricingOptions.packageSize!)}
-                                </p>
-                              ) : null}
+                              <p className="text-xs pl-4">
+                                {item.plans[subscription?.plan?.id || 'pro']}
+                              </p>
                             </Table.td>
                           </Table.tr>
                         )