diff --git a/README.md b/README.md
index 70298a09e54cf..491a08b100963 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ You can also [self-host](https://supabase.com/docs/guides/hosting/overview) and
 - [pg_graphql](http://github.com/supabase/pg_graphql/) a PostgreSQL extension that exposes a GraphQL API
 - [Storage](https://github.com/supabase/storage-api) provides a RESTful interface for managing Files stored in S3, using Postgres to manage permissions.
 - [postgres-meta](https://github.com/supabase/postgres-meta) is a RESTful API for managing your Postgres, allowing you to fetch tables, add roles, and run queries, etc.
-- [GoTrue](https://github.com/supabase/gotrue) is an JWT based API for managing users and issuing JWT tokens.
+- [GoTrue](https://github.com/supabase/gotrue) is a JWT based API for managing users and issuing JWT tokens.
 - [Kong](https://github.com/Kong/kong) is a cloud-native API gateway.
 
 #### Client libraries
diff --git a/apps/docs/pages/guides/platform/compute-add-ons.mdx b/apps/docs/pages/guides/platform/compute-add-ons.mdx
index d3bd4ad528afa..e809e93476a45 100644
--- a/apps/docs/pages/guides/platform/compute-add-ons.mdx
+++ b/apps/docs/pages/guides/platform/compute-add-ons.mdx
@@ -8,21 +8,23 @@ export const meta = {
 
 Every project on the Supabase Platform comes with its own dedicated Postgres instance running inside a virtual machine (VM). The following table describes the base instance with additional compute add-ons available if you need extra performance when scaling up Supabase.
 
-| Plan            | Pricing | CPU                     | Memory | Connections: Direct | Connections: Pooler |
-| --------------- | ------- | ----------------------- | ------ | ------------------- | ------------------- |
-| Free (Included) | $0      | 2-core ARM (shared)     | 1 GB   | 60                  | 200                 |
-| Small           | $5      | 2-core ARM (shared)     | 2 GB   | 90                  | 200                 |
-| Medium          | $50     | 2-core ARM (shared)     | 4 GB   | 120                 | 200                 |
-| Large           | $100    | 2-core ARM (dedicated)  | 8 GB   | 160                 | 300                 |
-| XL              | $200    | 4-core ARM (dedicated)  | 16 GB  | 240                 | 700                 |
-| 2XL             | $400    | 8-core ARM (dedicated)  | 32 GB  | 380                 | 1500                |
-| 4XL             | $950    | 16-core ARM (dedicated) | 64 GB  | 480                 | 3000                |
-| 8XL             | $1,860  | 32-core ARM (dedicated) | 128 GB | 490                 | 6000                |
-| 12XL            | $2,790  | 48-core ARM (dedicated) | 192 GB | 500                 | 9000                |
-| 16XL            | $3,720  | 64-core ARM (dedicated) | 256 GB | 500                 | 12,000              |
+| Plan    | Hourly Price USD | Monthly Price USD | CPU                     | Memory | Connections: Direct | Connections: Pooler |
+| ------- | ---------------- | ----------------- | ----------------------- | ------ | ------------------- | ------------------- |
+| Starter | $0.01344         | ~$10              | 2-core ARM (shared)     | 1 GB   | 60                  | 200                 |
+| Small   | $0.0206          | ~$15              | 2-core ARM (shared)     | 2 GB   | 90                  | 200                 |
+| Medium  | $0.0822          | ~$60              | 2-core ARM (shared)     | 4 GB   | 120                 | 200                 |
+| Large   | $0.1517          | ~$110             | 2-core ARM (dedicated)  | 8 GB   | 160                 | 300                 |
+| XL      | $0.2877          | ~$210             | 4-core ARM (dedicated)  | 16 GB  | 240                 | 700                 |
+| 2XL     | $0.562           | ~$410             | 8-core ARM (dedicated)  | 32 GB  | 380                 | 1500                |
+| 4XL     | $1.32            | ~$960             | 16-core ARM (dedicated) | 64 GB  | 480                 | 3000                |
+| 8XL     | $2.562           | ~$1,870           | 32-core ARM (dedicated) | 128 GB | 490                 | 6000                |
+| 12XL    | $3.836           | ~$2,800           | 48-core ARM (dedicated) | 192 GB | 500                 | 9000                |
+| 16XL    | $5.12            | ~$3,730           | 64-core ARM (dedicated) | 256 GB | 500                 | 12,000              |
 
 Number of connections above are recommended values.
 
+We charge hourly for additional compute based on your usage. Read more about [usage-based billing for compute](/docs/guides/platform/org-based-billing#usage-based-billing-for-compute).
+
 [Contact us](https://supabase.com/contact/enterprise) if you require a custom plan.
 
 ## Dedicated vs. shared CPU
@@ -37,18 +39,18 @@ When considering compute upgrades, assess whether your bottlenecks are hardware-
 
 SSD Disks are attached to your servers and the disk performance depends on the compute add-on of your instance. Disk IO refers to two metrics: throughput (Megabits per Second) and IOPS (Input/Output Operations per Second).
 
-| Plan            | Pricing | Max Disk Throughput | Baseline Disk Throughput | Max IOPS    | Baseline IOPS |
-| --------------- | ------- | ------------------- | ------------------------ | ----------- | ------------- |
-| Free (Included) | $0      | 2,085 Mbps          | 87 Mbps                  | 11,800 IOPS | 500 IOPS      |
-| Small           | $5      | 2,085 Mbps          | 174 Mbps                 | 11,800 IOPS | 1,000 IOPS    |
-| Medium          | $50     | 2,085 Mbps          | 347 Mbps                 | 11,800 IOPS | 2,000 IOPS    |
-| Large           | $100    | 4,750 Mbps          | 630 Mbps                 | 20,000 IOPS | 3,600 IOPS    |
-| XL              | $200    | 4,750 Mbps          | 1,188 Mbps               | 20,000 IOPS | 6,000 IOPS    |
-| 2XL             | $400    | 4,750 Mbps          | 2,375 Mbps               | 20,000 IOPS | 12,000 IOPS   |
-| 4XL             | $950    | 4,750 Mbps          | 4,750 Mbps               | 20,000 IOPS | 20,000 IOPS   |
-| 8XL             | $1,860  | 9,500 Mbps          | 9,500 Mbps               | 40,000 IOPS | 40,000 IOPS   |
-| 12XL            | $2,790  | 14,250 Mbps         | 14,250 Mbps              | 50,000 IOPS | 50,000 IOPS   |
-| 16XL            | $3,720  | 19,000 Mbps         | 19,000 Mbps              | 80,000 IOPS | 80,000 IOPS   |
+| Plan    | Max Disk Throughput | Baseline Disk Throughput | Max IOPS    | Baseline IOPS |
+| ------- | ------------------- | ------------------------ | ----------- | ------------- |
+| Starter | 2,085 Mbps          | 87 Mbps                  | 11,800 IOPS | 500 IOPS      |
+| Small   | 2,085 Mbps          | 174 Mbps                 | 11,800 IOPS | 1,000 IOPS    |
+| Medium  | 2,085 Mbps          | 347 Mbps                 | 11,800 IOPS | 2,000 IOPS    |
+| Large   | 4,750 Mbps          | 630 Mbps                 | 20,000 IOPS | 3,600 IOPS    |
+| XL      | 4,750 Mbps          | 1,188 Mbps               | 20,000 IOPS | 6,000 IOPS    |
+| 2XL     | 4,750 Mbps          | 2,375 Mbps               | 20,000 IOPS | 12,000 IOPS   |
+| 4XL     | 4,750 Mbps          | 4,750 Mbps               | 20,000 IOPS | 20,000 IOPS   |
+| 8XL     | 9,500 Mbps          | 9,500 Mbps               | 40,000 IOPS | 40,000 IOPS   |
+| 12XL    | 14,250 Mbps         | 14,250 Mbps              | 50,000 IOPS | 50,000 IOPS   |
+| 16XL    | 19,000 Mbps         | 19,000 Mbps              | 80,000 IOPS | 80,000 IOPS   |
 
 [Contact us](https://supabase.com/contact/enterprise) if you require a custom plan.
 
diff --git a/apps/docs/pages/guides/realtime/realtime-with-nextjs.mdx b/apps/docs/pages/guides/realtime/realtime-with-nextjs.mdx
index e60afb4f74a91..fd9e8d986756a 100644
--- a/apps/docs/pages/guides/realtime/realtime-with-nextjs.mdx
+++ b/apps/docs/pages/guides/realtime/realtime-with-nextjs.mdx
@@ -7,8 +7,8 @@ export const meta = {
   sidebar_label: 'Videos',
 }
 
-In this guide we explore the best ways to receive realtime Postgres changes with your Next.js application.
-We'll show both client and serverside updates, and explore the which option is best.
+In this guide, we explore the best ways to receive real-time Postgres changes with your Next.js application.
+We'll show both client and server side updates, and explore which option is best.
 
 <div className="video-container">
   <iframe
diff --git a/apps/www/components/Pricing/ComputePricingModal.tsx b/apps/www/components/Pricing/ComputePricingModal.tsx
index 7e4149fcd1338..4da3e70012270 100644
--- a/apps/www/components/Pricing/ComputePricingModal.tsx
+++ b/apps/www/components/Pricing/ComputePricingModal.tsx
@@ -1,9 +1,10 @@
 import React, { Fragment, useMemo } from 'react'
 import { useRouter } from 'next/router'
 import { useTheme } from 'common/Providers'
-import { IconCheckCircle, IconXCircle, Modal } from 'ui'
+import { IconXCircle, Modal } from 'ui'
 import pricingAddOn from '~/data/PricingAddOnTable.json'
 import { IconPricingIncludedCheck, IconPricingMinus } from './PricingIcons'
+import Link from 'next/link'
 
 interface Props {
   showComputeModal: boolean
@@ -47,12 +48,33 @@ export default function ComputePricingModal({ showComputeModal, setShowComputeMo
             </div>
             <div className="max-w-4xl prose">
               <h2 className="text-lg">Choose best compute setup for you</h2>
-              <p className="text-sm lg:max-w-3xl">
+              <p className="text-sm">
                 Every project on the Supabase Platform comes with its own dedicated Postgres
                 instance running inside a virtual machine (VM). The following table describes the
                 base instance with additional compute add-ons available if you need extra
                 performance when scaling up Supabase.
               </p>
+              <p className="text-sm">
+                Compute instances are billed hourly and you can scale up or down at any time if you
+                need extra performance. You'll only be charged at the end of the month for the hours
+                you've used. Paid plans come with $10 in Compute Credits to cover one Starter
+                instance or parts of any other instance. Read more on{' '}
+                <Link
+                  href="https://supabase.com/docs/guides/platform/org-based-billing#usage-based-billing-for-compute"
+                  passHref
+                >
+                  <a target="_blank" className="transition text-brand hover:text-brand-600">
+                    usage-based billing for compute
+                  </a>
+                </Link>{' '}
+                or{' '}
+                <Link href="https://supabase.com/docs/guides/platform/compute-add-ons" passHref>
+                  <a target="_blank" className="transition text-brand hover:text-brand-600">
+                    Compute Add-ons
+                  </a>
+                </Link>
+                .
+              </p>
             </div>
           </div>
         </div>
@@ -73,7 +95,7 @@ export default function ComputePricingModal({ showComputeModal, setShowComputeMo
                   {i === 0 && (
                     <tr className="">
                       <td className="pb-1 bg-scale-700 px-3 py-1 -mr-1 border-l-4 border-scale-700">
-                        <span className="">Included in Free and Pro plan</span>
+                        <span className="">First instance is free on paid plans</span>
                       </td>
                     </tr>
                   )}
diff --git a/apps/www/data/PricingAddOnTable.json b/apps/www/data/PricingAddOnTable.json
index 23b617c339f96..76e4b495ffe3c 100644
--- a/apps/www/data/PricingAddOnTable.json
+++ b/apps/www/data/PricingAddOnTable.json
@@ -11,7 +11,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "Starter" },
-          { "key": "pricing", "title": "Pricing", "value": "$0" },
+          { "key": "pricing", "title": "Price USD", "value": "$10" },
           { "key": "cpu", "title": "CPU", "value": "2-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": false },
           { "key": "memory", "title": "Memory", "value": "1 GB" },
@@ -36,7 +36,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "Small" },
-          { "key": "pricing", "title": "Pricing", "value": "$5" },
+          { "key": "pricing", "title": "Price USD", "value": "$15" },
           { "key": "cpu", "title": "CPU", "value": "2-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": false },
           { "key": "memory", "title": "Memory", "value": "2 GB" },
@@ -61,7 +61,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "Medium" },
-          { "key": "pricing", "title": "Pricing", "value": "$50" },
+          { "key": "pricing", "title": "Price USD", "value": "$60" },
           { "key": "cpu", "title": "CPU", "value": "2-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": false },
           { "key": "memory", "title": "Memory", "value": "4 GB" },
@@ -86,7 +86,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "Large" },
-          { "key": "pricing", "title": "Pricing", "value": "$100" },
+          { "key": "pricing", "title": "Price USD", "value": "$110" },
           { "key": "cpu", "title": "CPU", "value": "2-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": true },
           { "key": "memory", "title": "Memory", "value": "8 GB" },
@@ -111,7 +111,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "XL" },
-          { "key": "pricing", "title": "Pricing", "value": "$200" },
+          { "key": "pricing", "title": "Price USD", "value": "$210" },
           { "key": "cpu", "title": "CPU", "value": "4-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": true },
           { "key": "memory", "title": "Memory", "value": "16 GB" },
@@ -136,7 +136,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "2XL" },
-          { "key": "pricing", "title": "Pricing", "value": "$400" },
+          { "key": "pricing", "title": "Price USD", "value": "$410" },
           { "key": "cpu", "title": "CPU", "value": "8-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": true },
           { "key": "memory", "title": "Memory", "value": "32 GB" },
@@ -161,7 +161,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "4XL" },
-          { "key": "pricing", "title": "Pricing", "value": "$950" },
+          { "key": "pricing", "title": "Price USD", "value": "$960" },
           { "key": "cpu", "title": "CPU", "value": "16-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": true },
           { "key": "memory", "title": "Memory", "value": "64 GB" },
@@ -186,7 +186,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "8XL" },
-          { "key": "pricing", "title": "Pricing", "value": "$1,860" },
+          { "key": "pricing", "title": "Price USD", "value": "$1,870" },
           { "key": "cpu", "title": "CPU", "value": "32-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": true },
           { "key": "memory", "title": "Memory", "value": "128 GB" },
@@ -211,7 +211,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "12XL" },
-          { "key": "pricing", "title": "Pricing", "value": "$2,790" },
+          { "key": "pricing", "title": "Price USD", "value": "$2,800" },
           { "key": "cpu", "title": "CPU", "value": "48-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": true },
           { "key": "memory", "title": "Memory", "value": "192 GB" },
@@ -240,7 +240,7 @@
       {
         "columns": [
           { "key": "plan", "title": "Plan", "value": "16XL" },
-          { "key": "pricing", "title": "Pricing", "value": "$3,720" },
+          { "key": "pricing", "title": "Price USD", "value": "$3,730" },
           { "key": "cpu", "title": "CPU", "value": "64-core ARM" },
           { "key": "dedicated", "title": "Dedicated", "value": true },
           { "key": "memory", "title": "Memory", "value": "256 GB" },
diff --git a/apps/www/lib/mdx/mdxComponents.tsx b/apps/www/lib/mdx/mdxComponents.tsx
index 92a7c63f8de53..63a19621734f8 100644
--- a/apps/www/lib/mdx/mdxComponents.tsx
+++ b/apps/www/lib/mdx/mdxComponents.tsx
@@ -12,6 +12,7 @@ import {
   CollapsibleTrigger_Shadcn_,
   CollapsibleContent_Shadcn_,
   IconTriangle,
+  cn,
 } from 'ui'
 import ImageFadeStack from '~/components/ImageFadeStack'
 import ZoomableImg from '~/components/ZoomableImg/ZoomableImg'
@@ -91,8 +92,8 @@ export default function mdxComponents(type?: 'blog' | 'lp' | undefined) {
       }
       return <img {...props} />
     },
-    Img: ({ zoomable = true, ...props }: any) => (
-      <figure className="m-0">
+    Img: ({ zoomable = true, className, ...props }: any) => (
+      <figure className={cn('m-0', className)}>
         <ZoomableImg zoomable={zoomable}>
           <span
             className={[
diff --git a/apps/www/pages/pricing/index.tsx b/apps/www/pages/pricing/index.tsx
index f5e2c494805e1..f98ab1a026049 100644
--- a/apps/www/pages/pricing/index.tsx
+++ b/apps/www/pages/pricing/index.tsx
@@ -1,4 +1,4 @@
-import { Accordion, Button, IconCheck, Select } from 'ui'
+import { Accordion, Badge, Button, IconCheck, Select } from 'ui'
 import Solutions from 'data/Solutions'
 import { NextSeo } from 'next-seo'
 import Link from 'next/link'
@@ -13,6 +13,7 @@ import pricingFaq from '~/data/PricingFAQ.json'
 import { useTheme } from 'common/Providers'
 import ComputePricingModal from '~/components/Pricing/ComputePricingModal'
 import { plans } from 'shared-data/plans'
+import { ArrowNarrowRightIcon } from '@heroicons/react/outline'
 
 export default function IndexPage() {
   const router = useRouter()
@@ -121,7 +122,7 @@ export default function IndexPage() {
           <p className="p">{priceDescription}</p>
         </div>
         <p className="p">{description}</p>
-        <Link href="https://supabase.com/dashboard" passHref>
+        <Link href="https://supabase.com/dashboard/new" passHref>
           <a>
             <Button size="medium" block>
               Get started
@@ -158,6 +159,46 @@ export default function IndexPage() {
               <p className="p text-lg">
                 Start building for free, collaborate with a team, then scale to millions of users.
               </p>
+              <div className="w-full flex justify-center items-center opacity-0 !animate-[fadeIn_0.5s_cubic-bezier(0.25,0.25,0,1)_0.5s_both]">
+                <Link href="/blog/organization-based-billing" passHref>
+                  <a
+                    target="_blank"
+                    className="
+          group
+          relative
+          flex flex-row
+          items-center
+          pr-3 p-1
+          text-sm
+          w-auto
+          gap-2
+          text-left
+          rounded-full
+          bg-opacity-20
+          border
+          border-background-surface-100
+          hover:border-background-surface-300
+          overflow-hidden
+          focus:outline-none focus:ring-brand-600 focus:ring-2 focus:rounded-full
+          "
+                  >
+                    <Badge color="brand" size="large" className="py-1">
+                      Update
+                    </Badge>
+                    <span className="text-foreground">Changes to how we bill</span>
+                    <ArrowNarrowRightIcon className="h-4 ml-2 -translate-x-1 transition-transform group-hover:translate-x-0" />
+                    <div
+                      className="absolute inset-0 -z-10 bg-gradient-to-br
+            opacity-70
+            overflow-hidden rounded-full
+            from-background-surface-100
+            to-background-surface-300
+            backdrop-blur-md
+            "
+                    />
+                  </a>
+                </Link>
+              </div>
             </div>
           </div>
         </div>
@@ -404,7 +445,7 @@ export default function IndexPage() {
             <p className="mt-3 prose lg:max-w-lg">
               The Pro plan has a usage quota included and a spend cap turned on by default. If you
               need to go beyond the inclusive limits, simply switch off your spend cap to pay for
-              additional usage and scale seamlessly. Note that your project will run into
+              additional usage and scale seamlessly. Note that your projects will run into
               restrictions if you have the spend cap enabled and exhaust your quota.
             </p>
           </div>
@@ -456,7 +497,7 @@ export default function IndexPage() {
                   <MobileHeader
                     plan="Free"
                     price={'0'}
-                    priceDescription={'/mo'}
+                    priceDescription={'/month'}
                     description={'Perfect for hobby projects and experiments'}
                   />
                   <PricingTableRowMobile
@@ -516,7 +557,7 @@ export default function IndexPage() {
                     plan="Pro"
                     from={false}
                     price={'25'}
-                    priceDescription={'/mo + additional use'}
+                    priceDescription={'/month + additional use'}
                     description={'Everything you need to scale your project into production'}
                   />
                   <PricingTableRowMobile
@@ -568,7 +609,7 @@ export default function IndexPage() {
                     plan="Team"
                     from={false}
                     price={'599'}
-                    priceDescription={'/mo + additional use'}
+                    priceDescription={'/month + additional use'}
                     description={'Collaborate with different permissions and access patterns'}
                   />
                   <PricingTableRowMobile
@@ -744,10 +785,10 @@ export default function IndexPage() {
                                 {plan.priceMonthly}
                               </span>
                               {['Pro', 'Free'].includes(plan.name) && (
-                                <p className="p text-[13px] leading-4 mt-1">per month</p>
+                                <p className="p text-[13px] leading-4 mt-1">/ month / org</p>
                               )}
                               {['Team'].includes(plan.name) && (
-                                <p className="p text-[13px] leading-4 mt-1">per month</p>
+                                <p className="p text-[13px] leading-4 mt-1">/ month / org</p>
                               )}
                             </>
 
@@ -827,8 +868,8 @@ export default function IndexPage() {
 
                     <td className="px-6 pt-5">
                       <Link
-                        href="https://supabase.com/dashboard"
-                        as="https://supabase.com/dashboard"
+                        href="https://supabase.com/dashboard/new?plan=free"
+                        as="https://supabase.com/dashboard/new?plan=free"
                       >
                         <a>
                           <Button size="tiny" type="primary" block>
@@ -840,8 +881,8 @@ export default function IndexPage() {
 
                     <td className="px-6 pt-5">
                       <Link
-                        href="https://supabase.com/dashboard"
-                        as="https://supabase.com/dashboard"
+                        href="https://supabase.com/dashboard/new?plan=pro"
+                        as="https://supabase.com/dashboard/new?plan=pro"
                       >
                         <a>
                           <Button size="tiny" type="primary" block>
@@ -852,10 +893,10 @@ export default function IndexPage() {
                     </td>
 
                     <td className="px-6 pt-5">
-                      <Link href="https://forms.supabase.com/team">
+                      <Link href="https://supabase.com/dashboard/new?plan=team">
                         <a>
                           <Button size="tiny" type="primary" block>
-                            Contact us
+                            Get Started
                           </Button>
                         </a>
                       </Link>
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fc11e2a0f6ca9..7fee7c9b90043 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -152,6 +152,7 @@ services:
       PGRST_DB_USE_LEGACY_GUCS: "false"
       PGRST_APP_SETTINGS_JWT_SECRET: ${JWT_SECRET}
       PGRST_APP_SETTINGS_JWT_EXP: ${JWT_EXPIRY}
+    command: "postgrest"
 
   realtime:
     container_name: realtime-dev.supabase-realtime
@@ -272,7 +273,7 @@ services:
 
   functions:
     container_name: supabase-edge-functions
-    image: supabase/edge-runtime:v1.8.1
+    image: supabase/edge-runtime:v1.13.1
     restart: unless-stopped
     depends_on:
       analytics:
diff --git a/package-lock.json b/package-lock.json
index 0cba91b388be5..5fd3f5787a33c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14210,10 +14210,6 @@
         "websocket": "^1.0.34"
       }
     },
-    "node_modules/@supabase/shared-types": {
-      "version": "0.1.43",
-      "license": "Copyright Supabase"
-    },
     "node_modules/@supabase/storage-js": {
       "version": "2.5.1",
       "license": "MIT",
@@ -42495,7 +42491,7 @@
         "@supabase/auth-helpers-nextjs": "^0.5.6",
         "@supabase/auth-helpers-react": "^0.3.1",
         "@supabase/react-data-grid": "^7.1.0-beta.7",
-        "@supabase/shared-types": "^0.1.43",
+        "@supabase/shared-types": "^0.1.46",
         "@supabase/supabase-js": "^2.23.0",
         "@tanstack/react-query": "^4.22.0",
         "@tanstack/react-query-devtools": "^4.22.0",
@@ -42816,6 +42812,11 @@
         "url": "https://opencollective.com/storybook"
       }
     },
+    "studio/node_modules/@supabase/shared-types": {
+      "version": "0.1.46",
+      "resolved": "https://registry.npmjs.org/@supabase/shared-types/-/shared-types-0.1.46.tgz",
+      "integrity": "sha512-DV3VIQcyWdkVhQJNkH2IzHTiDS37AM5DnI/kQZc6YlzS93cFHERkwueKDFFIl85Q0UddG6ANZuoTne3w7BjWOQ=="
+    },
     "studio/node_modules/@tanstack/match-sorter-utils": {
       "version": "8.7.6",
       "license": "MIT",
diff --git a/packages/shared-data/plans.ts b/packages/shared-data/plans.ts
index 88a2830ee72c8..2f1d9b298391e 100644
--- a/packages/shared-data/plans.ts
+++ b/packages/shared-data/plans.ts
@@ -11,7 +11,6 @@ export interface PricingInformation {
   description: string
   preface: string
   features: string[]
-  featuresOrg?: string[]
   footer?: string
   cta: string
 }
@@ -21,12 +20,12 @@ export const plans: PricingInformation[] = [
     id: 'tier_free',
     name: 'Free',
     nameBadge: '',
-    costUnit: '/ month / project',
-    costUnitOrg: '/ month',
-    href: 'https://supabase.com/dashboard/new/new-project',
+    costUnit: '/ month / org',
+    costUnitOrg: '/ month / org',
+    href: 'https://supabase.com/dashboard/new?plan=free',
     priceLabel: '',
     priceMonthly: 0,
-    warning: 'Limit of 2 free projects',
+    warning: 'Limit of 2 free organizations',
     description: 'Perfect for passion projects & simple websites.',
     preface: 'Get started with:',
     features: [
@@ -34,7 +33,7 @@ export const plans: PricingInformation[] = [
       'Social OAuth providers',
       'Up to 500MB database space',
       'Up to 1GB file storage',
-      'Up to 2GB bandwidth',
+      'Up to 5GB bandwidth',
       'Up to 50MB file uploads',
       'Up to 50,000 monthly active users',
       'Up to 500K Edge Function invocations',
@@ -50,34 +49,19 @@ export const plans: PricingInformation[] = [
     id: 'tier_pro',
     name: 'Pro',
     nameBadge: '',
-    costUnit: '/ month / project',
-    costUnitOrg: '/ month',
-    href: 'https://supabase.com/dashboard/new/new-project',
+    costUnit: '/ month / org',
+    costUnitOrg: '/ month / org',
+    href: 'https://supabase.com/dashboard/new?plan=pro',
     priceLabel: 'From',
     warning: 'Usage-based plan',
     priceMonthly: 25,
     description: 'For production applications with the option to scale.',
-    featuresOrg: [
-      '$10 Compute Credits',
-      'No project pausing',
-      'Daily backups stored for 7 days',
-      '8GB database space included',
-      '100GB file storage included',
-      '50GB bandwidth included',
-      '5GB file uploads included',
-      '100,000 monthly active users included',
-      '2M Edge Function invocations included',
-      '500 concurrent Realtime connections included',
-      '5 million Realtime messages included',
-      '7-day log retention',
-      'Email support',
-    ],
     features: [
       'No project pausing',
       'Daily backups stored for 7 days',
       '8GB database space included',
       '100GB file storage included',
-      '50GB bandwidth included',
+      '250GB bandwidth included',
       '5GB file uploads included',
       '100,000 monthly active users included',
       '2M Edge Function invocations included',
@@ -94,9 +78,9 @@ export const plans: PricingInformation[] = [
     id: 'tier_team',
     name: 'Team',
     nameBadge: 'New',
-    costUnit: '/ month',
-    costUnitOrg: '/ month',
-    href: 'https://forms.supabase.com/team',
+    costUnit: '/ month / org',
+    costUnitOrg: '/ month / org',
+    href: 'https://supabase.com/dashboard/new?plan=team',
     priceLabel: 'From',
     warning: 'Usage-based plan',
     priceMonthly: 599,
@@ -113,7 +97,7 @@ export const plans: PricingInformation[] = [
     ],
     footer: 'Additional fees apply for usage beyond included usage.',
     preface: 'Everything in the Pro plan, plus:',
-    cta: 'Contact Us',
+    cta: 'Get Started',
   },
   {
     id: 'tier_enterprise',
@@ -125,6 +109,7 @@ export const plans: PricingInformation[] = [
       `SSO/SAML`,
       `On-premise support`,
       `24×7×365 premium enterprise support`,
+      'Custom Security Questionnaires',
       `Private Slack channel`,
     ],
     priceLabel: '',
diff --git a/packages/shared-data/pricing.ts b/packages/shared-data/pricing.ts
index c8927d77ef0eb..59aa4cc5ef17c 100644
--- a/packages/shared-data/pricing.ts
+++ b/packages/shared-data/pricing.ts
@@ -112,14 +112,14 @@ export const pricing: Pricing = {
         usage_based: false,
       },
       {
-        title: 'Database egress',
+        title: 'Bandwidth',
         tooltips: {
-          main: 'Billing is based on the total sum of outgoing traffic of your database in GB throughout your billing period.',
+          main: 'Billing is based on the total sum of outgoing traffic (includes Database, Storage, Realtime, Auth) 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',
+          free: '5GB included',
+          pro: '250 GB included, then $0.09 per GB',
+          team: '250 GB included, then $0.09 per GB',
           enterprise: 'Unlimited',
         },
         usage_based: true,
@@ -234,19 +234,6 @@ export const pricing: Pricing = {
         },
         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: {
diff --git a/spec/cli_v1_commands.yaml b/spec/cli_v1_commands.yaml
index e75ac2d12e21e..d65969c1698b6 100644
--- a/spec/cli_v1_commands.yaml
+++ b/spec/cli_v1_commands.yaml
@@ -1,7 +1,7 @@
 clispec: '001'
 info:
   id: cli
-  version: 1.88.0
+  version: 1.93.0
   title: Supabase CLI
   language: sh
   source: https://github.com/supabase/cli
@@ -1481,7 +1481,7 @@ commands:
     summary: Show total table sizes, including table index sizes
     description: |2-
 
-      This command displays the total size of each table in the database. It is the sum of the values that `pg_table_size()` and `pg_indexes_size()` gives for each table.
+      This command displays the total size of each table in the database. It is the sum of the values that `pg_table_size()` and `pg_indexes_size()` gives for each table. System tables inside `pg_catalog` and `information_schema` are not included.
 
       ```
                       NAME               │    SIZE
@@ -2249,7 +2249,7 @@ commands:
         default_value: ''
   - id: supabase-db
     title: supabase db
-    summary: Manage local Postgres databases
+    summary: Manage Postgres databases
     tags:
       - local-dev
     links: []
diff --git a/studio/.babelrc b/studio/.babelrc
new file mode 100644
index 0000000000000..9fcef0394fdf0
--- /dev/null
+++ b/studio/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets": ["next/babel"],
+  "plugins": []
+}
diff --git a/studio/components/interfaces/BillingV2/SpendCapModal.tsx b/studio/components/interfaces/BillingV2/SpendCapModal.tsx
index ef662f146cd24..d70e5b2e0def8 100644
--- a/studio/components/interfaces/BillingV2/SpendCapModal.tsx
+++ b/studio/components/interfaces/BillingV2/SpendCapModal.tsx
@@ -34,12 +34,12 @@ const SpendCapModal = ({ visible, onHide }: SpendCapModalProps) => {
                 <div className="flex items-center px-4 py-1">
                   <p className="w-[50%] text-sm">Database size</p>
                   <p className="w-[25%] text-sm">8GB</p>
-                  <p className="w-[25%] text-sm">$0.125/GB</p>
+                  <p className="w-[25%] text-sm">$0.125 per GB</p>
                 </div>
                 <div className="flex items-center px-4 py-1">
-                  <p className="w-[50%] text-sm">Database egress</p>
-                  <p className="w-[25%] text-sm">50GB</p>
-                  <p className="w-[25%] text-sm">$0.09/GB</p>
+                  <p className="w-[50%] text-sm">Egress</p>
+                  <p className="w-[25%] text-sm">250GB</p>
+                  <p className="w-[25%] text-sm">$0.09 per GB</p>
                 </div>
               </div>
               <div className="py-2">
@@ -75,10 +75,8 @@ const SpendCapModal = ({ visible, onHide }: SpendCapModalProps) => {
                     </Tooltip.Root>
                   </div>
                   <p className="w-[25%] text-sm">100,000</p>
-                  <p className="w-[25%] text-sm">$0.00325/user</p>
+                  <p className="w-[25%] text-sm">$0.00325 per user</p>
                 </div>
-              </div>
-              <div className="py-2">
                 <div className="flex items-center px-4 py-1">
                   <div className="flex w-[50%] items-center space-x-2">
                     <p className="text-sm">Single Sign-On (SAML 2.0) MAUs</p>
@@ -111,19 +109,15 @@ const SpendCapModal = ({ visible, onHide }: SpendCapModalProps) => {
                     </Tooltip.Root>
                   </div>
                   <p className="w-[25%] text-sm">50</p>
-                  <p className="w-[25%] text-sm">$0.015/user</p>
+                  <p className="w-[25%] text-sm">$0.015 per user</p>
                 </div>
               </div>
+
               <div className="py-2">
                 <div className="flex items-center px-4 py-1">
                   <p className="w-[50%] text-sm">Storage size</p>
                   <p className="w-[25%] text-sm">100GB</p>
-                  <p className="w-[25%] text-sm">$0.021/GB</p>
-                </div>
-                <div className="flex items-center px-4 py-1">
-                  <p className="w-[50%] text-sm">Storage egress</p>
-                  <p className="w-[25%] text-sm">200GB</p>
-                  <p className="w-[25%] text-sm">$0.09/GB</p>
+                  <p className="w-[25%] text-sm">$0.021 per GB</p>
                 </div>
                 <div className="flex items-center px-4 py-1">
                   <p className="w-[50%] text-sm">Storage Image Transformations</p>
@@ -136,13 +130,13 @@ const SpendCapModal = ({ visible, onHide }: SpendCapModalProps) => {
                 <div className="flex items-center px-4 py-1">
                   <p className="w-[50%] text-sm">Realtime concurrent peak connections</p>
                   <p className="w-[25%] text-sm">500</p>
-                  <p className="w-[25%] text-sm">$10/1000</p>
+                  <p className="w-[25%] text-sm">$10 per 1000</p>
                 </div>
 
                 <div className="flex items-center px-4 py-1">
                   <p className="w-[50%] text-sm">Realtime messages</p>
                   <p className="w-[25%] text-sm">5 Million</p>
-                  <p className="w-[25%] text-sm">$2.50/Million</p>
+                  <p className="w-[25%] text-sm">$2.50 per Million</p>
                 </div>
               </div>
 
@@ -161,7 +155,7 @@ const SpendCapModal = ({ visible, onHide }: SpendCapModalProps) => {
               </div>
             </div>
 
-            <p>
+            <p className="text-sm">
               See{' '}
               <Link href="https://supabase.com/pricing" passHref>
                 <a className="text-brand" target="_blank" rel="noreferrer">
diff --git a/studio/components/interfaces/Database/Backups/BackupItem.tsx b/studio/components/interfaces/Database/Backups/BackupItem.tsx
index 2565cb791fa3a..45041016a3404 100644
--- a/studio/components/interfaces/Database/Backups/BackupItem.tsx
+++ b/studio/components/interfaces/Database/Backups/BackupItem.tsx
@@ -55,15 +55,13 @@ const BackupItem = ({ projectRef, backup, index }: BackupItemProps) => {
     if (backup.status === 'COMPLETED')
       return (
         <div className="flex space-x-4">
-          {backup.data.canRestore && (
-            <Button
-              type="default"
-              disabled={!canTriggerScheduledBackups || isRestoring}
-              onClick={onRestoreClick}
-            >
-              Restore
-            </Button>
-          )}
+          <Button
+            type="default"
+            disabled={!canTriggerScheduledBackups || isRestoring}
+            onClick={onRestoreClick}
+          >
+            Restore
+          </Button>
         </div>
       )
     return <Badge color="yellow">Backup In Progress...</Badge>
diff --git a/studio/components/interfaces/Database/Hooks/EditHookPanel.tsx b/studio/components/interfaces/Database/Hooks/EditHookPanel.tsx
index bae48fe938a35..830bd41c110da 100644
--- a/studio/components/interfaces/Database/Hooks/EditHookPanel.tsx
+++ b/studio/components/interfaces/Database/Hooks/EditHookPanel.tsx
@@ -96,6 +96,7 @@ const EditHookPanel = ({ visible, selectedHook, onClose }: EditHookPanelProps) =
     function_type: isEdgeFunction(selectedHook?.function_args?.[0] ?? '')
       ? 'supabase_function'
       : 'http_request',
+    timeout_ms: Number(selectedHook?.function_args?.[4] ?? 1000),
   }
 
   useEffect(() => {
@@ -168,6 +169,10 @@ const EditHookPanel = ({ visible, selectedHook, onClose }: EditHookPanelProps) =
       }
     }
 
+    if (values.timeout_ms < 1000 || values.timeout_ms > 5000) {
+      errors['timeout_ms'] = 'Timeout should be between 1000ms and 5000ms'
+    }
+
     if (JSON.stringify(values) !== JSON.stringify(initialValues)) setIsEdited(true)
     return errors
   }
@@ -185,7 +190,6 @@ const EditHookPanel = ({ visible, selectedHook, onClose }: EditHookPanelProps) =
       return ui.setNotification({ category: 'error', message: 'Unable to find selected table' })
     }
 
-    const serviceTimeoutMs = '1000'
     const headers = httpHeaders
       .filter((header) => header.name && header.value)
       .reduce((a: any, b: any) => {
@@ -215,7 +219,7 @@ const EditHookPanel = ({ visible, selectedHook, onClose }: EditHookPanelProps) =
         values.http_method,
         JSON.stringify(headers),
         JSON.stringify(parameters),
-        serviceTimeoutMs,
+        values.timeout_ms.toString(),
       ],
     }
 
diff --git a/studio/components/interfaces/Database/Hooks/HTTPRequestFields.tsx b/studio/components/interfaces/Database/Hooks/HTTPRequestFields.tsx
index cc4cf1919cc01..65a7d8e4f7f81 100644
--- a/studio/components/interfaces/Database/Hooks/HTTPRequestFields.tsx
+++ b/studio/components/interfaces/Database/Hooks/HTTPRequestFields.tsx
@@ -113,6 +113,14 @@ const HTTPRequestFields = ({
               })}
             </Listbox>
           ) : null}
+          <Input
+            id="timeout_ms"
+            name="timeout_ms"
+            label="Timeout"
+            labelOptional="Between 1000ms to 5000ms"
+            type="number"
+            actions={<p className="text-light pr-2">ms</p>}
+          />
         </FormSectionContent>
       </FormSection>
       <SidePanel.Separator />
diff --git a/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx b/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx
index ec66dbfa62c32..7c408e29d19fd 100644
--- a/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx
+++ b/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx
@@ -8,7 +8,6 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'
 
 import { useCheckPermissions } from 'hooks'
 import SchemaTable from './SchemaTable'
-import AlphaPreview from 'components/to-be-cleaned/AlphaPreview'
 import ProductEmptyState from 'components/to-be-cleaned/ProductEmptyState'
 
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
diff --git a/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/PlanUpdateSidePanel.tsx b/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/PlanUpdateSidePanel.tsx
index fd13a6dc6e2ad..03c23fb582d79 100644
--- a/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/PlanUpdateSidePanel.tsx
+++ b/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/PlanUpdateSidePanel.tsx
@@ -266,7 +266,7 @@ const PlanUpdateSidePanel = () => {
                     <div className="border-t my-6" />
 
                     <ul role="list">
-                      {(plan.featuresOrg || plan.features).map((feature) => (
+                      {(plan.features).map((feature) => (
                         <li key={feature} className="flex py-2">
                           <div className="w-[12px]">
                             <IconCheck
diff --git a/studio/components/interfaces/Organization/GeneralSettings/MigrateOrganizationBillingButton.tsx b/studio/components/interfaces/Organization/GeneralSettings/MigrateOrganizationBillingButton.tsx
index 6fda726340d34..6a2710f8a1a16 100644
--- a/studio/components/interfaces/Organization/GeneralSettings/MigrateOrganizationBillingButton.tsx
+++ b/studio/components/interfaces/Organization/GeneralSettings/MigrateOrganizationBillingButton.tsx
@@ -1,3 +1,4 @@
+import * as Tooltip from '@radix-ui/react-tooltip'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { observer } from 'mobx-react-lite'
 import Link from 'next/link'
@@ -20,7 +21,7 @@ import {
 import { SpendCapModal } from 'components/interfaces/BillingV2'
 import { useOrganizationBillingMigrationMutation } from 'data/organizations/organization-migrate-billing-mutation'
 import { useOrganizationBillingMigrationPreview } from 'data/organizations/organization-migrate-billing-preview-query'
-import { useCheckPermissions, useSelectedOrganization, useStore } from 'hooks'
+import { useCheckPermissions, useFlag, useSelectedOrganization, useStore } from 'hooks'
 import { PRICING_TIER_LABELS_ORG } from 'lib/constants'
 import PaymentMethodSelection from '../BillingSettingsV2/Subscription/PaymentMethodSelection'
 import InformationBox from 'components/ui/InformationBox'
@@ -30,6 +31,9 @@ const MigrateOrganizationBillingButton = observer(() => {
   const router = useRouter()
   const organization = useSelectedOrganization()
 
+  const disableOrgBillingMigration = useFlag('disableOrgBillingMigration')
+  const canMigrateOrg = useCheckPermissions(PermissionAction.UPDATE, 'organizations')
+
   const [isOpen, setIsOpen] = useState(false)
   const [tier, setTier] = useState('')
   const [showSpendCapHelperModal, setShowSpendCapHelperModal] = useState(false)
@@ -65,6 +69,7 @@ const MigrateOrganizationBillingButton = observer(() => {
     data: migrationPreviewData,
     error: migrationPreviewError,
     isLoading: migrationPreviewIsLoading,
+    isSuccess: migrationPreviewIsSuccess,
     remove,
     refetch: previewMigration,
   } = useOrganizationBillingMigrationPreview(
@@ -108,9 +113,37 @@ const MigrateOrganizationBillingButton = observer(() => {
   return (
     <>
       <div>
-        <Button loading={!organization?.slug} onClick={() => setIsOpen(true)} type="primary">
-          Migrate organization
-        </Button>
+        <Tooltip.Root delayDuration={0}>
+          <Tooltip.Trigger>
+            <Button
+              loading={!organization?.slug}
+              onClick={toggle}
+              type="primary"
+              disabled={!canMigrateOrg || disableOrgBillingMigration}
+            >
+              Migrate organization
+            </Button>
+          </Tooltip.Trigger>
+          {(!canMigrateOrg || disableOrgBillingMigration) && (
+            <Tooltip.Portal>
+              <Tooltip.Content side="bottom">
+                <Tooltip.Arrow className="radix-tooltip-arrow" />
+                <div
+                  className={[
+                    'rounded bg-scale-100 py-1 px-2 leading-none shadow', // background
+                    'border border-scale-200 ', //border
+                  ].join(' ')}
+                >
+                  <span className="text-xs text-scale-1200">
+                    {!canMigrateOrg
+                      ? 'You need additional permissions to migrate this organization'
+                      : 'Migrations are temporarily disabled, please try again later.'}
+                  </span>
+                </div>
+              </Tooltip.Content>
+            </Tooltip.Portal>
+          )}
+        </Tooltip.Root>
       </div>
       <Modal
         closable
@@ -125,48 +158,41 @@ const MigrateOrganizationBillingButton = observer(() => {
         }
       >
         <div className="space-y-4 py-3">
+          {migrationPreviewData?.addons_to_be_removed &&
+            migrationPreviewData.addons_to_be_removed.length > 0 && (
+              <>
+                <Modal.Content>
+                  <div className="space-y-2">
+                    <Alert_Shadcn_ variant="warning">
+                      <IconAlertTriangle strokeWidth={2} />
+                      <AlertTitle_Shadcn_>Project addons will be removed</AlertTitle_Shadcn_>
+                      <AlertDescription_Shadcn_>
+                        <div>
+                          The following project addons will be removed when downgrading
+                          <ul className="list-disc list-inside pl-4">
+                            {migrationPreviewData.addons_to_be_removed.map((addon) =>
+                              addon.addons.map((variant) => (
+                                <li key={`${addon.projectRef}-${variant.variant}`}>
+                                  {variant.type === 'pitr'
+                                    ? 'PITR - '
+                                    : variant.type === 'compute_instance'
+                                    ? 'Compute Instance - '
+                                    : ''}
+                                  {variant.name} for project {addon.projectName || addon.projectRef}
+                                </li>
+                              ))
+                            )}
+                          </ul>
+                        </div>
+                      </AlertDescription_Shadcn_>
+                    </Alert_Shadcn_>
+                  </div>
+                </Modal.Content>
+                <Modal.Separator />
+              </>
+            )}
           <Modal.Content>
-            <div className="space-y-2">
-              <Alert_Shadcn_ variant="destructive">
-                <IconAlertCircle strokeWidth={2} />
-                <AlertTitle_Shadcn_>Irreversible</AlertTitle_Shadcn_>
-                <AlertDescription_Shadcn_>
-                  Once migrated to the new organization-based billing, you cannot go back to the old
-                  project-level billing.
-                </AlertDescription_Shadcn_>
-              </Alert_Shadcn_>
-
-              {migrationPreviewData?.addons_to_be_removed &&
-                migrationPreviewData.addons_to_be_removed.length > 0 && (
-                  <Alert_Shadcn_ variant="warning">
-                    <IconAlertTriangle strokeWidth={2} />
-                    <AlertTitle_Shadcn_>Project addons will be removed</AlertTitle_Shadcn_>
-                    <AlertDescription_Shadcn_>
-                      <div>
-                        The following project addons will be removed when downgrading
-                        <ul className="list-disc list-inside pl-4">
-                          {migrationPreviewData.addons_to_be_removed.map((addon) =>
-                            addon.addons.map((variant) => (
-                              <li key={`${addon.projectRef}-${variant.variant}`}>
-                                {variant.type === 'pitr'
-                                  ? 'PITR - '
-                                  : variant.type === 'compute_instance'
-                                  ? 'Compute Instance - '
-                                  : ''}
-                                {variant.name} for project {addon.projectName || addon.projectRef}
-                              </li>
-                            ))
-                          )}
-                        </ul>
-                      </div>
-                    </AlertDescription_Shadcn_>
-                  </Alert_Shadcn_>
-                )}
-            </div>
-          </Modal.Content>
-          <Modal.Separator />
-          <Modal.Content>
-            <div className="text-scale-1000 text-sm space-y-2">
+            <div className="text-scale-1100 text-sm space-y-2">
               <p>
                 Migrating to new organization-based billing combines subscriptions for all projects
                 in the organization into a single subscription.
@@ -180,7 +206,7 @@ const MigrateOrganizationBillingButton = observer(() => {
                   </a>
                 </Link>
                 . To transfer projects to a different organization, visit{' '}
-                <Link href="/projects/_/settings/general">
+                <Link href="/project/_/settings/general">
                   <a target="_blank" rel="noreferrer" className="underline">
                     General settings
                   </a>
@@ -211,7 +237,7 @@ const MigrateOrganizationBillingButton = observer(() => {
               })}
             </Listbox>
 
-            <p className="text-sm text-scale-1000 mt-4">
+            <p className="text-sm text-scale-1100 mt-4">
               The pricing plan, along with included usage limits will apply to your entire
               organization. See{' '}
               <a
@@ -229,7 +255,7 @@ const MigrateOrganizationBillingButton = observer(() => {
               <div className="my-2 space-y-1 pb-4">
                 <p className="text-sm text-scale-1000">
                   Paid plans come with one compute instance included. Additional projects will at
-                  least cost the compute instance hours used (min $7/month). See{' '}
+                  least cost the compute instance hours used (min $10/month). See{' '}
                   <Link href="https://supabase.com/docs/guides/platform/org-based-billing#usage-based-billing-for-compute">
                     <a target="_blank" rel="noreferrer" className="underline">
                       Compute Instance Usage Billing
@@ -320,7 +346,7 @@ const MigrateOrganizationBillingButton = observer(() => {
             )}
           </Modal.Content>
 
-          {!migrationPreviewIsLoading && migrationPreviewData && dbTier !== 'tier_free' && (
+          {migrationPreviewIsSuccess && dbTier !== 'tier_free' && (
             <Modal.Content>
               <InformationBox
                 defaultVisibility={false}
@@ -389,13 +415,23 @@ const MigrateOrganizationBillingButton = observer(() => {
           )}
 
           <Modal.Content>
+            <p className="mb-4 text-sm text-scale-1100">
+              The migration can take up to 30 seconds, please do not cancel the request or close
+              your browser.
+            </p>
+
             <Button
               block
               size="small"
               type="primary"
               htmlType="submit"
               loading={isMigrating}
-              disabled={migrationPreviewData === undefined || isMigrating || !tier}
+              disabled={
+                migrationPreviewData === undefined ||
+                isMigrating ||
+                !tier ||
+                disableOrgBillingMigration
+              }
               onClick={() => onConfirmMigrate()}
             >
               I understand, migrate this organization
diff --git a/studio/components/interfaces/Organization/GeneralSettings/OrganizationBillingMigrationPanel.tsx b/studio/components/interfaces/Organization/GeneralSettings/OrganizationBillingMigrationPanel.tsx
index 8f8318d574a07..80a75c570dc0f 100644
--- a/studio/components/interfaces/Organization/GeneralSettings/OrganizationBillingMigrationPanel.tsx
+++ b/studio/components/interfaces/Organization/GeneralSettings/OrganizationBillingMigrationPanel.tsx
@@ -23,10 +23,8 @@ const OrganizationBillingMigrationPanel = observer(() => {
             <div className="space-y-2">
               <p className="text-sm text-scale-1100">
                 You will have a single subscription for all projects inside the organization, rather
-                than individual subscriptions per project.
-              </p>
-              <p className="text-sm text-scale-1100">
-                Migrating your organization billing is not reversible.
+                than individual subscriptions per project. Migrating to organization-based billing
+                is not reversible.
               </p>
             </div>
             <div className="flex items-center gap-4 ml-12">
diff --git a/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx b/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx
index 372f9b28b3934..e81f62ed73a19 100644
--- a/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx
+++ b/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx
@@ -23,6 +23,7 @@ import { invalidateOrganizationsQuery } from 'data/organizations/organizations-q
 import { useStore } from 'hooks'
 import { BASE_PATH, PRICING_TIER_LABELS_ORG } from 'lib/constants'
 import { getURL } from 'lib/helpers'
+import { useParams } from 'common'
 
 const ORG_KIND_TYPES = {
   PERSONAL: 'Personal',
@@ -57,6 +58,8 @@ const NewOrgForm = ({ onPaymentMethodReset }: NewOrgFormProps) => {
   const stripe = useStripe()
   const elements = useElements()
 
+  const { plan } = useParams()
+
   const [orgName, setOrgName] = useState('')
   const [orgKind, setOrgKind] = useState(ORG_KIND_DEFAULT)
   const [orgSize, setOrgSize] = useState(ORG_SIZE_DEFAULT)
@@ -64,7 +67,10 @@ const NewOrgForm = ({ onPaymentMethodReset }: NewOrgFormProps) => {
   const [newOrgLoading, setNewOrgLoading] = useState(false)
   const [paymentMethod, setPaymentMethod] = useState<PaymentMethod>()
 
-  const [dbPricingTierKey, setDbPricingTierKey] = useState('FREE')
+  // URL param support for passing plan
+  const [dbPricingTierKey, setDbPricingTierKey] = useState(
+    plan && ['free', 'team', 'pro'].includes(plan) ? plan.toUpperCase() : 'FREE'
+  )
 
   const [showSpendCapHelperModal, setShowSpendCapHelperModal] = useState(false)
   const [isSpendCapEnabled, setIsSpendCapEnabled] = useState(true)
@@ -133,7 +139,7 @@ const NewOrgForm = ({ onPaymentMethodReset }: NewOrgFormProps) => {
         elements,
         redirect: 'if_required',
         confirmParams: {
-          return_url: `${getURL()}/new-with-subscription`,
+          return_url: `${getURL()}/new`,
           expand: ['payment_method'],
         },
       })
diff --git a/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx b/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx
index aa4ac74b78a4b..5d63779c5d2d1 100644
--- a/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx
+++ b/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx
@@ -3,13 +3,13 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { useQueryClient } from '@tanstack/react-query'
 import { useRouter } from 'next/router'
 import { useState } from 'react'
-import { Button, IconPause } from 'ui'
+import { Button, IconPause, Modal } from 'ui'
 
 import {
   useIsProjectActive,
   useProjectContext,
 } from 'components/layouts/ProjectLayout/ProjectContext'
-import ConfirmModal from 'components/ui/Dialogs/ConfirmDialog'
+import ConfirmationModal from 'components/ui/ConfirmationModal'
 import { useProjectPauseMutation } from 'data/projects/project-pause-mutation'
 import { setProjectStatus } from 'data/projects/projects-query'
 import { useCheckPermissions, useStore } from 'hooks'
@@ -86,16 +86,24 @@ const PauseProjectButton = () => {
           </Tooltip.Portal>
         ) : null}
       </Tooltip.Root>
-      <ConfirmModal
+      <ConfirmationModal
         danger
         visible={isModalOpen}
-        title="Pause this project?"
-        description="Are you sure you want to pause this project? It will not be accessible until you unpause it."
+        loading={isPausing}
+        header="Pause this project?"
+        description=""
         buttonLabel="Pause project"
         buttonLoadingLabel="Pausing project"
         onSelectCancel={() => setIsModalOpen(false)}
         onSelectConfirm={requestPauseProject}
-      />
+      >
+        <Modal.Content className="py-4">
+          <p className="text-light text-sm">
+            Are you sure you want to pause this project? It will not be accessible until you unpause
+            it.
+          </p>
+        </Modal.Content>
+      </ConfirmationModal>
     </>
   )
 }
diff --git a/studio/components/interfaces/Settings/General/TransferProjectPanel/TransferProjectButton.tsx b/studio/components/interfaces/Settings/General/TransferProjectPanel/TransferProjectButton.tsx
index b81b8f3f0245e..072b9c83c7991 100644
--- a/studio/components/interfaces/Settings/General/TransferProjectPanel/TransferProjectButton.tsx
+++ b/studio/components/interfaces/Settings/General/TransferProjectPanel/TransferProjectButton.tsx
@@ -18,7 +18,7 @@ import {
 import { useOrganizationsQuery } from 'data/organizations/organizations-query'
 import { useProjectTransferMutation } from 'data/projects/project-transfer-mutation'
 import { useProjectTransferPreviewQuery } from 'data/projects/project-transfer-preview-query'
-import { useCheckPermissions, useSelectedProject, useStore } from 'hooks'
+import { useCheckPermissions, useFlag, useSelectedProject, useStore } from 'hooks'
 
 const TransferProjectButton = () => {
   const { ui } = useStore()
@@ -27,6 +27,7 @@ const TransferProjectButton = () => {
   const projectRef = project?.ref
   const projectOrgId = project?.organization_id
   const { data: allOrganizations } = useOrganizationsQuery()
+  const disableProjectTransfer = useFlag('disableProjectTransfer')
 
   const organizations = (allOrganizations || [])
     .filter((it) => it.id !== projectOrgId)
@@ -87,11 +88,15 @@ const TransferProjectButton = () => {
     <>
       <Tooltip.Root delayDuration={0}>
         <Tooltip.Trigger>
-          <Button onClick={toggle} type="default" disabled={!canTransferProject}>
+          <Button
+            onClick={toggle}
+            type="default"
+            disabled={!canTransferProject || disableProjectTransfer}
+          >
             Transfer project
           </Button>
         </Tooltip.Trigger>
-        {!canTransferProject && (
+        {(!canTransferProject || disableProjectTransfer) && (
           <Tooltip.Portal>
             <Tooltip.Content side="bottom">
               <Tooltip.Arrow className="radix-tooltip-arrow" />
@@ -102,7 +107,9 @@ const TransferProjectButton = () => {
                 ].join(' ')}
               >
                 <span className="text-xs text-scale-1200">
-                  You need additional permissions to transfer this project
+                  {!canTransferProject
+                    ? 'You need additional permissions to transfer this project'
+                    : 'Project transfers are temporarily disabled, please try again later.'}
                 </span>
               </div>
             </Tooltip.Content>
diff --git a/studio/components/interfaces/Storage/CreateBucketModal.tsx b/studio/components/interfaces/Storage/CreateBucketModal.tsx
index abb5cb455967e..6a2129661eaf5 100644
--- a/studio/components/interfaces/Storage/CreateBucketModal.tsx
+++ b/studio/components/interfaces/Storage/CreateBucketModal.tsx
@@ -70,6 +70,9 @@ const CreateBucketModal = ({ visible, onClose }: CreateBucketModalProps) => {
     if (values.has_file_size_limit && values.formatted_size_limit < 0) {
       errors.formatted_size_limit = 'File size upload limit has to be at least 0'
     }
+    if (values.name === 'public') {
+      errors.name = '"public" is a reserved name. Please choose another name'
+    }
     return errors
   }
 
diff --git a/studio/components/interfaces/Support/Support.constants.ts b/studio/components/interfaces/Support/Support.constants.ts
index 3bec483febff9..d5922d09182de 100644
--- a/studio/components/interfaces/Support/Support.constants.ts
+++ b/studio/components/interfaces/Support/Support.constants.ts
@@ -1,48 +1,50 @@
+import { SupportCategories } from '@supabase/shared-types/out/constants'
+
 export const CATEGORY_OPTIONS = [
   {
-    value: 'Problem',
+    value: SupportCategories.PROBLEM,
     label: 'Issues with APIs / client libraries',
     description: "Issues with your project's API and client libraries",
     query: undefined,
   },
   {
-    value: 'Dashboard_bug',
+    value: SupportCategories.DASHBOARD_BUG,
     label: 'Dashboard bug',
     description: 'Issues with the Supabase dashboard',
     query: undefined,
   },
   {
-    value: 'Database_unresponsive',
+    value: SupportCategories.DATABASE_UNRESPONSIVE,
     label: 'Database unresponsive',
     description: 'Issues with connecting to your database',
     query: 'Unable to connect',
   },
   {
-    value: 'Performance',
+    value: SupportCategories.PERFORMANCE_ISSUES,
     label: 'Performance issues',
     description: 'Reporting of performance issues is only available on the Pro plan',
     query: 'Performance',
   },
   {
-    value: 'Sales',
+    value: SupportCategories.SALES_ENQUIRY,
     label: 'Sales enquiry',
     description: 'Questions about pricing, paid plans and Enterprise plans',
     query: undefined,
   },
   {
-    value: 'Billing',
+    value: SupportCategories.BILLING,
     label: 'Billing',
     description: 'Issues with credit card charges | invoices | overcharging',
     query: undefined,
   },
   {
-    value: 'Problem',
+    value: SupportCategories.ABUSE,
     label: 'Abuse report',
     description: 'Report abuse of a Supabase project or Supabase brand',
     query: undefined,
   },
   {
-    value: 'Refund',
+    value: SupportCategories.REFUND,
     label: 'Refund enquiry',
     description: 'Formal enquiry form for requesting refunds',
     query: undefined,
diff --git a/studio/components/layouts/AppLayout/OrganizationDropdown.tsx b/studio/components/layouts/AppLayout/OrganizationDropdown.tsx
index 2108e48d5ace5..eb61f4632196f 100644
--- a/studio/components/layouts/AppLayout/OrganizationDropdown.tsx
+++ b/studio/components/layouts/AppLayout/OrganizationDropdown.tsx
@@ -22,11 +22,10 @@ import {
 import ShimmeringLoader from 'components/ui/ShimmeringLoader'
 import { useOrganizationsQuery } from 'data/organizations/organizations-query'
 import { useOrgSubscriptionQuery } from 'data/subscriptions/org-subscription-query'
-import { useFlag, useSelectedOrganization } from 'hooks'
+import { useSelectedOrganization } from 'hooks'
 
 const OrganizationDropdown = () => {
   const router = useRouter()
-  const orgCreationV2 = useFlag('orgcreationv2')
   const selectedOrganization = useSelectedOrganization()
   const { data: organizations, isLoading: isLoadingOrganizations } = useOrganizationsQuery()
 
@@ -97,13 +96,13 @@ const OrganizationDropdown = () => {
                 </ScrollArea>
               </CommandGroup_Shadcn_>
               <CommandGroup_Shadcn_ className="border-t">
-                <Link passHref href={orgCreationV2 ? `/new-with-subscription` : `/new`}>
+                <Link passHref href="new">
                   <CommandItem_Shadcn_
                     asChild
                     className="cursor-pointer flex items-center space-x-2 w-full"
                     onSelect={(e) => {
                       setOpen(false)
-                      router.push(orgCreationV2 ? `/new-with-subscription` : `/new`)
+                      router.push(`/new`)
                     }}
                     onClick={() => setOpen(false)}
                   >
diff --git a/studio/components/layouts/ProjectLayout/LayoutHeader/OrgDropdown.tsx b/studio/components/layouts/ProjectLayout/LayoutHeader/OrgDropdown.tsx
index f78daf82b4d94..6e17d2db38530 100644
--- a/studio/components/layouts/ProjectLayout/LayoutHeader/OrgDropdown.tsx
+++ b/studio/components/layouts/ProjectLayout/LayoutHeader/OrgDropdown.tsx
@@ -2,7 +2,7 @@ import { toJS } from 'mobx'
 import { useRouter } from 'next/router'
 
 import { useOrganizationsQuery } from 'data/organizations/organizations-query'
-import { useFlag, useSelectedOrganization, useStore } from 'hooks'
+import { useSelectedOrganization, useStore } from 'hooks'
 import { IS_PLATFORM } from 'lib/constants'
 import { Button, Dropdown, IconPlus } from 'ui'
 
@@ -13,8 +13,6 @@ const OrgDropdown = () => {
   const { data: organizations } = useOrganizationsQuery()
   const selectedOrganization = useSelectedOrganization()
 
-  const orgCreationV2 = useFlag('orgcreationv2')
-
   return IS_PLATFORM ? (
     <Dropdown
       side="bottom"
@@ -54,10 +52,7 @@ const OrgDropdown = () => {
             })}
           <Dropdown.Separator />
 
-          <Dropdown.Item
-            icon={<IconPlus size="tiny" />}
-            onClick={() => router.push(orgCreationV2 ? `/new-with-subscription` : `/new`)}
-          >
+          <Dropdown.Item icon={<IconPlus size="tiny" />} onClick={() => router.push(`/new`)}>
             New organization
           </Dropdown.Item>
         </>
diff --git a/studio/components/to-be-cleaned/Dropdown/OrganizationDropdown.js b/studio/components/to-be-cleaned/Dropdown/OrganizationDropdown.js
index f522414b5644b..6dcbcaa358d24 100644
--- a/studio/components/to-be-cleaned/Dropdown/OrganizationDropdown.js
+++ b/studio/components/to-be-cleaned/Dropdown/OrganizationDropdown.js
@@ -1,12 +1,10 @@
 import { useRouter } from 'next/router'
 
-import { useFlag } from 'hooks'
 import { Button, Dropdown, IconPlus } from 'ui'
 import { EMPTY_ARR } from 'lib/void'
 
 const OrganizationDropdown = ({ organizations = EMPTY_ARR }) => {
   const router = useRouter()
-  const orgCreationV2 = useFlag('orgcreationv2')
 
   return (
     <Dropdown
@@ -29,7 +27,7 @@ const OrganizationDropdown = ({ organizations = EMPTY_ARR }) => {
           <Dropdown.Separator />
           <Dropdown.Item
             icon={<IconPlus size="tiny" />}
-            onClick={() => router.push(orgCreationV2 ? `/new-with-subscription` : `/new`)}
+            onClick={() => router.push(`/new`)}
           >
             New organization
           </Dropdown.Item>
diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js b/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js
index 77156adfc8451..dbca2bcaec67f 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js
@@ -1,8 +1,13 @@
+import { useParams } from 'common'
 import { compact, get, isEmpty, uniqBy } from 'lodash'
 import { observer } from 'mobx-react-lite'
 import { useEffect, useRef, useState } from 'react'
 
-import { useParams } from 'common'
+import { useProjectSettingsQuery } from 'data/config/project-settings-query'
+import { useCustomDomainsQuery } from 'data/custom-domains/custom-domains-query'
+import { useStore } from 'hooks'
+import { DEFAULT_PROJECT_API_SERVICE_ID, IS_PLATFORM } from 'lib/constants'
+import { copyToClipboard } from 'lib/helpers'
 import { useStorageStore } from 'localStores/storageExplorer/StorageExplorerStore'
 import { STORAGE_ROW_TYPES } from '../Storage.constants'
 import ConfirmDeleteModal from './ConfirmDeleteModal'
@@ -12,11 +17,6 @@ import FileExplorerHeader from './FileExplorerHeader'
 import FileExplorerHeaderSelection from './FileExplorerHeaderSelection'
 import MoveItemsModal from './MoveItemsModal'
 import PreviewPane from './PreviewPane'
-import { useCustomDomainsQuery } from 'data/custom-domains/custom-domains-query'
-import { useProjectSettingsQuery } from 'data/config/project-settings-query'
-import { DEFAULT_PROJECT_API_SERVICE_ID } from 'lib/constants'
-import { copyToClipboard } from 'lib/helpers'
-import { useStore } from 'hooks'
 
 const StorageExplorer = observer(({ bucket }) => {
   const storageExplorerStore = useStorageStore()
@@ -51,7 +51,10 @@ const StorageExplorer = observer(({ bucket }) => {
 
   const { ui } = useStore()
   const { ref } = useParams()
-  const { data: customDomainData } = useCustomDomainsQuery({ projectRef: ref })
+  const { data: customDomainData } = useCustomDomainsQuery(
+    { projectRef: ref },
+    { enabled: IS_PLATFORM }
+  )
   const { data: projectSettings } = useProjectSettingsQuery({ projectRef: ref })
   const apiService = (projectSettings?.services ?? []).find(
     (x) => x.app.id == DEFAULT_PROJECT_API_SERVICE_ID
diff --git a/studio/components/ui/Dialogs/ConfirmDialog.js b/studio/components/ui/Dialogs/ConfirmDialog.js
index 33e4df18d70ef..bc2302c9376d5 100644
--- a/studio/components/ui/Dialogs/ConfirmDialog.js
+++ b/studio/components/ui/Dialogs/ConfirmDialog.js
@@ -1,8 +1,7 @@
 import { Modal, Button, Form } from 'ui'
 import { useState, useEffect } from 'react'
 
-// [Joshen] As of 280222, let's just use THIS component as the one and only confirmation modal
-// deprecate all others, since it uses the Form component from the UI library as well
+// [Joshen] As of 280222, let's just use ConfirmationModal as the one and only confirmation modal (Deprecate this)
 
 const ConfirmModal = ({
   visible = false,
diff --git a/studio/data/api.d.ts b/studio/data/api.d.ts
index eaeca12f7e9f7..afea4ae331ca7 100644
--- a/studio/data/api.d.ts
+++ b/studio/data/api.d.ts
@@ -97,6 +97,10 @@ export interface paths {
     /** Restore project backup */
     post: operations["BackupsController_restoreBackup"];
   };
+  "/platform/database/{ref}/backups/restore-physical": {
+    /** Restore project with a physical backup */
+    post: operations["BackupsController_restorePhysicalBackup"];
+  };
   "/platform/database/{ref}/backups/pitr": {
     /** Restore project to a previous point in time */
     post: operations["BackupsController_restorePointInTimeBackup"];
@@ -929,6 +933,10 @@ export interface paths {
     /** Restore project backup */
     post: operations["BackupsController_restoreBackup"];
   };
+  "/v0/database/{ref}/backups/restore-physical": {
+    /** Restore project with a physical backup */
+    post: operations["BackupsController_restorePhysicalBackup"];
+  };
   "/v0/database/{ref}/backups/pitr": {
     /** Restore project to a previous point in time */
     post: operations["BackupsController_restorePointInTimeBackup"];
@@ -1573,6 +1581,10 @@ export interface paths {
     /** Create an organization */
     post: operations["OrganizationsController_createOrganization"];
   };
+  "/v1/organizations/{slug}/members": {
+    /** List members of an organization */
+    get: operations["V1OrganizationMembersController_v1ListOrganizationMembers"];
+  };
   "/v1/oauth/authorize": {
     /** Authorize user through oauth */
     get: operations["OAuthController_authorize"];
@@ -1581,6 +1593,14 @@ export interface paths {
     /** Exchange auth code for user's access and refresh token */
     post: operations["OAuthController_token"];
   };
+  "/v1/snippets": {
+    /** Lists SQL snippets for the logged in user */
+    get: operations["SnippetsController_listSnippets"];
+  };
+  "/v1/snippets/{id}": {
+    /** Gets a specific SQL snippet */
+    get: operations["SnippetsController_getSnippet"];
+  };
 }
 
 export type webhooks = Record<string, never>;
@@ -1647,12 +1667,16 @@ export interface components {
       redirectTo?: string;
     };
     ProjectResourceWarningsResponse: {
+      /** @enum {string|null} */
+      disk_io_exhaustion: "critical" | "warning" | null;
+      /** @enum {string|null} */
+      disk_space_exhaustion: "critical" | "warning" | null;
+      /** @enum {string|null} */
+      cpu_exhaustion: "critical" | "warning" | null;
+      /** @enum {string|null} */
+      memory_and_swap_exhaustion: "critical" | "warning" | null;
       project: string;
       is_readonly_mode_enabled: boolean;
-      is_disk_io_budget_below_threshold: boolean;
-      is_disk_space_usage_beyond_threshold: boolean;
-      is_cpu_load_beyond_threshold: boolean;
-      is_memory_and_swap_usage_beyond_threshold: boolean;
     };
     GetGoTrueConfigResponse: {
       SITE_URL: string;
@@ -2064,11 +2088,9 @@ export interface components {
     };
     Backup: {
       id: number;
-      data: Record<string, never>;
+      isPhysicalBackup: boolean;
       project_id: number;
       status: Record<string, never>;
-      s3_path: string;
-      s3_bucket: string;
       inserted_at: string;
     };
     BackupsResponse: {
@@ -2076,6 +2098,7 @@ export interface components {
       tierKey: string;
       region: string;
       walg_enabled: boolean;
+      pitr_enabled: boolean;
       backups: (components["schemas"]["Backup"])[];
       physicalBackupData: {
         earliestPhysicalBackupDateUnix?: number;
@@ -2094,14 +2117,12 @@ export interface components {
     DownloadBackupResponse: {
       fileUrl: string;
     };
-    RestoreBackupBody: {
+    RestoreLogicalBackupBody: {
       id: number;
-      data: Record<string, never>;
-      inserted_at: string;
-      project_id: number;
-      s3_bucket: string;
-      s3_path: string;
-      status: string;
+    };
+    RestorePhysicalBackupBody: {
+      id: number;
+      recovery_time_target: string;
     };
     PointInTimeRestoreBody: {
       recovery_time_target_unix: number;
@@ -4289,6 +4310,12 @@ export interface components {
       entrypoint_path?: string;
       import_map_path?: string;
     };
+    V1OrganizationMemberResponse: {
+      user_id: string;
+      user_name: string;
+      email?: string;
+      role_name: string;
+    };
     OAuthTokenBody: {
       /** @enum {string} */
       grant_type: "authorization_code" | "refresh_token";
@@ -4306,6 +4333,51 @@ export interface components {
       refresh_token: string;
       expires_in: number;
     };
+    SnippetProject: {
+      id: number;
+      name: string;
+    };
+    SnippetUser: {
+      id: number;
+      username: string;
+    };
+    SnippetMeta: {
+      id: string;
+      inserted_at: string;
+      updated_at: string;
+      /** @enum {string} */
+      type: "sql";
+      /** @enum {string} */
+      visibility: "user" | "project" | "org" | "public";
+      name: string;
+      description: string | null;
+      project: components["schemas"]["SnippetProject"];
+      owner: components["schemas"]["SnippetUser"];
+      updated_by: components["schemas"]["SnippetUser"];
+    };
+    SnippetList: {
+      data: (components["schemas"]["SnippetMeta"])[];
+    };
+    SnippetContent: {
+      favorite: boolean;
+      schema_version: string;
+      sql: string;
+    };
+    SnippetResponse: {
+      id: string;
+      inserted_at: string;
+      updated_at: string;
+      /** @enum {string} */
+      type: "sql";
+      /** @enum {string} */
+      visibility: "user" | "project" | "org" | "public";
+      name: string;
+      description: string | null;
+      project: components["schemas"]["SnippetProject"];
+      owner: components["schemas"]["SnippetUser"];
+      updated_by: components["schemas"]["SnippetUser"];
+      content: components["schemas"]["SnippetContent"];
+    };
   };
   responses: never;
   parameters: never;
@@ -4735,7 +4807,7 @@ export interface operations {
     };
     requestBody: {
       content: {
-        "application/json": components["schemas"]["RestoreBackupBody"];
+        "application/json": components["schemas"]["RestoreLogicalBackupBody"];
       };
     };
     responses: {
@@ -4748,6 +4820,29 @@ export interface operations {
       500: never;
     };
   };
+  /** Restore project with a physical backup */
+  BackupsController_restorePhysicalBackup: {
+    parameters: {
+      path: {
+        /** @description Project ref */
+        ref: string;
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["RestorePhysicalBackupBody"];
+      };
+    };
+    responses: {
+      201: {
+        content: {
+          "application/json": Record<string, never>;
+        };
+      };
+      /** @description Failed to restore project with physical backup */
+      500: never;
+    };
+  };
   /** Restore project to a previous point in time */
   BackupsController_restorePointInTimeBackup: {
     parameters: {
@@ -10298,6 +10393,21 @@ export interface operations {
       500: never;
     };
   };
+  /** List members of an organization */
+  V1OrganizationMembersController_v1ListOrganizationMembers: {
+    parameters: {
+      path: {
+        slug: string;
+      };
+    };
+    responses: {
+      200: {
+        content: {
+          "application/json": (components["schemas"]["V1OrganizationMemberResponse"])[];
+        };
+      };
+    };
+  };
   /** Authorize user through oauth */
   OAuthController_authorize: {
     parameters: {
@@ -10305,7 +10415,7 @@ export interface operations {
         client_id: string;
         response_type: "code" | "token" | "id_token token";
         redirect_uri: string;
-        scope: string;
+        scope?: string;
         state?: string;
         response_mode?: string;
         code_challenge?: string;
@@ -10331,4 +10441,38 @@ export interface operations {
       };
     };
   };
+  /** Lists SQL snippets for the logged in user */
+  SnippetsController_listSnippets: {
+    parameters: {
+      query?: {
+        project_ref?: string;
+      };
+    };
+    responses: {
+      200: {
+        content: {
+          "application/json": components["schemas"]["SnippetList"];
+        };
+      };
+      /** @description Failed to list user's SQL snippets */
+      500: never;
+    };
+  };
+  /** Gets a specific SQL snippet */
+  SnippetsController_getSnippet: {
+    parameters: {
+      path: {
+        id: string;
+      };
+    };
+    responses: {
+      200: {
+        content: {
+          "application/json": components["schemas"]["SnippetResponse"];
+        };
+      };
+      /** @description Failed to retrieve SQL snippet */
+      500: never;
+    };
+  };
 }
diff --git a/studio/data/database/backup-restore-mutation.ts b/studio/data/database/backup-restore-mutation.ts
index 983f666be2cd7..991f928a95c5c 100644
--- a/studio/data/database/backup-restore-mutation.ts
+++ b/studio/data/database/backup-restore-mutation.ts
@@ -16,7 +16,7 @@ export type Backup = components['schemas']['Backup']
 export async function restoreFromBackup({ ref, backup }: BackupRestoreVariables) {
   const { data, error } = await post('/platform/database/{ref}/backups/restore', {
     params: { path: { ref } },
-    body: { ...backup, status: backup.status as unknown as string },
+    body: { id: backup.id },
   })
   if (error) throw error
   return data
diff --git a/studio/data/query-client.ts b/studio/data/query-client.ts
index 73cbb94e64b26..eebd40b928db8 100644
--- a/studio/data/query-client.ts
+++ b/studio/data/query-client.ts
@@ -1,6 +1,13 @@
-import { QueryClient } from '@tanstack/react-query'
+import { QueryClient, onlineManager } from '@tanstack/react-query'
+import { IS_PLATFORM } from 'lib/constants'
 import { useState } from 'react'
 
+// When running locally we don't need the internet
+// so we can pretend we're online all the time
+if (!IS_PLATFORM) {
+  onlineManager.setOnline(true)
+}
+
 let queryClient: QueryClient | undefined
 
 export function getQueryClient() {
diff --git a/studio/data/subscriptions/org-subscription-update-mutation.ts b/studio/data/subscriptions/org-subscription-update-mutation.ts
index 0bd336be31786..4e91365c39e53 100644
--- a/studio/data/subscriptions/org-subscription-update-mutation.ts
+++ b/studio/data/subscriptions/org-subscription-update-mutation.ts
@@ -4,6 +4,7 @@ import { API_URL } from 'lib/constants'
 import { toast } from 'react-hot-toast'
 import { ResponseError } from 'types/base'
 import { subscriptionKeys } from './keys'
+import { usageKeys } from 'data/usage/keys'
 
 export type SubscriptionTier =
   | 'tier_free'
@@ -54,7 +55,17 @@ export const useOrgSubscriptionUpdateMutation = ({
     {
       async onSuccess(data, variables, context) {
         const { slug } = variables
-        await queryClient.invalidateQueries(subscriptionKeys.orgSubscription(slug))
+
+        // [Kevin] Backend can return stale data as it's waiting for the Stripe-sync to complete. Until that's solved in the backend
+        // we are going back to monkey here and delay the invalidation
+        await new Promise((resolve) => setTimeout(resolve, 2000))
+
+        await Promise.all([
+          queryClient.invalidateQueries(subscriptionKeys.orgSubscription(slug)),
+          queryClient.invalidateQueries(subscriptionKeys.orgPlans(slug)),
+          queryClient.invalidateQueries(usageKeys.orgUsage(slug)),
+        ])
+
         await onSuccess?.(data, variables, context)
       },
       async onError(data, variables, context) {
diff --git a/studio/package.json b/studio/package.json
index 746b01f965945..e1f5feb0aeca1 100644
--- a/studio/package.json
+++ b/studio/package.json
@@ -35,7 +35,7 @@
     "@supabase/auth-helpers-nextjs": "^0.5.6",
     "@supabase/auth-helpers-react": "^0.3.1",
     "@supabase/react-data-grid": "^7.1.0-beta.7",
-    "@supabase/shared-types": "^0.1.43",
+    "@supabase/shared-types": "^0.1.46",
     "@supabase/supabase-js": "^2.23.0",
     "@tanstack/react-query": "^4.22.0",
     "@tanstack/react-query-devtools": "^4.22.0",
diff --git a/studio/pages/api/storage/[ref]/buckets/index.ts b/studio/pages/api/storage/[ref]/buckets/index.ts
index e426db1810c61..e7a968948d5cb 100644
--- a/studio/pages/api/storage/[ref]/buckets/index.ts
+++ b/studio/pages/api/storage/[ref]/buckets/index.ts
@@ -33,6 +33,13 @@ const handleGet = async (req: NextApiRequest, res: NextApiResponse) => {
 const handlePost = async (req: NextApiRequest, res: NextApiResponse) => {
   const { id, public: isPublicBucket } = req.body
 
+  // To validate bucket name, can be removed once the issue is fixed in supabase lib
+  const regex = /^[a-z0-9.-]+$/
+  if (!regex.test(id)) {
+    return res.status(400).json({ error: { message: 'Bucket name invalid' } })
+  }
+  // Bucket name validation ends here
+
   const { data, error } = await supabase.storage.createBucket(id, { public: isPublicBucket })
   if (error) {
     return res.status(400).json({ error: { message: error.message } })
diff --git a/studio/pages/new-with-subscription.tsx b/studio/pages/new-with-subscription.tsx
deleted file mode 100644
index 3c34a7433cea6..0000000000000
--- a/studio/pages/new-with-subscription.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import HCaptcha from '@hcaptcha/react-hcaptcha'
-import { Elements } from '@stripe/react-stripe-js'
-import { loadStripe } from '@stripe/stripe-js'
-import { useTheme } from 'common'
-import { observer } from 'mobx-react-lite'
-import { useRouter } from 'next/router'
-import { useCallback, useEffect, useState } from 'react'
-
-import { NewOrgForm } from 'components/interfaces/Organization'
-import { WizardLayout } from 'components/layouts'
-import { useSetupIntent } from 'data/stripe/setup-intent-mutation'
-import { useFlag } from 'hooks'
-import { STRIPE_PUBLIC_KEY } from 'lib/constants'
-import { useIsHCaptchaLoaded } from 'stores/hcaptcha-loaded-store'
-import { NextPageWithLayout } from 'types'
-
-const stripePromise = loadStripe(STRIPE_PUBLIC_KEY)
-
-/**
- * No org selected yet, create a new one
- */
-const Wizard: NextPageWithLayout = () => {
-  const router = useRouter()
-  const { isDarkMode } = useTheme()
-
-  const [intent, setIntent] = useState<any>()
-  const captchaLoaded = useIsHCaptchaLoaded()
-
-  const orgCreationV2 = useFlag('orgcreationv2')
-  const [captchaToken, setCaptchaToken] = useState<string | null>(null)
-  const [captchaRef, setCaptchaRef] = useState<HCaptcha | null>(null)
-
-  const { mutate: setupIntent } = useSetupIntent({ onSuccess: (res) => setIntent(res) })
-
-  const captchaRefCallback = useCallback((node) => {
-    setCaptchaRef(node)
-  }, [])
-
-  useEffect(() => {
-    if (orgCreationV2 === false) {
-      router.push('/new')
-    }
-  }, [orgCreationV2])
-
-  const initSetupIntent = async (hcaptchaToken: string | undefined) => {
-    if (!hcaptchaToken) return console.error('Hcaptcha token is required')
-
-    // Force a reload of Elements, necessary for Stripe
-    setIntent(undefined)
-    setupIntent({ hcaptchaToken })
-  }
-
-  const options = {
-    clientSecret: intent ? intent.client_secret : '',
-    appearance: { theme: isDarkMode ? 'night' : 'flat', labels: 'floating' },
-  } as any
-
-  const loadPaymentForm = async () => {
-    if (captchaRef && captchaLoaded) {
-      let token = captchaToken
-
-      try {
-        if (!token) {
-          const captchaResponse = await captchaRef.execute({ async: true })
-          token = captchaResponse?.response ?? null
-        }
-      } catch (error) {
-        return
-      }
-
-      await initSetupIntent(token ?? undefined)
-      resetCaptcha()
-    }
-  }
-
-  useEffect(() => {
-    loadPaymentForm()
-  }, [captchaRef, captchaLoaded])
-
-  const resetSetupIntent = () => {
-    return loadPaymentForm()
-  }
-
-  const onLocalCancel = () => {
-    setIntent(undefined)
-  }
-
-  const resetCaptcha = () => {
-    setCaptchaToken(null)
-    captchaRef?.resetCaptcha()
-  }
-
-  return (
-    <>
-      <HCaptcha
-        ref={captchaRefCallback}
-        sitekey={process.env.NEXT_PUBLIC_HCAPTCHA_SITE_KEY!}
-        size="invisible"
-        onVerify={(token) => {
-          setCaptchaToken(token)
-        }}
-        onClose={onLocalCancel}
-        onExpire={() => {
-          setCaptchaToken(null)
-        }}
-      />
-
-      {intent && (
-        <Elements stripe={stripePromise} options={options}>
-          <NewOrgForm onPaymentMethodReset={() => resetSetupIntent()} />
-        </Elements>
-      )}
-    </>
-  )
-}
-
-Wizard.getLayout = (page) => (
-  <WizardLayout organization={null} project={null}>
-    {page}
-  </WizardLayout>
-)
-
-export default observer(Wizard)
diff --git a/studio/pages/new/[slug].tsx b/studio/pages/new/[slug].tsx
index 962f8ad281fd5..3179618a1d9b4 100644
--- a/studio/pages/new/[slug].tsx
+++ b/studio/pages/new/[slug].tsx
@@ -474,16 +474,24 @@ const Wizard: NextPageWithLayout = () => {
                         <span className="text-brand">{orgSubscription?.plan?.name} plan</span>.
                       </p>
 
+                      {/* Show info when launching a new project in a paid org that has no project yet */}
+                      {orgSubscription?.plan?.id !== 'free' && orgProjectCount === 0 && (
+                        <div>
+                          <p>
+                            As this is the first project you're launching in this organization, it
+                            comes with no additional compute costs.
+                          </p>
+                        </div>
+                      )}
+
                       {/* Show info when launching a new project in a paid org that already has at least one project */}
                       {orgSubscription?.plan?.id !== 'free' && orgProjectCount > 0 && (
                         <div>
                           <p>
                             Launching another project incurs additional compute costs, starting at
-                            $0.01344 per hour (~$10/month).
-                          </p>
-                          <p>
-                            You can also create a new organization under the free plan (unless you
-                            have exceeded your 2 free project limit).
+                            $0.01344 per hour (~$10/month). You can also create a new organization
+                            under the free plan in case you have not exceeded your 2 free project
+                            limit.
                           </p>
                         </div>
                       )}
diff --git a/studio/pages/new/index.tsx b/studio/pages/new/index.tsx
index be52ba18366a7..5a14b15fa9b0b 100644
--- a/studio/pages/new/index.tsx
+++ b/studio/pages/new/index.tsx
@@ -1,161 +1,106 @@
+import HCaptcha from '@hcaptcha/react-hcaptcha'
+import { Elements } from '@stripe/react-stripe-js'
+import { loadStripe } from '@stripe/stripe-js'
+import { useParams, useTheme } from 'common'
 import { observer } from 'mobx-react-lite'
-import { useRouter } from 'next/router'
-import { useState } from 'react'
-import { Button, Input, Listbox } from 'ui'
+import { useCallback, useEffect, useState } from 'react'
 
+import { NewOrgForm } from 'components/interfaces/Organization'
 import { WizardLayout } from 'components/layouts'
-import Panel from 'components/ui/Panel'
-import { useOrganizationCreateMutation } from 'data/organizations/organization-create-mutation'
-import { useStore } from 'hooks'
+import { useSetupIntent } from 'data/stripe/setup-intent-mutation'
+import { STRIPE_PUBLIC_KEY } from 'lib/constants'
+import { useIsHCaptchaLoaded } from 'stores/hcaptcha-loaded-store'
 import { NextPageWithLayout } from 'types'
 
-const ORG_KIND_TYPES = {
-  PERSONAL: 'Personal',
-  EDUCATIONAL: 'Educational',
-  STARTUP: 'Startup',
-  AGENCY: 'Agency',
-  COMPANY: 'Company',
-  UNDISCLOSED: 'N/A',
-}
-const ORG_KIND_DEFAULT = 'PERSONAL'
-
-const ORG_SIZE_TYPES = {
-  '1': '1 - 10',
-  '10': '10 - 49',
-  '50': '50 - 99',
-  '100': '100 - 299',
-  '300': 'More than 300',
-}
-const ORG_SIZE_DEFAULT = '1'
+const stripePromise = loadStripe(STRIPE_PUBLIC_KEY)
 
 /**
  * No org selected yet, create a new one
  */
 const Wizard: NextPageWithLayout = () => {
-  const { ui } = useStore()
-  const router = useRouter()
-
-  const [orgName, setOrgName] = useState('')
-  const [orgKind, setOrgKind] = useState(ORG_KIND_DEFAULT)
-  const [orgSize, setOrgSize] = useState(ORG_SIZE_DEFAULT)
-
-  const { mutate: createOrganization, isLoading: newOrgLoading } = useOrganizationCreateMutation({
-    onSuccess: async (org: any) => {
-      // [Joshen] API spec is wrong? its returning org type as only having id and name
-      router.push(`/new/${org.slug}`)
-    },
-  })
-
-  function validateOrgName(name: any) {
-    return name.length >= 1
-  }
+  const { isDarkMode } = useTheme()
+
+  const [intent, setIntent] = useState<any>()
+  const captchaLoaded = useIsHCaptchaLoaded()
+
+  const [captchaToken, setCaptchaToken] = useState<string | null>(null)
+  const [captchaRef, setCaptchaRef] = useState<HCaptcha | null>(null)
 
-  function onOrgNameChange(e: any) {
-    setOrgName(e.target.value)
+  const { mutate: setupIntent } = useSetupIntent({ onSuccess: (res) => setIntent(res) })
+
+  const captchaRefCallback = useCallback((node) => {
+    setCaptchaRef(node)
+  }, [])
+
+  const initSetupIntent = async (hcaptchaToken: string | undefined) => {
+    if (!hcaptchaToken) return console.error('Hcaptcha token is required')
+
+    // Force a reload of Elements, necessary for Stripe
+    setIntent(undefined)
+    setupIntent({ hcaptchaToken })
   }
 
-  function onOrgKindChange(value: any) {
-    setOrgKind(value)
+  const options = {
+    clientSecret: intent ? intent.client_secret : '',
+    appearance: { theme: isDarkMode ? 'night' : 'flat', labels: 'floating' },
+  } as any
+
+  const loadPaymentForm = async () => {
+    if (captchaRef && captchaLoaded) {
+      let token = captchaToken
+
+      try {
+        if (!token) {
+          const captchaResponse = await captchaRef.execute({ async: true })
+          token = captchaResponse?.response ?? null
+        }
+      } catch (error) {
+        return
+      }
+
+      await initSetupIntent(token ?? undefined)
+      resetCaptcha()
+    }
   }
 
-  function onOrgSizeChange(value: any) {
-    setOrgSize(value)
+  useEffect(() => {
+    loadPaymentForm()
+  }, [captchaRef, captchaLoaded])
+
+  const resetSetupIntent = () => {
+    return loadPaymentForm()
   }
 
-  async function onClickSubmit(e: any) {
-    e.preventDefault()
-    const trimmedOrgName = orgName ? orgName.trim() : ''
-    const isOrgNameValid = validateOrgName(trimmedOrgName)
-    if (!isOrgNameValid) {
-      return ui.setNotification({ category: 'error', message: 'Organization name is empty' })
-    }
+  const onLocalCancel = () => {
+    setIntent(undefined)
+  }
 
-    createOrganization({
-      name: trimmedOrgName,
-      kind: orgKind,
-      ...(orgKind == 'COMPANY' ? { size: orgSize } : {}),
-    })
+  const resetCaptcha = () => {
+    setCaptchaToken(null)
+    captchaRef?.resetCaptcha()
   }
 
   return (
-    <Panel
-      hideHeaderStyling
-      title={
-        <div key="panel-title">
-          <h4>Create a new organization</h4>
-        </div>
-      }
-      footer={
-        <div key="panel-footer" className="flex w-full items-center justify-between">
-          <Button type="default" onClick={() => router.push('/projects')}>
-            Cancel
-          </Button>
-          <div className="flex items-center space-x-3">
-            <p className="text-xs text-scale-900">You can rename your organization later</p>
-            <Button onClick={onClickSubmit} loading={newOrgLoading} disabled={newOrgLoading}>
-              Create organization
-            </Button>
-          </div>
-        </div>
-      }
-    >
-      <Panel.Content className="pt-0">
-        <p className="text-sm">This is your organization within Supabase.</p>
-        <p className="text-sm text-scale-1100">
-          For example, you can use the name of your company or department.
-        </p>
-      </Panel.Content>
-      <Panel.Content className="Form section-block--body has-inputs-centered">
-        <Input
-          autoFocus
-          label="Name"
-          type="text"
-          layout="horizontal"
-          placeholder="Organization name"
-          descriptionText="What's the name of your company or team?"
-          value={orgName}
-          onChange={onOrgNameChange}
-        />
-      </Panel.Content>
-      <Panel.Content className="Form section-block--body has-inputs-centered">
-        <Listbox
-          label="Type of organization"
-          layout="horizontal"
-          value={orgKind}
-          onChange={onOrgKindChange}
-          descriptionText="What would best describe your organization?"
-        >
-          {Object.entries(ORG_KIND_TYPES).map(([k, v]) => {
-            return (
-              <Listbox.Option key={k} label={v} value={k}>
-                {v}
-              </Listbox.Option>
-            )
-          })}
-        </Listbox>
-      </Panel.Content>
-      {orgKind == 'COMPANY' ? (
-        <Panel.Content className="Form section-block--body has-inputs-centered">
-          <Listbox
-            label="Company size"
-            layout="horizontal"
-            value={orgSize}
-            onChange={onOrgSizeChange}
-            descriptionText="How many people are in your company?"
-          >
-            {Object.entries(ORG_SIZE_TYPES).map(([k, v]) => {
-              return (
-                <Listbox.Option key={k} label={v} value={k}>
-                  {v}
-                </Listbox.Option>
-              )
-            })}
-          </Listbox>
-        </Panel.Content>
-      ) : (
-        <></>
+    <>
+      <HCaptcha
+        ref={captchaRefCallback}
+        sitekey={process.env.NEXT_PUBLIC_HCAPTCHA_SITE_KEY!}
+        size="invisible"
+        onVerify={(token) => {
+          setCaptchaToken(token)
+        }}
+        onClose={onLocalCancel}
+        onExpire={() => {
+          setCaptchaToken(null)
+        }}
+      />
+
+      {intent && (
+        <Elements stripe={stripePromise} options={options}>
+          <NewOrgForm onPaymentMethodReset={() => resetSetupIntent()} />
+        </Elements>
       )}
-    </Panel>
+    </>
   )
 }
 
diff --git a/studio/pages/old-org.tsx b/studio/pages/old-org.tsx
new file mode 100644
index 0000000000000..be52ba18366a7
--- /dev/null
+++ b/studio/pages/old-org.tsx
@@ -0,0 +1,168 @@
+import { observer } from 'mobx-react-lite'
+import { useRouter } from 'next/router'
+import { useState } from 'react'
+import { Button, Input, Listbox } from 'ui'
+
+import { WizardLayout } from 'components/layouts'
+import Panel from 'components/ui/Panel'
+import { useOrganizationCreateMutation } from 'data/organizations/organization-create-mutation'
+import { useStore } from 'hooks'
+import { NextPageWithLayout } from 'types'
+
+const ORG_KIND_TYPES = {
+  PERSONAL: 'Personal',
+  EDUCATIONAL: 'Educational',
+  STARTUP: 'Startup',
+  AGENCY: 'Agency',
+  COMPANY: 'Company',
+  UNDISCLOSED: 'N/A',
+}
+const ORG_KIND_DEFAULT = 'PERSONAL'
+
+const ORG_SIZE_TYPES = {
+  '1': '1 - 10',
+  '10': '10 - 49',
+  '50': '50 - 99',
+  '100': '100 - 299',
+  '300': 'More than 300',
+}
+const ORG_SIZE_DEFAULT = '1'
+
+/**
+ * No org selected yet, create a new one
+ */
+const Wizard: NextPageWithLayout = () => {
+  const { ui } = useStore()
+  const router = useRouter()
+
+  const [orgName, setOrgName] = useState('')
+  const [orgKind, setOrgKind] = useState(ORG_KIND_DEFAULT)
+  const [orgSize, setOrgSize] = useState(ORG_SIZE_DEFAULT)
+
+  const { mutate: createOrganization, isLoading: newOrgLoading } = useOrganizationCreateMutation({
+    onSuccess: async (org: any) => {
+      // [Joshen] API spec is wrong? its returning org type as only having id and name
+      router.push(`/new/${org.slug}`)
+    },
+  })
+
+  function validateOrgName(name: any) {
+    return name.length >= 1
+  }
+
+  function onOrgNameChange(e: any) {
+    setOrgName(e.target.value)
+  }
+
+  function onOrgKindChange(value: any) {
+    setOrgKind(value)
+  }
+
+  function onOrgSizeChange(value: any) {
+    setOrgSize(value)
+  }
+
+  async function onClickSubmit(e: any) {
+    e.preventDefault()
+    const trimmedOrgName = orgName ? orgName.trim() : ''
+    const isOrgNameValid = validateOrgName(trimmedOrgName)
+    if (!isOrgNameValid) {
+      return ui.setNotification({ category: 'error', message: 'Organization name is empty' })
+    }
+
+    createOrganization({
+      name: trimmedOrgName,
+      kind: orgKind,
+      ...(orgKind == 'COMPANY' ? { size: orgSize } : {}),
+    })
+  }
+
+  return (
+    <Panel
+      hideHeaderStyling
+      title={
+        <div key="panel-title">
+          <h4>Create a new organization</h4>
+        </div>
+      }
+      footer={
+        <div key="panel-footer" className="flex w-full items-center justify-between">
+          <Button type="default" onClick={() => router.push('/projects')}>
+            Cancel
+          </Button>
+          <div className="flex items-center space-x-3">
+            <p className="text-xs text-scale-900">You can rename your organization later</p>
+            <Button onClick={onClickSubmit} loading={newOrgLoading} disabled={newOrgLoading}>
+              Create organization
+            </Button>
+          </div>
+        </div>
+      }
+    >
+      <Panel.Content className="pt-0">
+        <p className="text-sm">This is your organization within Supabase.</p>
+        <p className="text-sm text-scale-1100">
+          For example, you can use the name of your company or department.
+        </p>
+      </Panel.Content>
+      <Panel.Content className="Form section-block--body has-inputs-centered">
+        <Input
+          autoFocus
+          label="Name"
+          type="text"
+          layout="horizontal"
+          placeholder="Organization name"
+          descriptionText="What's the name of your company or team?"
+          value={orgName}
+          onChange={onOrgNameChange}
+        />
+      </Panel.Content>
+      <Panel.Content className="Form section-block--body has-inputs-centered">
+        <Listbox
+          label="Type of organization"
+          layout="horizontal"
+          value={orgKind}
+          onChange={onOrgKindChange}
+          descriptionText="What would best describe your organization?"
+        >
+          {Object.entries(ORG_KIND_TYPES).map(([k, v]) => {
+            return (
+              <Listbox.Option key={k} label={v} value={k}>
+                {v}
+              </Listbox.Option>
+            )
+          })}
+        </Listbox>
+      </Panel.Content>
+      {orgKind == 'COMPANY' ? (
+        <Panel.Content className="Form section-block--body has-inputs-centered">
+          <Listbox
+            label="Company size"
+            layout="horizontal"
+            value={orgSize}
+            onChange={onOrgSizeChange}
+            descriptionText="How many people are in your company?"
+          >
+            {Object.entries(ORG_SIZE_TYPES).map(([k, v]) => {
+              return (
+                <Listbox.Option key={k} label={v} value={k}>
+                  {v}
+                </Listbox.Option>
+              )
+            })}
+          </Listbox>
+        </Panel.Content>
+      ) : (
+        <></>
+      )}
+    </Panel>
+  )
+}
+
+Wizard.getLayout = (page) => (
+  <WizardLayout organization={null} project={null}>
+    {page}
+  </WizardLayout>
+)
+
+export default observer(Wizard)
diff --git a/studio/pages/org/_/[[...routeSlug]].tsx b/studio/pages/org/_/[[...routeSlug]].tsx
index 65e036ed0379f..b7bec24174a61 100644
--- a/studio/pages/org/_/[[...routeSlug]].tsx
+++ b/studio/pages/org/_/[[...routeSlug]].tsx
@@ -77,7 +77,7 @@ const GenericOrganizationPage: NextPage = () => {
                 </p>
               </div>
               <div>
-                <Link href={`/new`}>
+                <Link href="/new">
                   <a>
                     <Button icon={<IconPlus />}>New organization</Button>
                   </a>