diff --git a/apps/docs/app/guides/database/database-advisors/page.tsx b/apps/docs/app/guides/database/database-advisors/page.tsx
index 987979377ed8d..bba7532c3ded5 100644
--- a/apps/docs/app/guides/database/database-advisors/page.tsx
+++ b/apps/docs/app/guides/database/database-advisors/page.tsx
@@ -2,6 +2,7 @@ import { Octokit } from '@octokit/core'
 import { capitalize } from 'lodash-es'
 import rehypeSlug from 'rehype-slug'
 import { Heading } from 'ui'
+import { Admonition } from 'ui-patterns'
 
 import { GuideTemplate, newEditLink } from '~/features/docs/GuidesMdx.template'
 import { genGuideMeta } from '~/features/docs/GuidesMdx.utils'
@@ -43,7 +44,18 @@ In the dashboard, navigate to [Security Advisor](https://supabase.com/dashboard/
 const getBasename = (path: string) => path.split('/').at(-1)!.replace(/\.md$/, '')
 
 const DatabaseAdvisorDocs = async () => {
-  const { lints, lintsList } = await getLints()
+  let lints: Awaited<ReturnType<typeof getLints>>['lints'] = []
+  let lintsList: Awaited<ReturnType<typeof getLints>>['lintsList'] = []
+  let fetchError: Error | null = null
+
+  try {
+    const data = await getLints()
+    lints = data.lints
+    lintsList = data.lintsList
+  } catch (error) {
+    fetchError = error instanceof Error ? error : new Error('Unknown error fetching advisor docs')
+    console.error('[database-advisors] Failed to fetch advisor docs from GitHub', fetchError)
+  }
 
   const options = {
     mdxOptions: {
@@ -56,19 +68,40 @@ const DatabaseAdvisorDocs = async () => {
     <GuideTemplate meta={meta} editLink={editLink}>
       <MDXRemoteBase source={markdownIntro} />
       <Heading tag="h2">Available checks</Heading>
-      <Tabs listClassNames="flex flex-wrap gap-2 [&>button]:!m-0" queryGroup="lint">
-        {lints.map((lint) => (
-          <TabPanel
-            key={lint.path}
-            id={lint.path}
-            label={capitalize(getBasename(lint.path).replace(/_/g, ' '))}
+
+      {fetchError ? (
+        <Admonition type="note" title="Couldn’t load the full Advisor library">
+          We fetch remediation guides straight from the <code>supabase/splinter</code> repository
+          during the build. GitHub timed out just now, so we’re showing the overview only.
+          <br />
+          <br />
+          You can check back in a few minutes or browse the
+          {` `}
+          <a
+            className="underline decoration-dashed underline-offset-2"
+            href="https://github.com/supabase/splinter/tree/main/docs"
+            target="_blank"
+            rel="noreferrer"
           >
-            <section id={getBasename(lint.path)}>
-              <MDXRemoteBase source={lint.content} options={options} />
-            </section>
-          </TabPanel>
-        ))}
-      </Tabs>
+            latest Markdown on GitHub (opens in a new tab)
+          </a>
+          .
+        </Admonition>
+      ) : (
+        <Tabs listClassNames="flex flex-wrap gap-2 [&>button]:!m-0" queryGroup="lint">
+          {lints.map((lint) => (
+            <TabPanel
+              key={lint.path}
+              id={lint.path}
+              label={capitalize(getBasename(lint.path).replace(/_/g, ' '))}
+            >
+              <section id={getBasename(lint.path)}>
+                <MDXRemoteBase source={lint.content} options={options} />
+              </section>
+            </TabPanel>
+          ))}
+        </Tabs>
+      )}
     </GuideTemplate>
   )
 }
diff --git a/apps/docs/components/MetricsStackCards.tsx b/apps/docs/components/MetricsStackCards.tsx
new file mode 100644
index 0000000000000..19ba4b02edec9
--- /dev/null
+++ b/apps/docs/components/MetricsStackCards.tsx
@@ -0,0 +1,116 @@
+import Link from 'next/link'
+import { Datadog, Grafana } from 'icons'
+import { Flame } from 'lucide-react'
+import type { ReactNode } from 'react'
+
+interface MetricsStackOption {
+  title: string
+  description: ReactNode
+  href: string
+  icon: ReactNode
+  iconColor: string
+  iconBg: string
+  badges: { label: string; variant: 'default' | 'community' }[]
+}
+
+const metricsStackOptions: MetricsStackOption[] = [
+  {
+    title: 'Grafana Cloud (SaaS)',
+    description: (
+      <>
+        Use Grafana Cloud’s managed Prometheus (works on Free + Pro tiers) and import the Supabase
+        dashboard without running any infrastructure.
+      </>
+    ),
+    href: '/guides/telemetry/metrics/grafana-cloud',
+    icon: <Grafana className="h-5 w-5" />,
+    iconColor: '#F05A28',
+    iconBg: 'rgba(240,90,40,0.1)',
+    badges: [
+      { label: 'Supabase guide', variant: 'default' },
+      { label: 'Community', variant: 'community' },
+    ],
+  },
+  {
+    title: 'Grafana + self-hosted Prometheus',
+    description: (
+      <>
+        Run Prometheus yourself following the official installation guidance and pair it with
+        Grafana plus our dashboard JSON and alert pack.
+      </>
+    ),
+    href: '/guides/telemetry/metrics/grafana-self-hosted',
+    icon: <Grafana className="h-5 w-5" />,
+    iconColor: '#F05A28',
+    iconBg: 'rgba(240,90,40,0.1)',
+    badges: [{ label: 'Supabase guide', variant: 'default' }],
+  },
+  {
+    title: 'Datadog',
+    description: (
+      <>
+        Scrape the Metrics API with the Datadog Agent or Prometheus remote write and monitor
+        Supabase alongside your app telemetry.
+      </>
+    ),
+    href: '/guides/telemetry/metrics/datadog',
+    icon: <Datadog className="h-5 w-5" />,
+    iconColor: '#632CA6',
+    iconBg: 'rgba(99,44,166,0.1)',
+    badges: [
+      { label: 'Supabase guide', variant: 'default' },
+      { label: 'Community', variant: 'community' },
+    ],
+  },
+  {
+    title: 'Vendor-agnostic / BYO Prometheus',
+    description: (
+      <>
+        Connect AWS AMP, Grafana Mimir, VictoriaMetrics, or any Prometheus-compatible SaaS with the
+        same scrape job pattern.
+      </>
+    ),
+    href: '/guides/telemetry/metrics/vendor-agnostic',
+    icon: <Flame className="h-5 w-5" strokeWidth={1.5} />,
+    iconColor: '#0BA678',
+    iconBg: 'rgba(11,166,120,0.1)',
+    badges: [{ label: 'Supabase guide', variant: 'default' }],
+  },
+]
+
+export function MetricsStackCards() {
+  return (
+    <div className="grid gap-4 not-prose md:grid-cols-2">
+      {metricsStackOptions.map((option) => (
+        <Link key={option.href} href={option.href} className="col-span-1 block h-full">
+          <div className="relative flex h-full flex-col gap-4 rounded-2xl border border-foreground/10 bg-surface-75/50 p-5 text-left transition duration-200 hover:border-foreground/30 hover:bg-surface-100">
+            <div className="flex items-center gap-3">
+              <span
+                className="flex h-10 w-10 items-center justify-center rounded-full text-base font-semibold"
+                style={{ color: option.iconColor, backgroundColor: option.iconBg }}
+              >
+                {option.icon}
+              </span>
+              <p className="text-base font-medium text-foreground">{option.title}</p>
+            </div>
+            <div className="text-sm text-foreground-light">{option.description}</div>
+            <div className="mt-auto flex flex-wrap gap-2">
+              {option.badges.map((badge) => (
+                <span
+                  key={`${option.href}-${badge.label}`}
+                  className={`inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-medium ${
+                    badge.variant === 'community'
+                      ? 'border-warning/40 text-warning'
+                      : 'border-brand-500/50 text-brand'
+                  }`}
+                >
+                  {badge.label}
+                </span>
+              ))}
+            </div>
+          </div>
+        </Link>
+      ))}
+    </div>
+  )
+}
diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
index 92037e9c9c108..50330ec471144 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
@@ -2754,6 +2754,28 @@ export const telemetry: NavMenuConstant = {
         {
           name: 'Metrics',
           url: '/guides/telemetry/metrics' as `/${string}`,
+          items: [
+            {
+              name: 'Overview',
+              url: '/guides/telemetry/metrics' as `/${string}`,
+            },
+            {
+              name: 'Grafana Cloud',
+              url: '/guides/telemetry/metrics/grafana-cloud' as `/${string}`,
+            },
+            {
+              name: 'Grafana self-hosted',
+              url: '/guides/telemetry/metrics/grafana-self-hosted' as `/${string}`,
+            },
+            {
+              name: 'Datadog',
+              url: '/guides/telemetry/metrics/datadog' as `/${string}`,
+            },
+            {
+              name: 'Vendor-agnostic setup',
+              url: '/guides/telemetry/metrics/vendor-agnostic' as `/${string}`,
+            },
+          ],
         },
         {
           name: 'Sentry integration',
@@ -2929,22 +2951,25 @@ export const integrations: NavMenuConstant = {
     },
     {
       name: 'Build Your Own',
-      url: undefined,
       items: [
         {
-          name: 'Build a Supabase integration',
-          url: '/guides/integrations/build-a-supabase-integration',
+          name: 'Supabase OAuth Integration',
+          url: '/guides/integrations/build-a-supabase-oauth-integration',
           items: [
             {
               name: 'Overview',
-              url: '/guides/integrations/build-a-supabase-integration' as `/${string}`,
+              url: '/guides/integrations/build-a-supabase-oauth-integration',
             },
             {
               name: 'OAuth scopes',
-              url: '/guides/integrations/build-a-supabase-integration/oauth-scopes' as `/${string}`,
+              url: '/guides/integrations/build-a-supabase-oauth-integration/oauth-scopes',
             },
           ],
         },
+        {
+          name: 'Supabase for Platforms',
+          url: '/guides/integrations/supabase-for-platforms',
+        },
       ],
     },
     { name: 'Integrations', url: undefined, items: [] },
diff --git a/apps/docs/content/_partials/metrics_access.mdx b/apps/docs/content/_partials/metrics_access.mdx
new file mode 100644
index 0000000000000..5f89bdef5706b
--- /dev/null
+++ b/apps/docs/content/_partials/metrics_access.mdx
@@ -0,0 +1,50 @@
+<Accordion
+  type="default"
+  openBehaviour="multiple"
+  chevronAlign="right"
+  justified
+  size="medium"
+  className="text-foreground-light mt-8 mb-6 [&>div]:space-y-4"
+>
+
+<AccordionItem
+header={<span className="text-foreground">What you can do with the Metrics API</span>}
+id="how-do-i-check-when-a-user-went-through-mfa"
+>
+
+Every Supabase project exposes a metrics feed at `https://<project-ref>.supabase.co/customer/v1/privileged/metrics`. Replace `<project-ref>` with the identifier from your project URL or from the dashboard sidebar.
+
+1. Copy your project reference and confirm the base URL using the helper below.
+
+   <ProjectConfigVariables variable="url" />
+
+2. Configure your collector to scrape once per minute. The endpoint already emits the full set of metrics on each request.
+3. Authenticate with HTTP Basic Auth:
+
+   - **Username**: `service_role`
+   - **Password**: a service role secret (JWT) from [**Project Settings > JWT** (opens in a new tab)](/dashboard/project/_/settings/jwt) or any other Secret API key from [**Project Settings > API keys** (opens in a new tab)](/dashboard/project/_/settings/api-keys)
+
+Testing locally is as simple as running `curl` with your service role secret:
+
+```bash
+curl <project-url>/customer/v1/privileged/metrics \
+    --user 'service_role:sb_secret_...'
+```
+
+You can provision long-lived automation tokens in two ways:
+
+- Create an account access token once at [**Account Settings > Access Tokens (opens in a new tab)**](/dashboard/account/tokens) and reuse it wherever you configure observability tooling.
+- **Optional**: programmatically exchange an access token for project API keys via the [Management API ](/docs/reference/api/management-projects-api-keys-retrieve').
+
+```bash
+# (Optional) Exchange an account access token for project API keys
+export SUPABASE_ACCESS_TOKEN="your-access-token"
+export PROJECT_REF="your-project-ref"
+
+curl -H "Authorization: Bearer $SUPABASE_ACCESS_TOKEN" \
+    "https://api.supabase.com/v1/projects/$PROJECT_REF/api-keys?reveal=true"
+```
+
+</AccordionItem>
+
+</Accordion>
diff --git a/apps/docs/content/guides/integrations/build-a-supabase-integration.mdx b/apps/docs/content/guides/integrations/build-a-supabase-oauth-integration.mdx
similarity index 99%
rename from apps/docs/content/guides/integrations/build-a-supabase-integration.mdx
rename to apps/docs/content/guides/integrations/build-a-supabase-oauth-integration.mdx
index 29b785b1e698c..fae9d946305b0 100644
--- a/apps/docs/content/guides/integrations/build-a-supabase-integration.mdx
+++ b/apps/docs/content/guides/integrations/build-a-supabase-oauth-integration.mdx
@@ -1,5 +1,5 @@
 ---
-id: 'build-a-supabase-integration'
+id: 'build-a-supabase-oauth-integration'
 title: 'Build a Supabase Integration'
 subtitle: "This guide steps through building a Supabase Integration using OAuth2 and the management API, allowing you to manage users' organizations and projects on their behalf."
 description: 'Build a Supabase Integration using OAuth2 and the Management API.'
diff --git a/apps/docs/content/guides/integrations/build-a-supabase-integration/oauth-scopes.mdx b/apps/docs/content/guides/integrations/build-a-supabase-oauth-integration/oauth-scopes.mdx
similarity index 100%
rename from apps/docs/content/guides/integrations/build-a-supabase-integration/oauth-scopes.mdx
rename to apps/docs/content/guides/integrations/build-a-supabase-oauth-integration/oauth-scopes.mdx
diff --git a/apps/docs/content/guides/integrations/supabase-for-platforms.mdx b/apps/docs/content/guides/integrations/supabase-for-platforms.mdx
new file mode 100644
index 0000000000000..afed634e90b51
--- /dev/null
+++ b/apps/docs/content/guides/integrations/supabase-for-platforms.mdx
@@ -0,0 +1,446 @@
+---
+id: 'supabase-for-platform'
+title: 'Supabase for Platforms'
+description: 'Use Supabase as a platform for your own business and tools.'
+subtitle: 'Use Supabase as a platform for your own business and tools.'
+---
+
+Supabase is a [Platform as a Service](https://en.wikipedia.org/wiki/Platform_as_a_service) (PaaS) that can be managed programmatically. You can use it to offer the key primitives to your own users, such as [Database](/docs/guides/database/overview), [Auth](/docs/guides/auth), [Edge Functions](/docs/guides/functions), [Storage](/docs/guides/storage), and [Realtime](/docs/guides/realtime). Supabase is commonly used as a platform by AI Builders and frameworks needing a backend.
+
+This document will guide you on best practices when using Supabase for your own platform and assumes that Supabase projects are in a Supabase organization that you own. If you want to instead interact with projects that your users own, navigate to [OAuth integration](/docs/guides/integrations/build-a-supabase-oauth-integration) for more details.
+
+![Platform as a Service](/docs/img/integrations/paas-intro.png)
+
+## Overview
+
+All features of Supabase can be managed through the [Management API](/docs/reference/api/introduction) or the [remote MCP Server](/docs/guides/getting-started/mcp).
+
+## Launching projects
+
+Management API endpoints:
+
+- Create project: [`POST /v1/projects`](https://api.supabase.com/api/v1#tag/projects/post/v1/projects)
+- Get smart region selection codes: [`GET /v1/projects/available-regions`](https://api.supabase.com/api/v1#tag/projects/get/v1/projects/available-regions)
+- Check service health: [`GET /v1/projects/{ref}/health`](https://api.supabase.com/api/v1#tag/projects/get/v1/projects/{ref}/health)
+
+We recommend:
+
+- **a _very_ secure password for each database**. Do not reuse the same password across databases.
+- **storing the encrypted version of the password**. Once you set the password during project creation, there is no way to programmatically change the password but you can do so manually in the Supabase Dashboard.
+- **using smart region selection to ensure there's enough capacity**. The available smart region codes are `americas`, `emea`, and `apac` and you can make a request to [`GET /v1/projects/available-regions`](https://api.supabase.com/api/v1#tag/projects/get/v1/projects/available-regions) for region details.
+- **make sure that the services are `ACTIVE_HEALTHY` after project creation**. After creating project, confirm the service that you want to make a request to has a status of `ACTIVE_HEALTHY` by polling [`GET /v1/projects/{ref}/health`](https://api.supabase.com/api/v1#tag/projects/get/v1/projects/{ref}/health). For example, before making a request to set an Auth configuration confirm that the Auth service has a status of `ACTIVE_HEALTHY`.
+
+```sh
+curl https://api.supabase.com/v1/projects \
+  --request POST \
+  --header "Content-Type: application/json" \
+  --header "Authorization: Bearer YOUR_SECRET_TOKEN" \
+  --data '{
+    "name": "Todo App",
+    "organization_slug": "aaaabbbbccccddddeeee",
+    "db_pass": "SUPER_SECURE_PASSWORD",
+    "region_selection": {
+      "type": "smartGroup",
+      "code": "americas"
+    },
+    "desired_instance_size": "micro"
+  }'
+```
+
+### Pico compute instance
+
+<Admonition type='note' title='Contact us for access to Pico instances'>
+  
+Only select customers have access to Pico instances. Submit this [form](/solutions/ai-builders#talk-to-partnerships-team) to get access.
+
+</Admonition>
+
+Pico instance is our newest compute instance and the only one that scales to zero when not used.
+
+### Recommended API keys
+
+Management API endpoints:
+
+- Get the API keys: [`GET /v1/projects/{ref}/api-keys`](https://api.supabase.com/api/v1#tag/secrets/get/v1/projects/{ref}/api-keys)
+- Enable the API keys: [`POST /v1/projects/{ref}/api-keys`](https://api.supabase.com/api/v1#tag/secrets/post/v1/projects/{ref}/api-keys)
+
+<Admonition type='note'>
+
+We are in the process of migrating away from our legacy API keys `anon` and `service_role` and towards API keys `publishable` and `secret`.
+
+You can learn more by navigating to [Upcoming changes to Supabase API Keys #29260](https://github.com/orgs/supabase/discussions/29260).
+
+</Admonition>
+
+Get the API keys by making a [`GET /v1/projects/{ref}/api-keys`](https://api.supabase.com/api/v1#tag/secrets/get/v1/projects/{ref}/api-keys) request.
+
+```sh
+curl 'https://api.supabase.com/v1/projects/{ref}/api-keys?reveal=true' \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN'
+```
+
+If the response includes `"publishable"` and `"secret"` keys then you're all set and you should only use those from now on.
+
+Otherwise, enable the API keys by making two [`POST /v1/projects/{ref}/api-keys`](https://api.supabase.com/api/v1#tag/secrets/post/v1/projects/{ref}/api-keys) requests, one for `publishable` and another for `secret`.
+
+```sh
+curl 'https://api.supabase.com/v1/projects/{ref}/api-keys' \
+  --request POST \
+  --header 'Content-Type: application/json' \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --data '{
+  "type": "publishable",
+  "name": "default"
+}'
+```
+
+```sh
+curl 'https://api.supabase.com/v1/projects/{ref}/api-keys?reveal=true' \
+  --request POST \
+  --header 'Content-Type: application/json' \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --data '{
+  "type": "secret",
+  "name": "default",
+  "secret_jwt_template": {
+    "role": "service_role"
+  }
+}'
+```
+
+## Changing compute sizes
+
+Management API endpoint: [`PATCH /v1/projects/{ref}/billing/addons`](https://api.supabase.com/api/v1#tag/billing/patch/v1/projects/{ref}/billing/addons)
+
+<Admonition type='note'>
+
+Once you have access to [Pico instances](#pico-compute-instance), you will no longer be able to upgrade or downgrade to Nano instances.
+
+</Admonition>
+
+You can upgrade and downgrade compute sizes by making requests to [`PATCH /v1/projects/{ref}/billing/addons`](https://api.supabase.com/api/v1#tag/billing/patch/v1/projects/{ref}/billing/addons).
+
+```sh
+curl 'https://api.supabase.com/v1/projects/{ref}/billing/addons' \
+  --request PATCH \
+  --header 'Content-Type: application/json' \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --data '{
+    "addon_type": "compute_instance",
+    "addon_variant": "ci_small"
+  }'
+```
+
+## Configuration changes
+
+Management API endpoints:
+
+- Auth: [`PATCH /v1/projects/{ref}/config/auth`](https://api.supabase.com/api/v1#tag/auth/patch/v1/projects/{ref}/config/auth)
+- Data API (PostgREST): [`PATCH /v1/projects/{ref}/postgrest`](https://api.supabase.com/api/v1#tag/rest/patch/v1/projects/{ref}/postgrest)
+- Edge Functions:
+  - [`PATCH /v1/projects/{ref}/functions/{function_slug}`](https://api.supabase.com/api/v1#tag/edge-functions/patch/v1/projects/{ref}/functions/{function_slug})
+  - [`PUT /v1/projects/{ref}/functions`](https://api.supabase.com/api/v1#tag/edge-functions/put/v1/projects/{ref}/functions)
+- Storage: [`PATCH /v1/projects/{ref}/config/storage`](https://api.supabase.com/api/v1#tag/storage/patch/v1/projects/{ref}/config/storage)
+- Realtime: [`PATCH /v1/projects/{ref}/config/realtime`](https://api.supabase.com/api/v1#tag/realtime-config/patch/v1/projects/{ref}/config/realtime)
+
+You can manage the configuration of all services using the Management API.
+
+## Development workflow
+
+Supabase is a _stateful_ service: we store data. If anything breaks in production, you can't "roll back" to a point in time because doing so might cause your users to lose any data that their production environment received since the last checkpoint.
+
+Because of this, it's important that you adopt a development workflow on behalf of your users:
+
+![Change flow](/docs/img/integrations/change-flow.png)
+
+### Creating a `DEV` branch
+
+Management API endpoint: [`POST /v1/projects/{ref}/branches`](https://api.supabase.com/api/v1#tag/environments/post/v1/projects/{ref}/branches)
+
+After launching a project, it's important that all changes happen on a development branch. Branches can be treated like ephemeral servers: if anything goes wrong you can either revert the changes or destroy the branch and create a new one based off of production.
+
+```sh
+curl 'https://api.supabase.com/v1/projects/{ref}/branches' \
+  --request POST \
+  --header 'Content-Type: application/json' \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --data '{
+    "branch_name": "DEV",
+    "secrets": {
+      "STRIPE_SECRET_KEY":"sk_test_123..."
+      "STRIPE_PUBLISHABLE_KEY":"pk_test_123..."
+    }
+  }'
+```
+
+### Make database changes
+
+Management API endpoint: [`POST /v1/projects/{ref}/database/migrations`](https://api.supabase.com/api/v1#tag/database/post/v1/projects/{ref}/database/migrations)
+
+<Admonition type='note' title='Contact us for access to migrations endpoint'>
+  
+Only select customers have access to database migrations endpoint. Submit this [form](/solutions/ai-builders#talk-to-partnerships-team) to get access.
+
+</Admonition>
+
+For this example we will create a todos table using the [`POST /v1/projects/{ref}/database/migrations`](https://api.supabase.com/api/v1#tag/database/post/v1/projects/{ref}/database/migrations) endpoint.
+
+```sql
+create table public.todos (
+  id serial primary key,
+  task text not null
+);
+
+alter table public.todos
+enable row level security;
+```
+
+This endpoint will automatically create a migration inside the `supabase_migrations` schema and run the migration. If the schema migration fails, the changes will be rolled back.
+
+```sh
+curl https://api.supabase.com/v1/projects/{ref}/database/migrations \
+  --request POST \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --header 'Content-Type: application/json' \
+  --data '{
+    "query": "create table public.todos (id serial primary key, task text not null); alter table public.todos enable row level security;",
+    "name": "Create a todos table"
+  }'
+```
+
+### Create a restore point
+
+<Admonition type="note" title="Contact us for access to restore points">
+
+Only select customers have access to restore points. Submit this [form](/solutions/ai-builders#talk-to-partnerships-team) to get access.
+
+</Admonition>
+
+After every change you make to the database, it's a good idea to create a restore point. This will allow you to roll back the database if you decide to go in a different direction.
+
+Beware that only database changes are captured when creating a restore point.
+
+```sh
+curl https://api.supabase.com/v1/projects/{ref}/database/backups/restore-point \
+  --request POST \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --header 'Content-Type: application/json' \
+  --data '{
+    "name": "abcdefg"
+  }'
+```
+
+### Reverting changes
+
+![Revert](/docs/img/integrations/revert.png)
+
+<Admonition type="note" title="Contact us for access to restore points">
+
+Only select customers have access to restore points. Submit this [form](/solutions/ai-builders#talk-to-partnerships-team) to get access.
+
+</Admonition>
+
+After creating restore points, you are able to revert back to any restore point that you want.
+
+```sh
+curl https://api.supabase.com/v1/projects/{ref}/database/backups/undo \
+  --request POST \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --header 'Content-Type: application/json' \
+  --data '{
+  "name": "abcdefg"
+}'
+```
+
+When you revert changes, you are undo-ing all database changes since the specified restore point, including:
+
+- Schema changes
+- Any seed data that you inserted
+- Any test users who have signed up (and auth tokens for sign ins)
+- Pointers to files in Supabase Storage.
+
+It will not affect:
+
+- Configuration changes
+- Any secrets that have been added
+- Storage objects themselves
+- Any deployed Edge Functions
+
+### Add seed data
+
+<Admonition type="caution" title="Do not use production data in branches!">
+
+It's important that the data in development branches is NOT production data, especially for non-developers who don't understand the implications of working with data. Security and side-effects (e.g. emailing all production users) are two reasons why this is important.
+
+</Admonition>
+
+It's common in `DEV` branches to "seed" data. This is basically test data for users. Let's insert the following seed to our new todos table:
+
+```sql
+insert into todos (task)
+values
+  ('Task 1'),
+  ('Task 2'),
+  ('Task 3');
+```
+
+You can use the `POST /database/query` endpoint to add data:
+
+```sh
+curl https://api.supabase.com/v1/projects/{branch_ref}/database/query \
+  --request POST \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --header 'Content-Type: application/json' \
+  --data-binary @- <<EOF
+{
+  "query": "insert into todos (task) values ('Task 1'), ('Task 2'), ('Task 3');"
+}
+EOF
+```
+
+### Deploying Edge Functions
+
+You can create and deploy Edge Functions on a branch and then merge them into Production.
+
+![Deploy Edge Functions](/docs/img/integrations/change-functions.png)
+
+```sh
+curl https://api.supabase.com/v1/projects/functions/deploy \
+  --request POST \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --header 'Content-Type: multipart/form-data' \
+  --form 'file=@path/to/function.zip' \
+  --form 'metadata={
+    "name": "my-function",
+    "entrypoint_path": "index.ts",
+    "import_map_path": "import_map.json",
+    "static_patterns": ["assets/*", "public/*"],
+    "verify_jwt": true
+  }'
+```
+
+### Merge all changes
+
+Management API endpoint: [`POST /v1/branches/{branch_id_or_ref}/merge`](https://api.supabase.com/api/v1#tag/environments/post/v1/branches/{branch_id_or_ref}/merge)
+
+Once the changes have been made, you can merge the changes into the production project:
+
+```sh
+curl https://api.supabase.com/v1/branches/{ref}/merge \
+  --request POST \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --header 'Content-Type: application/json' \
+  --data '{}'
+```
+
+Merging changes will automatically merge only the following:
+
+- Database changes
+- Deployed Edge Functions
+
+## Security checks for production
+
+Management API endpoint: [`GET /v1/projects/{ref}/advisors/security`](https://api.supabase.com/api/v1#tag/advisors/get/v1/projects/{ref}/advisors/security)
+
+Prior to deploying to production we strongly recommend running the security advisor on the project to make sure the latest changes are secure.
+
+```sh
+curl https://api.supabase.com/v1/projects/{ref}/advisors/security \
+  --request GET \
+  --header  'Authorization: Bearer {PAT_OR_USER_TOKEN}' \
+  --header 'Content-Type: application/json'
+```
+
+## Disaster recovery for production
+
+Management API endpoint: [`POST /v1/projects/{ref}/database/backups/restore-pitr`](https://api.supabase.com/api/v1#tag/database/post/v1/projects/{ref}/database/backups/restore-pitr)
+
+![Rollback](/docs/img/integrations/rollback.png)
+
+- Rollbacks can cause data loss. Only use it in `PROD` when absolutely necessary.
+- Only available in prod when a project has already explicitly enabled PITR prior to rolling back.
+
+```sh
+curl https://api.supabase.com/v1/projects/database/backups/restore-pitr \
+  --request POST \
+  --header 'Authorization: Bearer {PAT_OR_USER_TOKEN}' \
+  --header 'Content-Type: application/json' \
+  --data '{
+  "recovery_time_target_unix": 1
+}'
+```
+
+## Claim flow
+
+Management API endpoint: [`GET /v1/oauth/authorize/project-claim`](https://api.supabase.com/api/v1#tag/oauth/get/v1/oauth/authorize/project-claim)
+
+<Admonition type="note" title="Contact us for access to claim flow">
+
+Only select customers have access to claim flow. Submit this [form](/solutions/ai-builders#talk-to-partnerships-team) to get access.
+
+</Admonition>
+
+Your users may want to claim the project that currently lives in your org so that they can have more control over it.
+
+We've enabled transferring the project from your org to your user's org while you continue to retain access to interact with the project through an [OAuth integration](/docs/guides/integrations/build-a-supabase-oauth-integration).
+
+```sh
+curl -L "https://api.supabase.com/v1/oauth/authorize/project-claim?project_ref={ref}&client_id={oauth_client_id}&response_type=code&redirect_uri={redirect_uri}" \
+  --request GET \
+  --header 'Authorization: Bearer {PERSONAL_ACCESS_TOKEN}'
+```
+
+The user is redirected to a Supabase UI:
+
+1.  Create a new Supabase account or sign in to an existing one
+2.  Create a new Supabase Organization or select an existing one
+3.  Review your OAuth integration's permission scopes
+4.  Review the Project transfer details
+5.  Confirm the OAuth integration and the Project transfer for the selected Organization
+
+<Admonition type="caution" title="Remove custom configuration before transferring project">
+
+Before transferring the project to your user's org, make sure to remove any custom configuration that you do not want your user's project to retain.
+
+</Admonition>
+
+## Platform kit
+
+Docs: https://supabase.com/ui/docs/platform/platform-kit
+
+<div className="video-container mb-8">
+  <iframe
+    className="w-full"
+    src="https://xguihxuzqibwxjnimxev.supabase.co/storage/v1/object/public/videos/marketing/blog/platform-kit/platform-kit.mp4"
+    title="Supabase UI: Platform Kit"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; fullscreen; gyroscope; picture-in-picture; web-share"
+    allowfullscreen
+    autoplay
+    muted
+    loop
+    playsInline
+  />
+</div>
+
+We've created Platform Kit, a collection of UI components that interact with Management API, as a lightweight version of Supabase Dashboard that you can embed directly in your app so your users never have to leave in order to interact with the project.
+
+## Debugging projects
+
+Management API endpoint: [`GET /v1/projects/{ref}/analytics/endpoints/logs.all`](https://api.supabase.com/api/v1#tag/analytics/get/v1/projects/{ref}/analytics/endpoints/logs.all)
+
+When you need to debug a project, you can query the project's logs to see if there are any errors and address them accordingly.
+
+```sh
+curl 'https://api.supabase.com/v1/projects/{ref}/analytics/endpoints/logs.all' \
+  --get \
+  --header 'Authorization: Bearer YOUR_SECRET_TOKEN' \
+  --data-urlencode 'sql=SELECT datetime(timestamp), status_code, path, event_message
+    FROM edge_logs
+    CROSS JOIN UNNEST(metadata) AS metadata
+    CROSS JOIN UNNEST(response) AS response
+    WHERE status_code >= 400
+    ORDER BY timestamp DESC
+    LIMIT 100' \
+  --data-urlencode 'iso_timestamp_start=2025-03-23T00:00:00Z' \
+  --data-urlencode 'iso_timestamp_end=2025-03-23T01:00:00Z'
+```
diff --git a/apps/docs/content/guides/realtime/subscribing-to-database-changes.mdx b/apps/docs/content/guides/realtime/subscribing-to-database-changes.mdx
index 0ac4f710a61cb..9984e94d6c229 100644
--- a/apps/docs/content/guides/realtime/subscribing-to-database-changes.mdx
+++ b/apps/docs/content/guides/realtime/subscribing-to-database-changes.mdx
@@ -41,7 +41,7 @@ language plpgsql
 as $$
 begin
   perform realtime.broadcast_changes(
-    'topic:' || coalesce(NEW.topic, OLD.topic) ::text, -- topic - the topic to which we're broadcasting
+    'topic:' || coalesce(NEW.id, OLD.id) ::text,       -- topic - the topic to which you're broadcasting where you can use the topic id to build the topic name
     TG_OP,                                             -- event - the event that triggered the function
     TG_OP,                                             -- operation - the operation that triggered the function
     TG_TABLE_NAME,                                     -- table - the table that caused the trigger
diff --git a/apps/docs/content/guides/telemetry/metrics.mdx b/apps/docs/content/guides/telemetry/metrics.mdx
index 56644bbc25251..5b37052a60161 100644
--- a/apps/docs/content/guides/telemetry/metrics.mdx
+++ b/apps/docs/content/guides/telemetry/metrics.mdx
@@ -1,164 +1,42 @@
 ---
 id: 'metrics'
-title: 'Metrics'
-description: 'Observability for your Supabase project'
+title: 'Metrics API'
+description: 'Export Supabase database metrics to any Prometheus-compatible tool'
 ---
 
-In addition to the reports and charts built in to the Supabase dashboard, each project hosted on the Supabase platform comes with a [Prometheus](https://prometheus.io/)-compatible metrics endpoint, updated every minute, which can be used to gather insight into the health and status of your project.
-
-You can use this endpoint to ingest data into your own monitoring and alerting infrastructure, as long as it is capable of scraping Prometheus-compatible endpoints, in order to set up custom rules beyond those supported by the Supabase dashboard.
-
-<Admonition type="note">
-
-The endpoint discussed in this article is in beta, and the metrics returned by it might evolve or be changed in the future to increase its utility.
-
-</Admonition>
+Every Supabase project exposes a [Prometheus](https://prometheus.io/)-compatible **Metrics API** endpoint that surfaces ~200 Postgres performance and health series. You can scrape it into any observability stack to power custom dashboards, alerting rules, or long-term retention that goes beyond what Supabase Studio provides out of the box.
 
 <Admonition type="note">
 
-The endpoint discussed in this article is not available on self-hosted.
+The Metrics API is currently in beta. Metric names and labels might evolve as we expand the dataset, and the feature is not available in self-hosted Supabase instances.
 
 </Admonition>
 
-## Accessing the metrics endpoint
-
-Your project's metrics endpoint is accessible at `https://<project-ref>.supabase.co/customer/v1/privileged/metrics`.
-
-Access to the endpoint is secured via HTTP Basic Auth:
-
-- username: `service_role`
-- password: the `service_role` API key or any other secret API key, get these from [Supabase dashboard](/dashboard/project/_/settings/api-keys)
-
-You can also retrieve your service role key programmatically using the Management API:
-
-```bash
-# Get your access token from https://supabase.com/dashboard/account/tokens
-export SUPABASE_ACCESS_TOKEN="your-access-token"
-export PROJECT_REF="your-project-ref"
-
-# Get project API keys including service_role key
-curl -H "Authorization: Bearer $SUPABASE_ACCESS_TOKEN" \
-  "https://api.supabase.com/v1/projects/$PROJECT_REF/api-keys?reveal=true"
-```
-
-<ProjectConfigVariables variable="url" />
-
-```shell
-curl <project-url>/customer/v1/privileged/metrics \
-    --user 'service_role:sb_secret_...'
-```
-
-```shell
-curl <project-url>/customer/v1/privileged/metrics \
-    --user 'service_role:<service-role-jwt>'
-```
-
-## Supabase Grafana
-
-The pre-configured [Supabase Grafana Dashboard](https://github.com/supabase/supabase-grafana/) is an advanced version of the [Dashboard's Database Reports](/dashboard/project/_/observability/database). It visualizes over 200 database performance and health metrics.
-
-![Supabase Grafana](/docs/img/guides/platform/supabase-grafana-prometheus.png)
-
-Instructions are included in the [README](https://github.com/supabase/supabase-grafana/blob/main/README.md) for deploying the repository using docker.
-
-## Using the metrics endpoint in production
-
-To set up monitoring for your project, you will need two things:
-
-1. A datastore - a place to store the metrics coming from your Supabase project over time
-2. A dashboard - a place to visualize the state of your Supabase project for a defined period
-
-### Setting up a metrics datastore
-
-One of the more well-known options is [Prometheus](https://prometheus.io/docs/introduction/overview/) and it is the tool used in this guide.
+## What you can do with the Metrics API
 
-You can [self-host](https://prometheus.io/docs/prometheus/latest/installation/) Prometheus or choose a managed service to store your metrics. Some of the providers offering managed Prometheus are:
+- Stream database CPU, IO, WAL, connection, and query stats into Prometheus-compatible systems.
+- Combine Supabase metrics with application signals in Grafana, Datadog, or any other observability vendor.
+- Reuse our [supabase-grafana dashboard JSON](https://github.com/supabase/supabase-grafana) to bootstrap over 200 ready-made charts.
+- Build your own alerting policies (right-sizing, saturation detection, index regression, and more).
 
-- [Digital Ocean](https://marketplace.digitalocean.com/apps/prometheus)
-- [AWS](https://aws.amazon.com/prometheus/)
-- [Grafana Cloud](https://grafana.com/products/cloud/metrics/)
+<$Partial path="metrics_access.mdx" />
 
-Follow the guides for the deployment option you choose
+## Choose your monitoring stack
 
-#### Adding a scrape job to Prometheus
+Pick the workflow that best matches your tooling. Each card opens a Supabase-authored guide, and some also include a “Community” pill when there’s an accompanying vendor integration reference.
 
-For Prometheus, modify your `prometheus.yaml` file to add a Supabase job, and set the `metrics_path`, `scheme`, `basic_auth` and `targets` parameters. For example:
+<MetricsStackCards />
 
-```yaml
-scrape_configs:
-  - job_name: "MySupabaseJob"
-    metrics_path: "/customer/v1/privileged/metrics"
-    scheme: https
-    basic_auth:
-      username: "service_role"
-      password: "<your service_role JWT>"
-    static_configs:
-      - targets: [
-        "<your Supabase Project ID>.supabase.co:443"
-          ]
-        labels:
-          group: "MyGroupLabel"
-```
+<img
+  src="/docs/img/guides/platform/supabase-grafana-prometheus.png"
+  alt="Supabase Grafana dashboard showcasing database metrics"
+  className="mt-8 rounded-lg border border-foreground/10 shadow-sm"
+/>
 
-**For Grafana Cloud users** instead of manually configuring `prometheus.yaml`, use a "Metrics Endpoint" instead:
+## Additional resources
 
-- In the left-hand menu, select **Connections** and click **Add new connection**.
-- Search for **Metrics Endpoint** and select it.
-- Click **Add new scrape job**.
-- Enter the details specified in [Accessing the metrics endpoint](/docs/guides/telemetry/metrics#accessing-the-metrics-endpoint).
-- Set the **scraping interval** to "60s".
-- Test the connection. Once it has passed, click **Save Scrape Job**.
-
-### Setting up a dashboard
-
-For this guide, we will be using [Grafana](https://grafana.com/docs/grafana/latest/introduction/).
-
-You can [self-host](https://grafana.com/docs/grafana/latest/setup-grafana/installation/) Grafana or many providers offer managed Grafana, some of which are listed below:
-
-- [DigitalOcean](https://marketplace.digitalocean.com/apps/grafana)
-- [AWS](https://aws.amazon.com/grafana/)
-- [Grafana Cloud](https://grafana.com/products/cloud/metrics/)
-
-Follow the guides of the provider you choose to get Grafana up and running.
-
-### Adding a data source to Grafana
-
-In the left-hand menu, select `Data sources` and click `Add new data source`.
-
-Select `Prometheus` and enter the connection details for the Prometheus instance you have set up.
-
-**Grafana Cloud users** refer to [Grafana Cloud Prometheus connection details](/docs/guides/telemetry/metrics#grafana-cloud-prometheus).
-
-Name the datasource "prometheus" (if you use a different name, you need to modify the `dashboard.json` file when adding the dashboard).
-
-Under **Interval behavior**, set the **scraping interval** to 60s and test the data source. Once it has passed, save it.
-
-#### Grafana cloud Prometheus connection details [#grafana-cloud-prometheus]
-
-- Log into your [Grafana Cloud Portal](https://grafana.com/auth/sign-in/).
-- Under **Grafana Cloud stack** click **Details**.
-- Search for **Prometheus** and click **Details**.
-- The **Grafana Data Source settings** section contains the necessary connection details
-  - "URL" (the format "https://UNIQUE_IDENTIFIER.grafana.net/api/prom")
-  - "User" / "Password"
-
-### Adding the Supabase dashboard
-
-In the left-hand menu, select `Dashboards` and click `New`. From the drop-down, select `Import`.
-
-Copy the raw file from our [supabase-grafana](https://raw.githubusercontent.com/supabase/supabase-grafana/refs/heads/main/grafana/dashboard.json) repository.
-
-- If your Prometheus data source is named "prometheus", paste the contents of the file (or upload the file).
-- If your Prometheus data source is **not named "prometheus"**, find all occurrences of `"uid": "prometheus"` and replace `prometheus` with your custom data source name.
-
-Click "Load" and the dashboard loads from the project specified in your Prometheus job.
-
-### Monitoring your project
-
-You can configure alerts from Prometheus or Grafana. The `supabase-grafana` repository has a selection of [example alerts](https://github.com/supabase/supabase-grafana/blob/main/docs/example-alerts.md) that can be configured.
-
-<Admonition type="caution">
-
-Grafana Cloud has an unofficial integration for scraping Supabase metrics. See their [docs](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/integrations/integration-reference/integration-supabase/) for instructions on how to configure it but note that it is not full-featured nor is it supported by Supabase.
-
-</Admonition>
+- [Supabase Grafana repository](https://github.com/supabase/supabase-grafana) for dashboard JSON and alert examples.
+- [Grafana Cloud’s Supabase integration doc](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/integrations/integration-reference/integration-supabase/) (community-maintained, built on this Metrics API).
+- [Datadog’s Supabase integration doc](https://docs.datadoghq.com/integrations/supabase/) (community-maintained, built on this Metrics API).
+- [Log Drains ](/docs/guides/telemetry/log-drains) for exporting event-based telemetry alongside metrics.
+- [Query Performance report](/dashboard/project/_/observability/query-performance) for built-in visualizations based on the same underlying metrics.
diff --git a/apps/docs/content/guides/telemetry/metrics/datadog.mdx b/apps/docs/content/guides/telemetry/metrics/datadog.mdx
new file mode 100644
index 0000000000000..8bcf3628ea17b
--- /dev/null
+++ b/apps/docs/content/guides/telemetry/metrics/datadog.mdx
@@ -0,0 +1,83 @@
+---
+id: 'metrics-datadog'
+title: 'Metrics API with Datadog'
+description: 'Scrape Supabase metrics with the Datadog Agent or Prometheus integrations'
+---
+
+Datadog can ingest the Supabase Metrics API through its [OpenMetrics integration](https://docs.datadoghq.com/integrations/openmetrics/) or by proxying Prometheus data into Datadog’s time-series store. This guide covers both options so you can monitor database health alongside application metrics, logs, and traces in one place.
+
+<Admonition type="note">
+
+Datadog publishes a [Supabase integration reference](https://docs.datadoghq.com/integrations/supabase/) that uses the same Metrics API outlined here. That integration is managed by Datadog and is not officially supported by Supabase.
+
+</Admonition>
+
+## Prerequisites
+
+- Supabase service role key (or another secret key) with Metrics API access.
+- Datadog API/APP keys (for SaaS) and the Datadog Agent installed wherever you plan to run the scraper.
+
+<$Partial path="metrics_access.mdx" />
+
+## Option A: Datadog agent + OpenMetrics check
+
+1. Install the Datadog Agent on a host that can reach `https://<project-ref>.supabase.co`.
+2. Enable the OpenMetrics integration by creating `openmetrics.d/conf.yaml` (Linux path: `/etc/datadog-agent/conf.d/openmetrics.d/conf.yaml`):
+
+```yaml
+init_config:
+
+instances:
+  - openmetrics_endpoint: https://<project-ref>.supabase.co/customer/v1/privileged/metrics
+    namespace: supabase
+    metrics:
+      - 'supabase_*'
+    auth_type: basic
+    username: service_role
+    password: { { env "SUPABASE_SERVICE_ROLE_KEY" } }
+    ssl_verify: true
+    prometheus_timeout: 30
+    labels_mapper:
+      project: project_ref
+```
+
+3. Restart the Datadog Agent (`sudo systemctl restart datadog-agent`).
+4. In Datadog, search for metrics with the `supabase.` prefix. Create dashboards or notebooks to visualize CPU, IO, replication, and connection metrics.
+
+### Tuning tips
+
+- Set `min_collection_interval: 60` to match Supabase’s one-minute refresh cadence.
+- Use `labels_mapper` to rename high-cardinality labels into shorter Datadog tag keys.
+- If you monitor multiple projects, duplicate the instance block with a unique `namespace` and tag each project (`tags: ["supabase_project:<ref>"]`).
+
+## Option B: Prometheus remote write into Datadog
+
+If you already run [Prometheus](https://prometheus.io/docs/prometheus/latest/installation/) (self-hosted or managed), push scraped metrics into Datadog using the [Prometheus Remote Write integration](https://docs.datadoghq.com/integrations/guide/prometheus_remote_write/):
+
+1. Configure Prometheus with the Supabase scrape job (see the [self-hosted guide](/guides/telemetry/metrics/grafana-self-hosted#1-deploy-prometheus)).
+2. Add a `remote_write` section to `prometheus.yml` that targets Datadog’s endpoint:
+
+```yaml
+remote_write:
+  - url: https://api.datadoghq.com/api/v1/prometheus/write?api_key=<DD_API_KEY>
+    write_relabel_configs:
+      - source_labels: [job]
+        target_label: datadog_namespace
+        replacement: supabase
+```
+
+3. (Optional) Use [Datadog’s Prometheus mapping profiles](https://docs.datadoghq.com/integrations/guide/prometheus-metrics-map/) to convert metric/label names into Datadog-friendly conventions.
+
+## Dashboards and alerts
+
+- Use the Datadog Dashboard Gallery to build widgets for CPU usage, tuple IO, replication lag, and connection saturation.
+- Create monitors (for example, `avg(last_5m):supabase_pg_stat_database_xact_commit{project:<ref>} > 5e5`) to detect runaway workloads.
+- Tag metrics with `env`, `service`, or `team` so you can slice Supabase telemetry the same way you slice application telemetry.
+
+## Troubleshooting
+
+- **401 errors:** rotate the service role key in Supabase and update the Datadog credentials.
+- **SSL errors:** ensure the host trusts the standard certificate authorities used by `*.supabase.co`.
+- **High cardinality warnings:** filter out labels such as `datname` or `application_name` if you only need aggregate views.
+
+[← Back to the Metrics API landing](/guides/telemetry/metrics)
diff --git a/apps/docs/content/guides/telemetry/metrics/grafana-cloud.mdx b/apps/docs/content/guides/telemetry/metrics/grafana-cloud.mdx
new file mode 100644
index 0000000000000..275fedf70a60f
--- /dev/null
+++ b/apps/docs/content/guides/telemetry/metrics/grafana-cloud.mdx
@@ -0,0 +1,63 @@
+---
+id: 'metrics-grafana-cloud'
+title: 'Metrics API with Grafana Cloud'
+description: 'Use Grafana Cloud’s managed Prometheus to visualize Supabase metrics'
+---
+
+Grafana Cloud gives you a fully managed Prometheus endpoint plus hosted Grafana dashboards, which makes it the fastest way to explore the Supabase Metrics API without operating your own infrastructure.
+
+<Admonition type="note">
+
+Grafana maintains a [Supabase integration guide](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/integrations/integration-reference/integration-supabase/) for Grafana Cloud. It runs on the same Metrics API documented here, but is community-maintained by Grafana, so feature coverage might differ from what Supabase officially supports.
+
+</Admonition>
+
+## Prerequisites
+
+- A Supabase project with access to the Metrics API (service role key or another secret key).
+- A Grafana Cloud account with Prometheus metrics enabled (Free or Pro tier).
+- A Grafana API token with the `metrics:write` and `metrics:read` scopes if you plan to push data manually.
+
+<$Partial path="metrics_access.mdx" />
+
+## 1. Create a Grafana Cloud stack
+
+1. Sign in to [Grafana Cloud](https://grafana.com/auth/sign-in).
+2. Create (or select) a stack that has **Prometheus Metrics** enabled (Free and Pro tiers both work for this guide).
+
+## 2. Configure the Supabase integration
+
+1. Navigate to **Connections → Add new connection → Supabase** inside Grafana Cloud.
+2. Provide:
+   - Your Supabase project ref (e.g. `abcd1234`).
+   - The Metrics API endpoint: `https://<project-ref>.supabase.co/customer/v1/privileged/metrics`.
+   - HTTP Basic Auth credentials (`service_role` / `service_role key`).
+3. Choose the scrape interval (1 minute recommended) and test the connection. Grafana Cloud will deploy an agent in the background that scrapes the Metrics API and forwards the data to Prometheus.
+
+If you prefer to reuse an existing Grafana Agent deployment, configure an [integration pipeline](https://grafana.com/docs/grafana-cloud/send-data/agent/integrations/integration-reference/integration-supabase/) with the same URL and credentials.
+
+## 3. Import the Supabase dashboard
+
+1. Open your Grafana Cloud dashboard list and click **New → Import**.
+2. Paste the raw contents of [`supabase-grafana/dashboard.json`](https://raw.githubusercontent.com/supabase/supabase-grafana/refs/heads/main/grafana/dashboard.json).
+3. When prompted for the datasource, choose the Prometheus instance that receives the Supabase metrics.
+
+This dashboard includes 200+ charts grouped by CPU, IO, connections, replication, WAL, and bloat indicators.
+
+<img
+  src="/docs/img/guides/platform/supabase-grafana-prometheus.png"
+  alt="Supabase Grafana dashboard showcasing database metrics"
+  className="mt-6 rounded-lg border border-foreground/10 shadow-sm"
+/>
+
+## 4. Configure alerts (optional)
+
+The [`docs/example-alerts.md`](https://github.com/supabase/supabase-grafana/blob/main/docs/example-alerts.md) file contains suggested alert rules (disk saturation, long-running queries, replication lag, etc.). Import the alert rules into Grafana Cloud’s Alerting UI or translate them into Grafana Cloud’s managed alert rule format.
+
+## 5. Troubleshooting
+
+- Metrics missing? Ensure the Grafana Cloud agent can reach `https://<project-ref>.supabase.co` and that the selected service role key is still valid.
+- 401 errors? Rotate the service role key from the [API settings page](/dashboard/project/_/settings/api-keys) and update the Grafana Cloud credentials.
+- Long scrape durations? Reduce label cardinality in your Grafana queries or lower the time range to focus on recent data.
+
+[← Back to the Metrics API landing](/guides/telemetry/metrics)
diff --git a/apps/docs/content/guides/telemetry/metrics/grafana-self-hosted.mdx b/apps/docs/content/guides/telemetry/metrics/grafana-self-hosted.mdx
new file mode 100644
index 0000000000000..ba6c02670ef34
--- /dev/null
+++ b/apps/docs/content/guides/telemetry/metrics/grafana-self-hosted.mdx
@@ -0,0 +1,84 @@
+---
+id: 'metrics-grafana-self-hosted'
+title: 'Metrics API with Prometheus & Grafana (self-hosted)'
+description: 'Deploy Prometheus and Grafana yourself to monitor Supabase metrics'
+---
+
+Self-hosting [Prometheus](https://prometheus.io/docs/prometheus/latest/installation/) and Grafana gives you full control over retention, alert routing, and dashboards. The Supabase Metrics API slots into any standard Prometheus scrape job, so you can run everything locally, on a VM, or inside Kubernetes.
+
+<$Partial path="metrics_access.mdx" />
+
+<Admonition type="note">
+
+Grafana also documents a [Supabase integration reference](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/integrations/integration-reference/integration-supabase/). While it targets Grafana Cloud, the scrape and agent settings apply equally to self-hosted clusters and offer a community-maintained companion to this guide.
+
+</Admonition>
+
+## Architecture
+
+1. **Prometheus** scrapes `https://<project-ref>.supabase.co/customer/v1/privileged/metrics` every minute using HTTP Basic Auth.
+2. **Grafana** reads from Prometheus and renders dashboards/alerts.
+3. (Optional) **Alertmanager** or your preferred system sends notifications when Prometheus rules fire.
+
+## 1. Deploy Prometheus
+
+Install [Prometheus](https://prometheus.io/docs/prometheus/latest/installation/) using your preferred method (Docker, Helm, binaries). Then add a Supabase-specific job to `prometheus.yml`:
+
+```yaml
+scrape_configs:
+  - job_name: 'supabase'
+    scrape_interval: 60s
+    metrics_path: /customer/v1/privileged/metrics
+    scheme: https
+    basic_auth:
+      username: service_role
+      password: '<service-role key or JWT>'
+    static_configs:
+      - targets:
+          - '<project-ref>.supabase.co:443'
+        labels:
+          project: '<project-ref>'
+```
+
+<Admonition type="tip">
+
+- Keep the scrape interval at 60 seconds to match Supabase’s refresh cadence.
+- If you run Prometheus behind a proxy, make sure it can establish outbound HTTPS connections to `*.supabase.co`.
+- Store secrets (service role key) with your secret manager or inject them via environment variables.
+
+</Admonition>
+
+## 2. Deploy Grafana
+
+Install Grafana (Docker image, Helm chart, or packages) and connect it to Prometheus:
+
+1. In Grafana, go to **Connections → Data sources → Add data source**.
+2. Choose **Prometheus**, set the URL to your Prometheus endpoint (for example `http://prometheus:9090`), and click **Save & test**.
+
+## 3. Import Supabase dashboards
+
+1. Go to **Dashboards → New → Import**.
+2. Paste the contents of [`supabase-grafana/dashboard.json`](https://raw.githubusercontent.com/supabase/supabase-grafana/refs/heads/main/grafana/dashboard.json).
+3. Select your Prometheus datasource when prompted.
+
+You now have over 200 production-ready panels covering CPU, IO, WAL, replication, index bloat, and query throughput.
+
+<img
+  src="/docs/img/guides/platform/supabase-grafana-prometheus.png"
+  alt="Supabase Grafana dashboard showcasing database metrics"
+  className="mt-6 rounded-lg border border-foreground/10 shadow-sm"
+/>
+
+## 4. Configure alerting
+
+- Import the sample rules from [`docs/example-alerts.md`](https://github.com/supabase/supabase-grafana/blob/main/docs/example-alerts.md) into Prometheus or Grafana Alerting.
+- Tailor thresholds (for example, disk utilization, long-running transactions, connection saturation) to your project’s size.
+- Route notifications via Alertmanager, Grafana OnCall, PagerDuty, or any other supported destination.
+
+## 5. Operating tips
+
+- **Multiple projects:** add one scrape job per project ref so you can separate metrics and labels cleanly.
+- **Right-sizing guidance:** pair the dashboards with Supabase’s [Query Performance report](/dashboard/project/_/observability/query-performance) and [Advisors](/dashboard/project/_/observability/database) to decide when to optimize vs upgrade.
+- **Security:** rotate the service role key on a regular cadence and update the Prometheus config accordingly.
+
+[← Back to the Metrics API landing](/guides/telemetry/metrics)
diff --git a/apps/docs/content/guides/telemetry/metrics/vendor-agnostic.mdx b/apps/docs/content/guides/telemetry/metrics/vendor-agnostic.mdx
new file mode 100644
index 0000000000000..0b766eb3ea303
--- /dev/null
+++ b/apps/docs/content/guides/telemetry/metrics/vendor-agnostic.mdx
@@ -0,0 +1,72 @@
+---
+id: 'metrics-vendor-agnostic'
+title: 'Vendor-agnostic Metrics API setup'
+description: 'Connect Supabase metrics to any Prometheus-compatible platform'
+---
+
+The Supabase Metrics API is intentionally vendor-agnostic. Any collector that can scrape a Prometheus text endpoint over HTTPS can ingest the data. This guide explains the moving pieces so you can adapt them to AWS Managed Prometheus, Grafana Mimir, VictoriaMetrics, Thanos, or any other system.
+
+<$Partial path="metrics_access.mdx" />
+
+## Components
+
+- **Collector** – Prometheus, Grafana Agent, VictoriaMetrics agent, Mimir scraper, etc.
+- **Long-term store (optional)** – Managed Prometheus, Thanos, Mimir, VictoriaMetrics.
+- **Visualization/alerting** – Grafana, Datadog, New Relic, custom code.
+
+## 1. Define the scrape job
+
+No matter which collector you use, you need to hit the Metrics API once per minute with HTTP Basic Auth:
+
+```yaml
+- job_name: supabase
+  scrape_interval: 60s
+  metrics_path: /customer/v1/privileged/metrics
+  scheme: https
+  basic_auth:
+    username: service_role
+    password: '<service-role key or JWT>'
+  static_configs:
+    - targets:
+        - '<project-ref>.supabase.co:443'
+      labels:
+        project: '<project-ref>'
+```
+
+### Collector-specific notes
+
+- **Grafana Agent / Alloy:** use the [`prometheus.scrape` component](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/integrations/integration-reference/integration-supabase/#manual-configuration) with the same parameters.
+- **AWS Managed Prometheus (AMP):** deploy the Grafana Agent or AWS Distro for OpenTelemetry (ADOT) in your VPC, then remote-write the scraped metrics into AMP.
+- **VictoriaMetrics / Mimir:** reuse the same scrape block; configure remote-write or retention rules as needed.
+
+## 2. Secure the credentials
+
+- Store the service role key in your secret manager (AWS Secrets Manager, GCP Secret Manager, Vault, etc.).
+- Rotate the key periodically via [Project Settings → API keys](/dashboard/project/_/settings/api-keys) and update your collector.
+- If you need to give observability vendors access without exposing the service role key broadly, create a dedicated service key for metrics-only automation.
+
+## 3. Downstream dashboards
+
+- Import the [Supabase Grafana dashboard](https://github.com/supabase/supabase-grafana) regardless of where Grafana is hosted.
+- For other tools, group metrics by categories (CPU, IO, WAL, replication, connections) and recreate the visualizations that matter most to your team.
+- Tag or relabel series with `project`, `env`, or `team` labels to make multi-project views easier.
+
+<img
+  src="/docs/img/guides/platform/supabase-grafana-prometheus.png"
+  alt="Supabase Grafana dashboard showcasing database metrics"
+  className="mt-6 rounded-lg border border-foreground/10 shadow-sm"
+/>
+
+## 4. Alerts and automation
+
+- Start with the [example alert rules](https://github.com/supabase/supabase-grafana/blob/main/docs/example-alerts.md) and adapt thresholds for your workload sizes.
+- Pipe alerts into PagerDuty, Slack, Opsgenie, or any other compatible target.
+- Combine Metrics API data with log drains, Query Performance, and Advisors to build right-sizing playbooks.
+
+## 5. Multi-project setups
+
+- Create one scrape job per project ref so you can control sampling individually.
+- If you run many projects, consider templating the scrape jobs via Helm, Terraform, or the Grafana Agent Operator.
+- Use label joins (`project`, `instance_class`, `org`) to aggregate across tenants or environments.
+
+[← Back to the Metrics API landing](/guides/telemetry/metrics)
diff --git a/apps/docs/content/troubleshooting/realtime-debugging-with-logger.mdx b/apps/docs/content/troubleshooting/realtime-debugging-with-logger.mdx
new file mode 100644
index 0000000000000..c41e43d897894
--- /dev/null
+++ b/apps/docs/content/troubleshooting/realtime-debugging-with-logger.mdx
@@ -0,0 +1,162 @@
+---
+title = "Debug Realtime with Logger and Log Levels"
+github_url = ""
+date_created = "2025-11-28T00:00:00+00:00"
+topics = [ "realtime" ]
+keywords = [ "debug", "logger", "log_level", "troubleshooting", "diagnostics" ]
+database_id = ""
+---
+
+## What are logger and log_level parameters?
+
+The Realtime client provides built-in logging to help you debug connection issues, track messages, and understand what's happening with your real-time connections. Two parameters control logging:
+
+- **`logger`**: A custom function to handle log messages
+- **`logLevel`**: Controls which messages the server logs (`info`, `warn`, or `error`)
+
+By default, logging is disabled. When enabled, you can see:
+
+- Messages sent and received
+- Connection events (connect, disconnect, errors)
+- Heartbeat status
+- Channel subscriptions
+- Worker events
+
+## How to enable logging in your Realtime client
+
+### Basic logging to console
+
+```tsx
+import { createClient } from '@supabase/supabase-js'
+
+const supabase = createClient(SUPABASE_URL, SUPABASE_KEY, {
+  realtime: {
+    logger: (kind, msg, data) => {
+      console.log(`${kind}: ${msg}`, data)
+    },
+  },
+})
+```
+
+### With log levels for server-side filtering
+
+```tsx
+const supabase = createClient(SUPABASE_URL, SUPABASE_KEY, {
+  realtime: {
+    logLevel: 'info', // 'info' | 'warn' | 'error'
+    logger: (kind, msg, data) => {
+      console.log(`[${kind}] ${msg}`, data)
+    },
+  },
+})
+```
+
+## Understanding log messages
+
+The logger receives three parameters: `kind`, `msg`, and `data`.
+
+**Log kinds you'll see:**
+
+**`push`** - Messages sent to the server
+
+```
+push: realtime:chat heartbeat (42) {}
+push: realtime:chat phx_join (1) { config: {...} }
+```
+
+**`receive`** - Messages received from server
+
+```
+receive: ok realtime:chat phx_reply (1) { response: {...} }
+receive: realtime:chat broadcast { event: 'message', payload: {...} }
+```
+
+**`transport`** - Connection events
+
+```
+transport: connected to wss://project.supabase.co/realtime/v1
+transport: heartbeat timeout. Attempting to re-establish connection
+transport: close CloseEvent {...}
+transport: leaving duplicate topic "realtime:chat"
+```
+
+**`error`** - Error events
+
+```
+error: error in heartbeat callback Error: ...
+error: error waiting for auth on connect Error: ...
+```
+
+**`worker`** - Web Worker events
+
+```
+worker: starting default worker
+worker: starting worker for from /worker.js
+worker: worker error message
+```
+
+**Common debugging scenarios**
+
+**Debug why channel won't subscribe:**
+
+```tsx
+import { createClient } from '@supabase/supabase-js'
+
+const supabase = createClient(SUPABASE_URL, SUPABASE_KEY, {
+  realtime: {
+    logger: (kind, msg, data) => {
+      console.log(`[${kind}] ${msg}`, data)
+    },
+  },
+})
+
+const channel = supabase
+  .channel('debug-channel')
+  .on('broadcast', { event: 'test' }, (payload) => {
+    console.log('Received:', payload)
+  })
+  .subscribe((status, err) => {
+    console.log('Subscribe status:', status, err)
+  })
+
+// Check logs for:
+// push: realtime:debug-channel phx_join - subscription attempt
+// receive: ok realtime:debug-channel phx_reply - successful subscription
+// Or error messages if subscription failed
+```
+
+## Debug message delivery issues
+
+```tsx
+const supabase = createClient(SUPABASE_URL, SUPABASE_KEY, {
+  realtime: {
+    logger: (kind, msg, data) => {
+      if (kind === 'push' || kind === 'receive') {
+        console.log(`[${kind}] ${msg}`, data)
+      }
+    },
+  },
+})
+
+const channel = supabase.channel('chat', { config: { broadcast: { self: true } } })
+
+channel.on('broadcast', { event: 'message' }, (payload) => {
+  console.log('Message received:', payload)
+})
+// Send message after subscribing
+channel.subscribe((status, err) => {
+  if (status == 'SUBSCRIBED') {
+    channel.send({
+      type: 'broadcast',
+      event: 'message',
+      payload: { text: 'Hello' },
+    })
+  } else {
+    console.error({ status, err })
+  }
+})
+
+// Check logs:
+// push: realtime:chat broadcast - message sent
+// receive: realtime:chat broadcast - message received (if self: true)
+```
diff --git a/apps/docs/content/troubleshooting/realtime-heartbeat-messages.mdx b/apps/docs/content/troubleshooting/realtime-heartbeat-messages.mdx
new file mode 100644
index 0000000000000..eb121cab7a301
--- /dev/null
+++ b/apps/docs/content/troubleshooting/realtime-heartbeat-messages.mdx
@@ -0,0 +1,247 @@
+---
+title = "Understanding and Monitoring Realtime Heartbeats"
+github_url = ""
+date_created = "2025-11-28T00:00:00+00:00"
+topics = [ "realtime" ]
+keywords = [ "heartbeat", "connection", "websocket", "keep-alive", "timeout", "onHeartbeat", "heartbeatCallback", "reconnect" ]
+database_id = ""
+---
+
+## What are heartbeat messages?
+
+Heartbeat messages are periodic signals sent between the Realtime client and server to verify that the WebSocket connection is alive and functioning properly. The client sends a heartbeat message on the `phoenix` topic with the event type `heartbeat` at regular intervals (default: 25 seconds), and the server responds with a `phx_reply` message.
+
+These messages serve as a keep-alive mechanism to detect connection issues that might not be immediately apparent, such as silent network failures or intermediary proxy timeouts.
+
+## Why heartbeats matter
+
+Heartbeat messages are critical for maintaining reliable real-time connections:
+
+- **Connection health monitoring**: They detect when a connection has silently failed without triggering WebSocket close events
+- **Automatic recovery**: When heartbeats time out, the client automatically attempts to reconnect
+- **Network proxy compatibility**: Many network proxies and load balancers close idle connections; heartbeats keep the connection active
+- **Early issue detection**: Heartbeat timeouts alert you to connection problems before users experience message delivery failures
+
+Without heartbeats, your application might appear connected while being unable to send or receive messages.
+
+## How to handle heartbeat messages
+
+You can monitor heartbeat lifecycle events using the `onHeartbeat` method:
+
+```tsx
+import { useEffect } from 'react'
+import { createClient } from '@supabase/supabase-js'
+
+function MyComponent() {
+  const supabase = createClient(SUPABASE_URL, SUPABASE_KEY)
+
+  useEffect(() => {
+    supabase.realtime.onHeartbeat((status) => {
+      console.log('Heartbeat status:', status)
+      // status can be: 'sent', 'ok', 'error', 'timeout', or 'disconnected'
+    })
+  }, [supabase])
+
+  return <div>Your app content</div>
+}
+```
+
+Or configure the callback during client initialization:
+
+```tsx
+const supabase = createClient(SUPABASE_URL, SUPABASE_KEY, {
+  realtime: {
+    heartbeatCallback: (status) => {
+      console.log('Heartbeat status:', status)
+    },
+  },
+})
+```
+
+## Troubleshooting heartbeat issues
+
+### Frequent heartbeat timeouts
+
+If you're seeing frequent `timeout` status in your heartbeat callback:
+
+- **Network instability**: Check your network connection quality
+- **Firewall/proxy issues**: Corporate firewalls or proxies might interfere with WebSocket connections
+- **Mobile app suspension**: On mobile, the app can be suspended which can stop the heartbeat timers
+
+**Connection not reconnecting after timeout**
+
+The client automatically attempts reconnection with exponential backoff (1s, 2s, 5s, 10s). If you need to manually reconnect:
+
+```tsx
+import { useState, useEffect } from 'react'
+import { createClient } from '@supabase/supabase-js'
+
+function ConnectionStatus() {
+  const supabase = createClient(SUPABASE_URL, SUPABASE_KEY)
+  const [isConnected, setIsConnected] = useState(true)
+
+  useEffect(() => {
+    supabase.realtime.onHeartbeat((status) => {
+      if (status === 'ok') {
+        setIsConnected(true)
+      } else if (status === 'timeout' || status === 'disconnected') {
+        setIsConnected(false)
+      }
+    })
+  }, [supabase])
+
+  const handleReconnect = () => {
+    supabase.realtime.connect()
+  }
+
+  return (
+    <div>
+      <p>Status: {isConnected ? 'Connected' : 'Disconnected'}</p>
+      {!isConnected && <button onClick={handleReconnect}>Reconnect</button>}
+    </div>
+  )
+}
+```
+
+### Customizing heartbeat interval
+
+You can adjust the heartbeat frequency when creating your Supabase client in React:
+
+```tsx
+import { createClient } from '@supabase/supabase-js'
+import { useMemo } from 'react'
+
+function App() {
+  const supabase = useMemo(
+    () =>
+      createClient(SUPABASE_URL, SUPABASE_KEY, {
+        realtime: {
+          heartbeatIntervalMs: 15000, // Send heartbeat every 15 seconds (default: 25000)
+        },
+      }),
+    []
+  )
+
+  return <YourApp supabase={supabase} />
+}
+```
+
+Note: Increasing the interval reduces network traffic but delays detection of connection failures. Decreasing it improves detection speed but increases overhead.
+
+### Heartbeat errors in Web workers
+
+For React applications with long-running connections, use Web Workers to prevent browser tab throttling:
+
+```tsx
+import { createClient } from '@supabase/supabase-js'
+import { useMemo } from 'react'
+
+function App() {
+  const supabase = useMemo(
+    () =>
+      createClient(SUPABASE_URL, SUPABASE_KEY, {
+        realtime: {
+          worker: true,
+          workerUrl: '/worker.js', // Optional: Place in public folder
+        },
+      }),
+    []
+  )
+
+  return <YourApp supabase={supabase} />
+}
+```
+
+If the worker fails to start, check:
+
+- Browser Web Worker support is available
+- Worker script is in the public folder and accessible
+- CORS headers allow loading the worker script
+
+## Best practices
+
+### Show connection status to users
+
+Display connection status with a simple indicator:
+
+```tsx
+import { useState, useEffect } from 'react'
+import { createClient } from '@supabase/supabase-js'
+
+function ConnectionIndicator() {
+  const supabase = createClient(SUPABASE_URL, SUPABASE_KEY)
+  const [status, setStatus] = useState('healthy')
+
+  useEffect(() => {
+    supabase.realtime.onHeartbeat((heartbeatStatus) => {
+      if (heartbeatStatus === 'ok') {
+        setStatus('healthy')
+      } else if (heartbeatStatus === 'timeout') {
+        setStatus('poor')
+      } else if (heartbeatStatus === 'disconnected') {
+        setStatus('disconnected')
+      }
+    })
+  }, [supabase])
+
+  return (
+    <div>
+      <span>Connection: {status}</span>
+    </div>
+  )
+}
+```
+
+### Reconnect when React Native app comes to foreground
+
+Ensure connection is active when user opens your app:
+
+```tsx
+import { useEffect } from 'react'
+import { AppState } from 'react-native'
+import { createClient } from '@supabase/supabase-js'
+
+function App() {
+  const supabase = createClient(SUPABASE_URL, SUPABASE_KEY)
+
+  useEffect(() => {
+    const subscription = AppState.addEventListener('change', (nextAppState) => {
+      if (nextAppState === 'active') {
+        if (!supabase.realtime.isConnected()) {
+          supabase.realtime.connect()
+        }
+      }
+    })
+
+    return () => {
+      subscription.remove()
+    }
+  }, [supabase])
+
+  return <YourApp />
+}
+```
+
+### Monitor connection in your entire app
+
+Set up monitoring when you create your Supabase client:
+
+```tsx
+import { createClient } from '@supabase/supabase-js'
+
+const supabase = createClient(SUPABASE_URL, SUPABASE_KEY, {
+  realtime: {
+    heartbeatCallback: (status) => {
+      if (status === 'ok') {
+        console.log('Connection healthy')
+      } else if (status === 'timeout') {
+        console.warn('Connection slow')
+      } else if (status === 'disconnected') {
+        console.error('Disconnected')
+      }
+    },
+  },
+})
+
+export default supabase
+```
diff --git a/apps/docs/content/troubleshooting/realtime-too-many-channels-error.mdx b/apps/docs/content/troubleshooting/realtime-too-many-channels-error.mdx
new file mode 100644
index 0000000000000..af7bcdb05439f
--- /dev/null
+++ b/apps/docs/content/troubleshooting/realtime-too-many-channels-error.mdx
@@ -0,0 +1,247 @@
+---
+title = "Fixing the TooManyChannels Error"
+github_url = ""
+date_created = "2025-11-28T00:00:00+00:00"
+topics = [ "realtime" ]
+keywords = [ "channels", "useEffect", "react", "memory leak", "quota", "TooManyChannels", "ChannelRateLimitReached", "unsubscribe", "cleanup" ]
+database_id = ""
+---
+
+{/* supa-mdx-lint-disable Rule003Spelling */}
+
+## What is the TooManyChannels error?
+
+The TooManyChannels error occurs when your application tries to create more than the allowed number of Realtime channels. When you exceed this limit, you'll see an error with the code `ChannelRateLimitReached`.
+
+This limit exists to protect both your application and Supabase servers from resource exhaustion.
+
+## What causes TooManyChannels errors?
+
+{/* supa-mdx-lint-enable Rule003Spelling */}
+The most common cause is accidentally creating channels without cleaning them up, especially in React applications. This happens when:
+
+{/* supa-mdx-lint-disable Rule003Spelling */}
+
+- Components create channels on every render without unsubscribing
+- `useEffect` runs multiple times due to missing or incorrect dependencies
+- Components unmount without cleaning up their channels
+- Development mode in React (StrictMode) causes effects to run twice
+  {/* supa-mdx-lint-enable Rule003Spelling */}
+
+Each time you call `supabase.channel('topic').subscribe()`, a new channel is created unless you properly clean it up.
+{/* supa-mdx-lint-disable Rule003Spelling */}
+Here's the most common mistake that might lead to TooManyChannels errors:
+{/* supa-mdx-lint-enable Rule003Spelling */}
+
+```tsx
+// ❌ WRONG - Creates new channel on every render
+function ChatRoom() {
+  const supabase = createClient(SUPABASE_URL, SUPABASE_KEY)
+
+  useEffect(() => {
+    const channel = supabase.channel('chat')
+
+    channel
+      .on('broadcast', { event: 'message' }, (payload) => {
+        console.log(payload)
+      })
+      .subscribe()
+
+    // Missing cleanup!
+  }, []) // supabase is missing from dependencies
+
+  return <div>Chat</div>
+}
+```
+
+Why this fails:
+
+- Creating `supabase` client inside component causes it to change on every render
+- Missing `supabase` from dependencies array
+- No cleanup function to unsubscribe the channel
+- Each render creates a new channel that's never removed
+
+## The correct approach
+
+```tsx
+// ✅ CORRECT - Properly manages channel lifecycle
+import { useEffect } from 'react'
+import { createClient } from '@supabase/supabase-js'
+
+// Create client outside component (singleton)
+const supabase = createClient(SUPABASE_URL, SUPABASE_KEY)
+
+function ChatRoom() {
+  useEffect(() => {
+    const channel = supabase
+      .channel('chat')
+      .on('broadcast', { event: 'message' }, (payload) => {
+        console.log(payload)
+      })
+      .subscribe()
+
+    // Cleanup function - ALWAYS unsubscribe!
+    return () => {
+      channel.unsubscribe()
+    }
+  }, []) // Empty dependencies because supabase is stable
+
+  return <div>Chat</div>
+}
+```
+
+## How to debug channel creation
+
+Check how many channels your app has created:
+
+```tsx
+import { useEffect } from 'react'
+
+function ChannelDebugger() {
+  const supabase = createClient(SUPABASE_URL, SUPABASE_KEY)
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      const channels = supabase.getChannels()
+      console.log(`Active channels: ${channels.length}`)
+      console.log(
+        'Channel topics:',
+        channels.map((c) => c.topic)
+      )
+    }, 2000)
+
+    return () => clearInterval(interval)
+  }, [supabase])
+
+  return <div>Check console for channel count</div>
+}
+```
+
+If you see the number climbing, you have a leak. Look for:
+
+- Channel count increasing without user action
+- Same channel topics appearing multiple times
+- Count going up when navigating between pages
+
+## Best practices for channel management
+
+### 1. Create Supabase client outside components
+
+```tsx
+// ✅ Create once at module level
+const supabase = createClient(SUPABASE_URL, SUPABASE_KEY)
+
+function MyComponent() {
+  // Use the stable client
+}
+```
+
+### 2. Always unsubscribe in cleanup
+
+```tsx
+useEffect(() => {
+  const channel = supabase.channel('topic').subscribe()
+
+  return () => {
+    channel.unsubscribe()
+  }
+}, [])
+```
+
+### 3. Use stable channel names
+
+```tsx
+// ❌ WRONG - Creates new channel topic on every render
+function BadExample({ userId }) {
+  useEffect(() => {
+    const channel = supabase
+      .channel(`user-${Math.random()}`) // Random topic!
+      .subscribe()
+
+    return () => {
+      channel.unsubscribe()
+    }
+  }, [userId])
+}
+
+// ✅ CORRECT - Predictable channel topic
+function GoodExample({ userId }) {
+  useEffect(() => {
+    const channel = supabase.channel(`user-${userId}`).subscribe()
+
+    return () => {
+      channel.unsubscribe()
+    }
+  }, [userId])
+}
+```
+
+### 4. Reuse channels when possible
+
+The Supabase client automatically reuses channels with the same topic:
+
+```tsx
+// These return the same channel instance
+const channel1 = supabase.channel('chat')
+const channel2 = supabase.channel('chat') // Same as channel1
+
+console.log(channel1 === channel2) // true
+```
+
+### 5. Handle strict mode in development
+
+{/* supa-mdx-lint-disable Rule003Spelling */}
+React StrictMode intentionally runs effects twice in development. Your cleanup function will handle this:
+{/* supa-mdx-lint-enable Rule003Spelling */}
+
+```tsx
+// This works correctly even in StrictMode
+useEffect(() => {
+  console.log('Effect running')
+  const channel = supabase.channel('chat').subscribe()
+
+  return () => {
+    console.log('Cleanup running')
+    channel.unsubscribe()
+  }
+}, [])
+```
+
+{/* supa-mdx-lint-disable Rule003Spelling */}
+
+### 6. Clean up on unmount for dynamic channels
+
+If you create channels based on props:
+
+```tsx
+function RoomComponent({ roomId }) {
+  useEffect(() => {
+    const channel = supabase
+      .channel(`room:${roomId}`)
+      .on('broadcast', { event: 'message' }, handleMessage)
+      .subscribe()
+
+    return () => {
+      channel.unsubscribe()
+    }
+  }, [roomId]) // Re-subscribe when roomId changes
+}
+```
+
+### 7. Remove all channels when disconnecting
+
+When logging out or leaving your app:
+
+```tsx
+function LogoutButton() {
+  const handleLogout = async () => {
+    // Clean up all channels before logout
+    await supabase.removeAllChannels()
+
+    // Then handle logout
+    await supabase.auth.signOut()
+  }
+
+  return <button onClick={handleLogout}>Logout</button>
+}
+```
diff --git a/apps/docs/features/docs/MdxBase.shared.tsx b/apps/docs/features/docs/MdxBase.shared.tsx
index e332d72fd8a52..5826c493b38de 100644
--- a/apps/docs/features/docs/MdxBase.shared.tsx
+++ b/apps/docs/features/docs/MdxBase.shared.tsx
@@ -14,6 +14,7 @@ import { CostWarning } from '~/components/AuthSmsProviderConfig/AuthSmsProviderC
 import ButtonCard from '~/components/ButtonCard'
 import { Extensions } from '~/components/Extensions'
 import { JwtGenerator } from '~/components/JwtGenerator'
+import { MetricsStackCards } from '~/components/MetricsStackCards'
 import { NavData } from '~/components/NavData'
 import { Price } from '~/components/Price'
 import { ProjectConfigVariables } from '~/components/ProjectConfigVariables'
@@ -55,6 +56,7 @@ const components = {
   JwtGenerator,
   Link,
   McpConfigPanel,
+  MetricsStackCards,
   NamedCodeBlock,
   NavData,
   ProjectConfigVariables,
diff --git a/apps/docs/public/img/integrations/change-flow.png b/apps/docs/public/img/integrations/change-flow.png
new file mode 100644
index 0000000000000..f6bc213ef5d0e
Binary files /dev/null and b/apps/docs/public/img/integrations/change-flow.png differ
diff --git a/apps/docs/public/img/integrations/change-functions.png b/apps/docs/public/img/integrations/change-functions.png
new file mode 100644
index 0000000000000..015ea58bba2e3
Binary files /dev/null and b/apps/docs/public/img/integrations/change-functions.png differ
diff --git a/apps/docs/public/img/integrations/paas-intro.png b/apps/docs/public/img/integrations/paas-intro.png
new file mode 100644
index 0000000000000..57c7e0f280741
Binary files /dev/null and b/apps/docs/public/img/integrations/paas-intro.png differ
diff --git a/apps/docs/public/img/integrations/revert.png b/apps/docs/public/img/integrations/revert.png
new file mode 100644
index 0000000000000..4dee5ac069f5c
Binary files /dev/null and b/apps/docs/public/img/integrations/revert.png differ
diff --git a/apps/docs/public/img/integrations/rollback.png b/apps/docs/public/img/integrations/rollback.png
new file mode 100644
index 0000000000000..a26998e438e38
Binary files /dev/null and b/apps/docs/public/img/integrations/rollback.png differ
diff --git a/apps/studio/.github/eslint-rule-baselines.json b/apps/studio/.github/eslint-rule-baselines.json
index 016422c7cf99d..7d4c69dac5590 100644
--- a/apps/studio/.github/eslint-rule-baselines.json
+++ b/apps/studio/.github/eslint-rule-baselines.json
@@ -3,7 +3,6 @@
     "react-hooks/exhaustive-deps": 226,
     "import/no-anonymous-default-export": 62,
     "@tanstack/query/exhaustive-deps": 18,
-    "@tanstack/query/no-deprecated-options": 0,
     "@typescript-eslint/no-explicit-any": 1452
   },
   "ruleFiles": {
@@ -255,7 +254,6 @@
       "hooks/analytics/useProjectUsageStats.tsx": 1,
       "hooks/analytics/useSingleLog.tsx": 1
     },
-    "@tanstack/query/no-deprecated-options": {},
     "@typescript-eslint/no-explicit-any": {
       "components/grid/SupabaseGrid.tsx": 1,
       "components/grid/SupabaseGrid.utils.ts": 4,
diff --git a/apps/studio/components/interfaces/APIKeys/APIKeyRow.tsx b/apps/studio/components/interfaces/APIKeys/APIKeyRow.tsx
index 92972a96bdbe0..2763ef352174b 100644
--- a/apps/studio/components/interfaces/APIKeys/APIKeyRow.tsx
+++ b/apps/studio/components/interfaces/APIKeys/APIKeyRow.tsx
@@ -1,3 +1,4 @@
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import type { APIKeysData } from 'data/api-keys/api-keys-query'
 import { motion } from 'framer-motion'
 import { MoreVertical } from 'lucide-react'
@@ -9,7 +10,6 @@ import {
   TableCell,
   TableRow,
 } from 'ui'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 import { APIKeyDeleteDialog } from './APIKeyDeleteDialog'
 import { ApiKeyPill } from './ApiKeyPill'
 
diff --git a/apps/studio/components/interfaces/App/AppBannerWrapper.tsx b/apps/studio/components/interfaces/App/AppBannerWrapper.tsx
index 2e29ae301fbe5..185bb34eabfc7 100644
--- a/apps/studio/components/interfaces/App/AppBannerWrapper.tsx
+++ b/apps/studio/components/interfaces/App/AppBannerWrapper.tsx
@@ -2,12 +2,13 @@ import { PropsWithChildren } from 'react'
 
 import { useFlag } from 'common'
 import { ClockSkewBanner } from 'components/layouts/AppLayout/ClockSkewBanner'
-import IncidentBanner from 'components/layouts/AppLayout/IncidentBanner'
+import { IncidentBanner } from 'components/layouts/AppLayout/IncidentBanner'
 import { NoticeBanner } from 'components/layouts/AppLayout/NoticeBanner'
 import { OrganizationResourceBanner } from '../Organization/HeaderBanner'
 
 export const AppBannerWrapper = ({ children }: PropsWithChildren<{}>) => {
-  const ongoingIncident = useFlag('ongoingIncident')
+  const ongoingIncident =
+    useFlag('ongoingIncident') || process.env.NEXT_PUBLIC_ONGOING_INCIDENT === 'true'
   const showNoticeBanner = useFlag('showNoticeBanner')
   const clockSkewBanner = useFlag('clockSkewBanner')
 
diff --git a/apps/studio/components/interfaces/BranchManagement/Overview.tsx b/apps/studio/components/interfaces/BranchManagement/Overview.tsx
index 8c3e5a8f7fc92..aa498cb98aebf 100644
--- a/apps/studio/components/interfaces/BranchManagement/Overview.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/Overview.tsx
@@ -18,6 +18,7 @@ import { toast } from 'sonner'
 import { useParams } from 'common'
 import { useIsBranching2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
 import { DropdownMenuItemTooltip } from 'components/ui/DropdownMenuItemTooltip'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useBranchQuery } from 'data/branches/branch-query'
 import { useBranchResetMutation } from 'data/branches/branch-reset-mutation'
 import { useBranchUpdateMutation } from 'data/branches/branch-update-mutation'
@@ -34,8 +35,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from 'ui'
-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
+import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
 import { BranchLoader, BranchManagementSection, BranchRow, BranchRowLoader } from './BranchPanels'
 import { EditBranchModal } from './EditBranchModal'
 import { PreviewBranchesEmptyState } from './EmptyStates'
diff --git a/apps/studio/components/interfaces/Database/Functions/DeleteFunction.tsx b/apps/studio/components/interfaces/Database/Functions/DeleteFunction.tsx
index 235e48b656ae0..fcb4c53f8de59 100644
--- a/apps/studio/components/interfaces/Database/Functions/DeleteFunction.tsx
+++ b/apps/studio/components/interfaces/Database/Functions/DeleteFunction.tsx
@@ -1,6 +1,6 @@
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import type { DatabaseFunction } from 'data/database-functions/database-functions-query'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 
 interface DeleteFunctionProps {
   func?: DatabaseFunction
@@ -36,26 +36,24 @@ export const DeleteFunction = ({
   }
 
   return (
-    <>
-      <TextConfirmModal
-        variant={'warning'}
-        visible={visible}
-        onCancel={() => setVisible(null)}
-        onConfirm={handleDelete}
-        title="Delete this function"
-        loading={isLoading}
-        confirmLabel={`Delete function ${name}`}
-        confirmPlaceholder="Type in name of function"
-        confirmString={name ?? 'Unknown'}
-        text={
-          <>
-            <span>This will delete the function</span>{' '}
-            <span className="text-bold text-foreground">{name}</span> <span>from the schema</span>{' '}
-            <span className="text-bold text-foreground">{schema}</span>
-          </>
-        }
-        alert={{ title: 'You cannot recover this function once deleted.' }}
-      />
-    </>
+    <TextConfirmModal
+      variant={'warning'}
+      visible={visible}
+      onCancel={() => setVisible(null)}
+      onConfirm={handleDelete}
+      title="Delete this function"
+      loading={isLoading}
+      confirmLabel={`Delete function ${name}`}
+      confirmPlaceholder="Type in name of function"
+      confirmString={name ?? 'Unknown'}
+      text={
+        <>
+          <span>This will delete the function</span>{' '}
+          <span className="text-bold text-foreground">{name}</span> <span>from the schema</span>{' '}
+          <span className="text-bold text-foreground">{schema}</span>
+        </>
+      }
+      alert={{ title: 'You cannot recover this function once deleted.' }}
+    />
   )
 }
diff --git a/apps/studio/components/interfaces/Database/Hooks/DeleteHookModal.tsx b/apps/studio/components/interfaces/Database/Hooks/DeleteHookModal.tsx
index c9e8146b382be..009a7ab82c814 100644
--- a/apps/studio/components/interfaces/Database/Hooks/DeleteHookModal.tsx
+++ b/apps/studio/components/interfaces/Database/Hooks/DeleteHookModal.tsx
@@ -1,9 +1,9 @@
 import type { PostgresTrigger } from '@supabase/postgres-meta'
 import { toast } from 'sonner'
 
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useDatabaseTriggerDeleteMutation } from 'data/database-triggers/database-trigger-delete-mutation'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 
 interface DeleteHookModalProps {
   visible: boolean
diff --git a/apps/studio/components/interfaces/Database/Replication/DeleteDestination.tsx b/apps/studio/components/interfaces/Database/Replication/DeleteDestination.tsx
index 71c07023815a6..668de169f0ff8 100644
--- a/apps/studio/components/interfaces/Database/Replication/DeleteDestination.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DeleteDestination.tsx
@@ -1,4 +1,4 @@
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 
 interface DeleteDestinationProps {
   visible: boolean
diff --git a/apps/studio/components/interfaces/Database/Triggers/DeleteTrigger.tsx b/apps/studio/components/interfaces/Database/Triggers/DeleteTrigger.tsx
index 092726585e891..868466732e80c 100644
--- a/apps/studio/components/interfaces/Database/Triggers/DeleteTrigger.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/DeleteTrigger.tsx
@@ -1,7 +1,7 @@
 import type { PostgresTrigger } from '@supabase/postgres-meta'
 
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 
 interface DeleteTriggerProps {
   trigger?: PostgresTrigger
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/DeleteCronJob.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/DeleteCronJob.tsx
index cc9772e415ce7..333b66c677516 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/DeleteCronJob.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/DeleteCronJob.tsx
@@ -1,14 +1,14 @@
 import { parseAsString, useQueryState } from 'nuqs'
 import { toast } from 'sonner'
 
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useDatabaseCronJobDeleteMutation } from 'data/database-cron-jobs/database-cron-jobs-delete-mutation'
 import { CronJob } from 'data/database-cron-jobs/database-cron-jobs-infinite-query'
 import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { cleanPointerEventsNoneOnBody } from 'lib/helpers'
-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
+import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
 
 interface DeleteCronJobProps {
   cronJob: CronJob
diff --git a/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/DeleteQueue.tsx b/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/DeleteQueue.tsx
index 7739b1bd4aa09..d56f54563ba08 100644
--- a/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/DeleteQueue.tsx
+++ b/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/DeleteQueue.tsx
@@ -1,9 +1,9 @@
 import { useRouter } from 'next/router'
 import { toast } from 'sonner'
 
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useDatabaseQueueDeleteMutation } from 'data/database-queues/database-queues-delete-mutation'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 
 interface DeleteQueueProps {
   queueName: string
diff --git a/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/PurgeQueue.tsx b/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/PurgeQueue.tsx
index 080d45e854c69..30aee3c40dadb 100644
--- a/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/PurgeQueue.tsx
+++ b/apps/studio/components/interfaces/Integrations/Queues/SingleQueue/PurgeQueue.tsx
@@ -1,8 +1,8 @@
 import { toast } from 'sonner'
 
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useDatabaseQueuePurgeMutation } from 'data/database-queues/database-queues-purge-mutation'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 
 interface PurgeQueueProps {
   queueName: string
diff --git a/apps/studio/components/interfaces/JwtSecrets/jwt-secret-keys-table/index.tsx b/apps/studio/components/interfaces/JwtSecrets/jwt-secret-keys-table/index.tsx
index 44615179bddf1..1f013b58ce8bf 100644
--- a/apps/studio/components/interfaces/JwtSecrets/jwt-secret-keys-table/index.tsx
+++ b/apps/studio/components/interfaces/JwtSecrets/jwt-secret-keys-table/index.tsx
@@ -6,6 +6,7 @@ import { toast } from 'sonner'
 import { useFlag, useParams } from 'common'
 import { useApiKeysVisibility } from 'components/interfaces/APIKeys/hooks/useApiKeysVisibility'
 import { GenericSkeletonLoader } from 'components/ui/ShimmeringLoader'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useLegacyAPIKeysStatusQuery } from 'data/api-keys/legacy-api-keys-status-query'
 import { useJWTSigningKeyDeleteMutation } from 'data/jwt-signing-keys/jwt-signing-key-delete-mutation'
 import { useJWTSigningKeyUpdateMutation } from 'data/jwt-signing-keys/jwt-signing-key-update-mutation'
@@ -37,7 +38,6 @@ import {
   TableHeader,
   TableRow,
 } from 'ui'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 import { SigningKeysComingSoonBanner } from '../signing-keys-coming-soon'
 import { StartUsingJwtSigningKeysBanner } from '../start-using-keys-banner'
 import { ActionPanel } from './action-panel'
diff --git a/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx b/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx
index add718da988f1..4ed15269eb0dc 100644
--- a/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx
+++ b/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx
@@ -4,20 +4,6 @@ import {
   JwtSecretUpdateProgress,
   JwtSecretUpdateStatus,
 } from '@supabase/shared-types/out/events'
-
-import { useFlag, useParams } from 'common'
-import { ButtonTooltip } from 'components/ui/ButtonTooltip'
-import { FormActions } from 'components/ui/Forms/FormActions'
-import Panel from 'components/ui/Panel'
-import { useLegacyAPIKeysStatusQuery } from 'data/api-keys/legacy-api-keys-status-query'
-import { useAuthConfigQuery } from 'data/auth/auth-config-query'
-import { useAuthConfigUpdateMutation } from 'data/auth/auth-config-update-mutation'
-import { useJwtSecretUpdateMutation } from 'data/config/jwt-secret-update-mutation'
-import { useJwtSecretUpdatingStatusQuery } from 'data/config/jwt-secret-updating-status-query'
-import { useProjectPostgrestConfigQuery } from 'data/config/project-postgrest-config-query'
-import { useLegacyJWTSigningKeyQuery } from 'data/jwt-signing-keys/legacy-jwt-signing-key-query'
-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
-import { uuidv4 } from 'lib/helpers'
 import {
   AlertCircle,
   ChevronDown,
@@ -37,6 +23,21 @@ import {
 import Link from 'next/link'
 import { Dispatch, SetStateAction, useState } from 'react'
 import { toast } from 'sonner'
+
+import { useFlag, useParams } from 'common'
+import { ButtonTooltip } from 'components/ui/ButtonTooltip'
+import { FormActions } from 'components/ui/Forms/FormActions'
+import Panel from 'components/ui/Panel'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
+import { useLegacyAPIKeysStatusQuery } from 'data/api-keys/legacy-api-keys-status-query'
+import { useAuthConfigQuery } from 'data/auth/auth-config-query'
+import { useAuthConfigUpdateMutation } from 'data/auth/auth-config-update-mutation'
+import { useJwtSecretUpdateMutation } from 'data/config/jwt-secret-update-mutation'
+import { useJwtSecretUpdatingStatusQuery } from 'data/config/jwt-secret-updating-status-query'
+import { useProjectPostgrestConfigQuery } from 'data/config/project-postgrest-config-query'
+import { useLegacyJWTSigningKeyQuery } from 'data/jwt-signing-keys/legacy-jwt-signing-key-query'
+import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
+import { uuidv4 } from 'lib/helpers'
 import {
   Button,
   DropdownMenu,
@@ -50,7 +51,6 @@ import {
   Modal,
 } from 'ui'
 import { Admonition } from 'ui-patterns/admonition'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 import { number, object } from 'yup'
 import { useApiKeysVisibility } from '../APIKeys/hooks/useApiKeysVisibility'
 import {
diff --git a/apps/studio/components/interfaces/Organization/Documents/DPA.tsx b/apps/studio/components/interfaces/Organization/Documents/DPA.tsx
index 01de3ef79c50a..57a394deafa65 100644
--- a/apps/studio/components/interfaces/Organization/Documents/DPA.tsx
+++ b/apps/studio/components/interfaces/Organization/Documents/DPA.tsx
@@ -7,12 +7,12 @@ import {
   ScaffoldSectionDetail,
 } from 'components/layouts/Scaffold'
 import { InlineLink } from 'components/ui/InlineLink'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useDpaRequestMutation } from 'data/documents/dpa-request-mutation'
 import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
 import { useProfile } from 'lib/profile'
 import { Button } from 'ui'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 
 export const DPA = () => {
   const { profile } = useProfile()
diff --git a/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx b/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx
index ff49221783c6b..2c37fb750ba09 100644
--- a/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx
+++ b/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx
@@ -434,7 +434,7 @@ export const RequestsByCountryMapRenderer = (
   }
 
   return (
-    <div ref={containerRef} className="w-full h-[560px] relative border-t">
+    <div ref={containerRef} className="w-full h-[420px] relative border-t">
       <ComposableMap
         projection="geoMercator"
         projectionConfig={{ scale: 155 }}
diff --git a/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectModal.tsx b/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectModal.tsx
index 4bdac602eebfe..67fd5a83bea62 100644
--- a/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectModal.tsx
+++ b/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectModal.tsx
@@ -4,6 +4,7 @@ import { toast } from 'sonner'
 
 import { LOCAL_STORAGE_KEYS } from 'common'
 import { CANCELLATION_REASONS } from 'components/interfaces/Billing/Billing.constants'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useSendDowngradeFeedbackMutation } from 'data/feedback/exit-survey-send'
 import { useProjectDeleteMutation } from 'data/projects/project-delete-mutation'
 import { useOrgSubscriptionQuery } from 'data/subscriptions/org-subscription-query'
@@ -11,7 +12,6 @@ import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { Input } from 'ui'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 
 export const DeleteProjectModal = ({
   visible,
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/DeleteAnalyticsBucketModal.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/DeleteAnalyticsBucketModal.tsx
index 706ce136ed3d1..0a5b86829c6da 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/DeleteAnalyticsBucketModal.tsx
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/DeleteAnalyticsBucketModal.tsx
@@ -1,9 +1,9 @@
 import { toast } from 'sonner'
 
 import { useParams } from 'common'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useAnalyticsBucketDeleteMutation } from 'data/storage/analytics-bucket-delete-mutation'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 import { useAnalyticsBucketDeleteCleanUp } from './AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities'
 
 export interface DeleteAnalyticsBucketModalProps {
diff --git a/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx b/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx
index c4c52d6982e11..4c6790aa2e4d0 100644
--- a/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx
+++ b/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx
@@ -3,12 +3,12 @@ import { useRouter } from 'next/router'
 import { toast } from 'sonner'
 
 import { useParams } from 'common'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useDatabasePoliciesQuery } from 'data/database-policies/database-policies-query'
 import { useDatabasePolicyDeleteMutation } from 'data/database-policies/database-policy-delete-mutation'
 import { useBucketDeleteMutation } from 'data/storage/bucket-delete-mutation'
 import { Bucket, useBucketsQuery } from 'data/storage/buckets-query'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import { TextConfirmModal } from 'ui-patterns/Dialogs/TextConfirmModal'
 import { formatPoliciesForStorage } from './Storage.utils'
 
 export interface DeleteBucketModalProps {
diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/DeleteVectorBucketModal.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/DeleteVectorBucketModal.tsx
index 8f44eb2d081b7..6d5e656a1746b 100644
--- a/apps/studio/components/interfaces/Storage/VectorBuckets/DeleteVectorBucketModal.tsx
+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/DeleteVectorBucketModal.tsx
@@ -1,12 +1,12 @@
 import { useState } from 'react'
 import { toast } from 'sonner'
 
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useFDWDeleteMutation } from 'data/fdw/fdw-delete-mutation'
 import { useVectorBucketDeleteMutation } from 'data/storage/vector-bucket-delete-mutation'
 import { deleteVectorBucketIndex } from 'data/storage/vector-bucket-index-delete-mutation'
 import { useVectorBucketsIndexesQuery } from 'data/storage/vector-buckets-indexes-query'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 import { useS3VectorsWrapperInstance } from './useS3VectorsWrapperInstance'
 
 export interface DeleteVectorBucketModalProps {
diff --git a/apps/studio/components/layouts/AppLayout/IncidentBanner.tsx b/apps/studio/components/layouts/AppLayout/IncidentBanner.tsx
index f1bd095f398a4..bd92d66a23668 100644
--- a/apps/studio/components/layouts/AppLayout/IncidentBanner.tsx
+++ b/apps/studio/components/layouts/AppLayout/IncidentBanner.tsx
@@ -2,7 +2,7 @@ import Link from 'next/link'
 
 import { HeaderBanner } from 'components/interfaces/Organization/HeaderBanner'
 
-const IncidentBanner = () => {
+export const IncidentBanner = () => {
   return (
     <Link href="https://status.supabase.com" target="_blank" rel="noopener noreferrer">
       <HeaderBanner
@@ -13,5 +13,3 @@ const IncidentBanner = () => {
     </Link>
   )
 }
-
-export default IncidentBanner
diff --git a/apps/studio/components/ui/ProjectSettings/ToggleLegacyApiKeys.tsx b/apps/studio/components/ui/ProjectSettings/ToggleLegacyApiKeys.tsx
index 367a48f7445a9..d7bf50c212f9d 100644
--- a/apps/studio/components/ui/ProjectSettings/ToggleLegacyApiKeys.tsx
+++ b/apps/studio/components/ui/ProjectSettings/ToggleLegacyApiKeys.tsx
@@ -5,6 +5,7 @@ import { toast } from 'sonner'
 import { useParams } from 'common'
 import { useApiKeysVisibility } from 'components/interfaces/APIKeys/hooks/useApiKeysVisibility'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useToggleLegacyAPIKeysMutation } from 'data/api-keys/legacy-api-key-toggle-mutation'
 import { useLegacyAPIKeysStatusQuery } from 'data/api-keys/legacy-api-keys-status-query'
 import { useLegacyJWTSigningKeyQuery } from 'data/jwt-signing-keys/legacy-jwt-signing-key-query'
@@ -21,7 +22,6 @@ import {
   AlertDialogHeader,
   AlertDialogTitle,
 } from 'ui'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 import Panel from '../Panel'
 
 export const ToggleLegacyApiKeysPanel = () => {
diff --git a/apps/studio/components/ui/TextConfirmModalWrapper.tsx b/apps/studio/components/ui/TextConfirmModalWrapper.tsx
new file mode 100644
index 0000000000000..1762e7e827c74
--- /dev/null
+++ b/apps/studio/components/ui/TextConfirmModalWrapper.tsx
@@ -0,0 +1,8 @@
+import { useFlag } from 'common'
+import { ComponentPropsWithoutRef } from 'react'
+import { TextConfirmModal as TextConfirmModalBase } from 'ui-patterns/Dialogs/TextConfirmModal'
+
+export const TextConfirmModal = (props: ComponentPropsWithoutRef<typeof TextConfirmModalBase>) => {
+  const enableCopyConfirmation = useFlag('textConfirmationModalClickToCopy')
+  return <TextConfirmModalBase {...props} enableCopy={enableCopyConfirmation} />
+}
diff --git a/apps/studio/package.json b/apps/studio/package.json
index 5ec23a004d77f..a0788e72755f9 100644
--- a/apps/studio/package.json
+++ b/apps/studio/package.json
@@ -8,7 +8,7 @@
     "build": "next build && if [ \"$SKIP_ASSET_UPLOAD\" != \"1\" ]; then ./../../scripts/upload-static-assets.sh; fi",
     "start": "next start -p 8082",
     "lint": "eslint .",
-    "lint:ratchet": "tsx scripts/ratchet-eslint-rules.ts --rule react-hooks/exhaustive-deps --rule import/no-anonymous-default-export --rule @tanstack/query/exhaustive-deps --rule @tanstack/query/no-deprecated-options --rule @typescript-eslint/no-explicit-any",
+    "lint:ratchet": "tsx scripts/ratchet-eslint-rules.ts --rule react-hooks/exhaustive-deps --rule import/no-anonymous-default-export --rule @tanstack/query/exhaustive-deps --rule @typescript-eslint/no-explicit-any",
     "clean": "rimraf node_modules tsconfig.tsbuildinfo .next .turbo",
     "test": "vitest --run --coverage",
     "test:watch": "vitest watch",
diff --git a/apps/studio/pages/project/[ref]/branches/index.tsx b/apps/studio/pages/project/[ref]/branches/index.tsx
index 5805ad4ce2e9c..cf123689738f3 100644
--- a/apps/studio/pages/project/[ref]/branches/index.tsx
+++ b/apps/studio/pages/project/[ref]/branches/index.tsx
@@ -8,13 +8,14 @@ import { toast } from 'sonner'
 import { useParams } from 'common'
 import { Overview } from 'components/interfaces/BranchManagement/Overview'
 import BranchLayout from 'components/layouts/BranchLayout/BranchLayout'
-import DefaultLayout from 'components/layouts/DefaultLayout'
+import { DefaultLayout } from 'components/layouts/DefaultLayout'
 import { PageLayout } from 'components/layouts/PageLayout/PageLayout'
 import { ScaffoldContainer, ScaffoldSection } from 'components/layouts/Scaffold'
-import AlertError from 'components/ui/AlertError'
+import { AlertError } from 'components/ui/AlertError'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import { DocsButton } from 'components/ui/DocsButton'
-import NoPermission from 'components/ui/NoPermission'
+import { NoPermission } from 'components/ui/NoPermission'
+import { TextConfirmModal } from 'components/ui/TextConfirmModalWrapper'
 import { useBranchDeleteMutation } from 'data/branches/branch-delete-mutation'
 import { Branch, useBranchesQuery } from 'data/branches/branches-query'
 import { useGitHubConnectionsQuery } from 'data/integrations/github-connections-query'
@@ -26,7 +27,6 @@ import { DOCS_URL } from 'lib/constants'
 import { useAppStateSnapshot } from 'state/app-state'
 import type { NextPageWithLayout } from 'types'
 import { Button } from 'ui'
-import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal'
 
 const BranchesPage: NextPageWithLayout = () => {
   const router = useRouter()
diff --git a/apps/www/_blog/2025-07-14-supabase-ui-platform-kit.mdx b/apps/www/_blog/2025-07-14-supabase-ui-platform-kit.mdx
index b15e807f388cc..65de7374d8574 100644
--- a/apps/www/_blog/2025-07-14-supabase-ui-platform-kit.mdx
+++ b/apps/www/_blog/2025-07-14-supabase-ui-platform-kit.mdx
@@ -95,7 +95,7 @@ Display all the data in your database:
 
 The library is 100% shadcn/ui compatible by leveraging the [component registry](https://x.com/shadcn/status/1829646556318089509) feature. Components are styled with shadcn/ui and Tailwind CSS and are completely customizable. Read the [original launch post](https://supabase.com/blog/supabase-ui-library) for more details, or check out the docs: [ui.supabase.com](https://supabase.com/ui)
 
-## Supabase as a Service
+## Supabase for Platforms
 
 While we started Supabase as Service directly for developers, more and more companies are building on top of Supabase to provide critical infrastructure for their own users. Today, [30% of Supabase sign ups](https://x.com/kiwicopple/status/1894251335224320000) can be attributed to some sort of AI Builder:
 
diff --git a/apps/www/_blog/2025-12-05-introducing-supabase-for-platforms.mdx b/apps/www/_blog/2025-12-05-introducing-supabase-for-platforms.mdx
new file mode 100644
index 0000000000000..610d223f2d2b5
--- /dev/null
+++ b/apps/www/_blog/2025-12-05-introducing-supabase-for-platforms.mdx
@@ -0,0 +1,174 @@
+---
+title: 'Introducing Supabase for Platforms'
+description: Use Supabase as a platform for your own business and tools
+author: wenbo
+image: 2025-12-05-introducing-supabase-for-platforms/og.png
+thumb: 2025-12-05-introducing-supabase-for-platforms/thumb.png
+categories:
+  - product
+  - launch-week
+date: '2025-12-05'
+toc_depth: 2
+---
+
+Today, we're launching **Supabase for Platforms**—a white-label offering that lets platforms provision and manage fully managed backends on behalf of their users.
+
+AI builders and agentic coding have fundamentally changed how software gets built in 2025. Supabase has become the default backend for this shift, with [Lovable](https://lovable.dev), [Bolt.new](https://bolt.new), Vercel's [v0](https://v0.app), [Figma Make](https://www.figma.com/make), and many others building on top of Supabase projects owned by their users to develop full-stack applications. The growth has been staggering:
+
+- Lovable has nearly 8 million users. The company hit $100 million in ARR just eight months after launch, then doubled to $200 million four months later. Users create more than 100,000 new apps on the platform every day.
+- Bolt.new has about 5 million users. The company reached $4 million in ARR just 30 days after launch, $20 million in two months, and $40 million in five months.
+
+But as these platforms scaled, we heard consistent feedback: they wanted a more seamless flow so their users don't have to think at all about provisioning and configuring their backends. That's when **Supabase for Platforms** was born.
+
+Leading AI builders like Lovable, Bolt.new, and Baidu's [MeDo](https://medo.dev) have already started using **Supabase for Platforms** to create millions of Supabase projects in the last few months alone, making full-stack development more accessible and easier than ever.
+
+And while AI builders are leading the way, **Supabase for Platforms** is built for any platform or tool that wants to offer managed backends.
+
+# What is Supabase for Platforms?
+
+**Supabase for Platforms** lets you white-label Supabase and provision backends for your users—all managed through our [Management API](/docs/reference/api/introduction) or [remote MCP Server](/docs/guides/getting-started/mcp).
+
+Your users get the full Supabase stack:
+
+- Database (Postgres)
+- Auth
+- Edge Functions
+- Storage
+- Realtime
+
+You control the entire experience. Your users get the full power of Supabase.
+
+With **Supabase for Platforms**, you can:
+
+- Offer a complete white-label backend to your users entirely powered by Supabase
+- Pay only for compute hours consumed with our newest Pico instances that scale to zero
+- Access features purpose-built for managing backends on behalf of your users
+- Embed a lightweight Supabase Dashboard directly in your app through Platform Kit, so your users never leave your tooling
+- Let your users "claim" (transfer) their projects to their own Supabase orgs whenever they're ready, while you maintain access to those projects through OAuth integration
+
+**Supabase for Platforms** and the full feature set is available to select AI Builders. [Contact us](/solutions/ai-builders#talk-to-partnerships-team) if you'd like to get started.
+
+# How does it work?
+
+Some AI builders want to manage infrastructure on behalf of their users. With a central organization, you create and own projects in your Supabase org. Users can claim those projects into their own Supabase org later if they want full control.
+
+This model works well when your users don't know or care about infrastructure. You handle the complexity—they focus on features.
+
+<Admonition title='Want users to bring their own Supabase accounts instead?'>
+
+With [OAuth integrations](/docs/guides/integrations/build-a-supabase-integration), users connect their existing Supabase org to your tool. They own and manage their projects directly, and you get API access to help them build.
+
+This model works well when your users are developers who already use Supabase or want more control from the start.
+
+</Admonition>
+
+[Contact us](/solutions/ai-builders#talk-to-partnerships-team) to enable central organization management.
+
+# Features available today
+
+These features are available through the [Management API](/docs/reference/api/introduction) or [remote MCP Server](/docs/guides/getting-started/mcp) right now.
+
+## Launch projects
+
+Create projects programmatically. We highly recommend using smart region selection to ensure capacity.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#launching-projects)
+
+## Manage configuration
+
+Update settings for Auth, Data API (PostgREST), Edge Functions, Storage, and Realtime through the Management API. Every setting in the Supabase Dashboard is available for configuration programmatically.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#configuration-changes)
+
+## Deploy Edge Functions
+
+Deploy functions directly through the API. No CLI required.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#deploying-edge-functions)
+
+## Change compute sizes
+
+Upgrade or downgrade compute as your users' needs change.
+
+[Docs](docs/guides/integrations/supabase-for-platforms#changing-compute-sizes)
+
+## Run security checks
+
+Use the security advisor API to check projects before deploying to production. Catch issues before your users, and their users, do.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#security-checks-for-production)
+
+## API keys
+
+Get and manage API keys for each project. We recommend using the `publishable` and `secret` API keys instead of the legacy `anon` and `service_role` keys.
+
+For more information, read the announcement [here](https://github.com/orgs/supabase/discussions/29260).
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#recommended-api-keys)
+
+## Development Environments
+
+Create ephemeral development environments for each project using branching. Your users can make changes safely on a branch, then merge to production. If something goes wrong, destroy the branch and start fresh based off production.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#creating-a-dev-branch)
+
+## Platform Kit
+
+<div className="video-container mb-8">
+  <iframe
+    className="w-full"
+    src="https://xguihxuzqibwxjnimxev.supabase.co/storage/v1/object/public/videos/marketing/blog/platform-kit/platform-kit.mp4"
+    title="Supabase UI: Platform Kit"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; fullscreen; gyroscope; picture-in-picture; web-share"
+    allowfullscreen
+    autoplay
+    muted
+    loop
+    playsInline
+  />
+</div>
+
+We built [Platform Kit](/ui/docs/platform/platform-kit), a collection of UI components for the Management API. Embed a lightweight version of the Supabase Dashboard directly in your app. Your users can manage their backend without leaving your product.
+
+[Docs](/ui/docs/platform/platform-kit)
+
+# Features available to select AI Builders
+
+These features are available to a subset of our AI Builder customers. [Contact us](/solutions/ai-builders#talk-to-partnerships-team) to get access.
+
+## Compute that scales to zero
+
+We offer Pico instances that scale to zero when not in use. This is ideal for platforms with many projects that have variable usage. You only pay for what your users actually use.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#pico-compute-instance)
+
+## Restore points
+
+Once you have development environments, create restore points after every backend change. Roll back if something goes wrong. This gives your users confidence as they’re developing.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#create-a-restore-point)
+
+## Database migrations
+
+Run schema migrations through the API. Changes are tracked automatically. If a migration fails, it rolls back.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#make-database-changes)
+
+## Claim flow
+
+Let users transfer projects from your organization to their own. You retain API access to continue helping them build. They get full ownership and control.
+
+This is useful when users want to eventually manage their own infrastructure and billing.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#claim-flow)
+
+# Recommended development flow
+
+Supabase stores data. You cannot simply roll back production changes without risking data loss. Check out the [docs](/docs/guides/integrations/supabase-for-platforms#development-workflow) for our recommended dev/production workflow.
+
+[Docs](/docs/guides/integrations/supabase-for-platforms#development-workflow)
+
+## Get started
+
+- [Read the documentation](/docs/guides/platform/supabase-for-platforms)
+- [Contact us](/solutions/ai-builders#talk-to-partnerships-team) if you're building an AI platform or coding tool
diff --git a/apps/www/_blog/2025-12-05-realtime-broadcast-replay.mdx b/apps/www/_blog/2025-12-05-realtime-broadcast-replay.mdx
new file mode 100644
index 0000000000000..d6b0e22aa72fd
--- /dev/null
+++ b/apps/www/_blog/2025-12-05-realtime-broadcast-replay.mdx
@@ -0,0 +1,150 @@
+---
+title: 'Realtime: Broadcast Replay'
+description: ''
+author: eduardo_gurgel
+image: 2025-12-05-realtime-broadcast-replay/og.png
+thumb: 2025-12-05-realtime-broadcast-replay/thumb.png
+categories:
+  - product
+tags:
+  - realtime
+date: '2025-12-05'
+toc_depth: 2
+---
+
+Today we're releasing Broadcast Replay for Realtime - a powerful new feature that enables private channels to access messages that were sent earlier, ensuring your users never miss critical updates.
+
+## The Challenge: Missing Important Messages in Real-time Applications
+
+Building real-time applications comes with unique challenges. What happens when:
+
+- A user's connection drops momentarily?
+- Someone joins a collaborative session mid-way?
+- A page reload occurs during an important update?
+- Network interruptions cause missed messages?
+
+Previously, these scenarios meant lost context and degraded user experiences. Users would miss important messages sent while they were disconnected, and developers had to implement complex workarounds to maintain state consistency.
+
+## Introducing Broadcast Replay
+
+Broadcast Replay solves these challenges by allowing private channels to retrieve messages that were sent before a client connected or while they were disconnected. This feature integrates seamlessly with our existing [Broadcast from Database](/docs/guides/realtime/broadcast#broadcast-from-the-database) functionality, storing messages in the `realtime.messages` table for up to 3 days.
+
+It leverages the messages already stored when using Broadcast from Database. When you enable replay on a private channel, Realtime queries the partitioned `realtime.messages` table to retrieve historical messages based on your configuration.
+
+The replay configuration accepts two parameters:
+
+- **`since`** (required): Unix timestamp in milliseconds specifying the earliest point from which messages should be retrieved;
+- **`limit`** (optional): Number of messages to return (1-25, useful for preventing information overload).
+
+You can see Broadcast Replay in action at [https://multiplayer.dev](https://multiplayer.dev/), where the chat box demonstrates how users can access historical messages when joining or reconnecting to a conversation.
+
+## Real-World Use Cases
+
+### Chat Applications
+
+Display the most recent messages when users enter a chat room, providing immediate context without complex state management:
+
+```jsx
+const chatChannel = supabase.channel(`chat:${roomId}`, {
+  config: {
+    private: true,
+    broadcast: {
+      replay: {
+        since: Date.now() - 300000, // Last 5 minutes
+        limit: 25, // Show last 25 messages
+      },
+    },
+  },
+})
+```
+
+### Live Sports Updates
+
+Ensure fans never miss crucial moments, even after connection issues:
+
+```jsx
+const gameChannel = supabase.channel(`game:${matchId}:key-events`, {
+  config: {
+    private: true,
+    broadcast: {
+      replay: {
+        since: matchStartTime, // Replay from match start
+        limit: 20, // Show key events
+      },
+    },
+  },
+})
+```
+
+### Collaborative Editing
+
+Highlight recent changes in documents when users return:
+
+```jsx
+const docChannel = supabase.channel(`doc:${documentId}`, {
+  config: {
+    private: true,
+    broadcast: {
+      replay: {
+        since: lastSeenTimestamp, // Changes since last visit
+        limit: 15,
+      },
+    },
+  },
+})
+```
+
+## Working with Replayed Messages
+
+The triggered events are now enriched with metadata to recognise replayed messages.
+
+```jsx
+{
+    "event": "message",
+    "meta": {
+      "id": "55f92208-37c8-4c7b-930d-756f14586e55",
+      "replayed": true
+    },
+    "payload": {
+      "content": "Hello world",
+      "createdAt": "2025-11-12T15:41:22Z",
+      "id": "3f0e4cdf-f886-4b2c-b132-1cedb5c55acc",
+      "username": "supabasito"
+    },
+    "type": "broadcast"
+}
+```
+
+One can use the `meta.replayed` field to handle historical and live messages differently:
+
+```jsx
+// Broadcast callback receives meta field
+channel.on('broadcast', { event: 'chat_message' }, (payload) => {
+	const chatMessage = payload.payload as ChatMessage
+	// Render replayed messages with a different aspect
+	chatMessage.replayed = payload?.meta?.replayed ?? false
+	setMessages((current) => [...current, chatMessage])
+})
+```
+
+## Availability
+
+Broadcast Replay is available today in **Public Alpha**. This feature requires:
+
+- Supabase JavaScript client version 2.74.0 or later
+- Messages sent via [Broadcast from Database](/docs/guides/realtime/broadcast#broadcast-from-the-database)
+- Private channels with appropriate RLS policies
+
+We're actively seeking feedback to refine this feature. If you encounter any issues or have suggestions, please [submit a support ticket](https://supabase.help/).
+
+Check out our [documentation](/docs/guides/realtime/broadcast#broadcast-replay) for detailed implementation guides and more examples.
+
+<div className="video-container">
+  <iframe
+    className="w-full"
+    src="https://www.youtube-nocookie.com/embed/scbQlEH3pRc"
+    title="Introducing Realtime Broadcast Replay"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; fullscreen; gyroscope; picture-in-picture; web-share"
+    allowfullscreen
+  />
+</div>
diff --git a/apps/www/components/Solutions/CTAForm.tsx b/apps/www/components/Solutions/CTAForm.tsx
index c289d2895cf19..736b48f6cf8b0 100644
--- a/apps/www/components/Solutions/CTAForm.tsx
+++ b/apps/www/components/Solutions/CTAForm.tsx
@@ -7,30 +7,45 @@ interface Props {}
 
 const UseCases: FC<Props> = () => {
   return (
-    <SectionContainer className="text grid gap-8 lg:gap-12 md:grid-cols-2 xl:pt-20">
+    <SectionContainer
+      id="talk-to-partnerships-team"
+      className="text grid gap-8 lg:gap-12 md:grid-cols-2 xl:pt-20 scroll-mt-20"
+    >
       <div className="md:h-full w-full flex flex-col justify-between gap-4 lg:gap-8">
         <div className="flex flex-col gap-2 md:max-w-md">
           <h1 className="h1 !m-0">
             Talk to our
-            <br className="hidden md:block" /> partnership team
+            <br className="hidden md:block" /> Partnerships team
           </h1>
           <p className="md:text-lg text-foreground-lighter">
             Explore custom pricing and infrastructure options.
           </p>
         </div>
-        <ConnectCallout className="hidden md:flex" />
+        <PlatformConnectCallout className="hidden md:flex" />
+        <OAuthConnectCallout className="hidden md:flex" />
       </div>
+      <PlatformConnectCallout className="md:hidden" />
+      <OAuthConnectCallout className="md:hidden" />
       <TalkToPartnershipTeamForm />
-      <ConnectCallout className="md:hidden" />
     </SectionContainer>
   )
 }
 
-const ConnectCallout: FC<{ className?: string }> = ({ className }) => (
+const PlatformConnectCallout: FC<{ className?: string }> = ({ className }) => (
   <div className={cn('border rounded-lg p-4 md:p-6 bg-surface-75 flex flex-col gap-2', className)}>
-    <h5>Connect your app to Supabase now</h5>
+    <h5>Supabase for Platforms</h5>
     <p className="text-foreground-lighter">
-      Set up a Supabase OAuth app so your users can start interacting with their Supabase Project.
+      White label Supabase backends for your platform or tools.
+    </p>
+    <TextLink url="/docs/guides/integrations/supabase-for-platforms" label="View docs" />
+  </div>
+)
+
+const OAuthConnectCallout: FC<{ className?: string }> = ({ className }) => (
+  <div className={cn('border rounded-lg p-4 md:p-6 bg-surface-75 flex flex-col gap-2', className)}>
+    <h5>Connect your app to your user's Supabase org now</h5>
+    <p className="text-foreground-lighter">
+      Set up a Supabase OAuth app so you can start interacting with your user's Supabase project.
     </p>
     <TextLink
       url="https://supabase.com/docs/guides/integrations/build-a-supabase-integration"
diff --git a/apps/www/components/Solutions/FeaturesGrid.tsx b/apps/www/components/Solutions/FeaturesGrid.tsx
index 9d4b36654bbbe..315fefde3e655 100644
--- a/apps/www/components/Solutions/FeaturesGrid.tsx
+++ b/apps/www/components/Solutions/FeaturesGrid.tsx
@@ -6,12 +6,11 @@ import SectionContainer from '../Layouts/SectionContainer'
 
 export default function FeaturesGrid(props: any) {
   const hasExtendedCards = props.features.some(
-    (f: any) =>
-      f.id === 'project-claim-flow' || f.id === 'platform-kit' || f.id === 'pico-instances'
+    (f: any) => f.id === 'claim-flow' || f.id === 'platform-kit' || f.id === 'pico-instances'
   )
 
   return (
-    <SectionContainer className="flex flex-col gap-4 xl:pt-20">
+    <SectionContainer id={props.id} className="flex flex-col gap-4 xl:pt-20 scroll-mt-20">
       <div className="flex flex-col gap-2 max-w-xl">
         <h2 className="h2 text-foreground-lighter !m-0">{props.heading}</h2>
         <p className="p !text-foreground-lighter max-w-md">{props.subheading}</p>
@@ -40,7 +39,7 @@ export default function FeaturesGrid(props: any) {
             [&_.next-image--dynamic-fill]:rounded-none"
         />
         <Content card={props.features.find((f: any) => f.id === 'branching')} />
-        <Content card={props.features.find((f: any) => f.id === 'project-claim-flow')} />
+        <Content card={props.features.find((f: any) => f.id === 'claim-flow')} />
         <Content card={props.features.find((f: any) => f.id === 'platform-kit')} />
         <Content
           card={props.features.find((f: any) => f.id === 'pico-instances')}
diff --git a/apps/www/components/Solutions/features-grid.module.css b/apps/www/components/Solutions/features-grid.module.css
index bd97fe909ccb9..b80608570ddca 100644
--- a/apps/www/components/Solutions/features-grid.module.css
+++ b/apps/www/components/Solutions/features-grid.module.css
@@ -16,7 +16,7 @@
   grid-template-areas:
     'postgres            mgmt-api'
     'pricing             branching'
-    'project-claim-flow  platform-kit'
+    'claim-flow  platform-kit'
     'pico-instances      pico-instances';
 }
 
@@ -24,7 +24,7 @@
   .features-grid-extended {
     grid-template-areas:
       'postgres     mgmt-api            mgmt-api'
-      'pricing      branching           project-claim-flow'
+      'pricing      branching           claim-flow'
       'platform-kit pico-instances      pico-instances';
   }
 }
diff --git a/apps/www/data/solutions/ai-builders.tsx b/apps/www/data/solutions/ai-builders.tsx
index 383d8eaadeb2c..cd0247c152999 100644
--- a/apps/www/data/solutions/ai-builders.tsx
+++ b/apps/www/data/solutions/ai-builders.tsx
@@ -43,8 +43,8 @@ const data: {
         type: 'primary' as any,
       },
       {
-        label: 'Connect your app',
-        href: 'https://supabase.com/docs/guides/integrations/build-a-supabase-integration',
+        label: 'Build your integration',
+        href: '/solutions/ai-builders#talk-to-partnerships-team',
         type: 'default' as any,
       },
     ],
@@ -181,8 +181,8 @@ const data: {
     ],
   },
   features: {
-    id: 'features',
-    heading: <span className="text-foreground">Supabase as a Service</span>,
+    id: 'supabase-for-platforms',
+    heading: <span className="text-foreground">Supabase for Platforms</span>,
     subheading:
       'Build a delightful next-generation tools experience for your customers, backed by a powerful white-label Supabase backend.',
     features: [
@@ -491,17 +491,6 @@ const data: {
             backend.
           </>
         ),
-        img: (
-          <Image
-            src={{
-              dark: '/images/solutions/ai-builders/mgmt-api-permissions-dark.png',
-              light: '/images/solutions/ai-builders/mgmt-api-permissions-light.png',
-            }}
-            alt="Management Api Permissions panel"
-            width={900}
-            height={900}
-          />
-        ),
       },
       {
         id: 'branching',
@@ -549,14 +538,14 @@ const data: {
         ),
         subheading: (
           <>
-            <span className="text-foreground">Offer production and development branches.</span>{' '}
-            Enable your customers to deploy and test changes without affecting their main production
+            <span className="text-foreground">Offer development branches.</span> Enable your
+            customers to deploy and test changes without affecting their main production
             applications.
           </>
         ),
       },
       {
-        id: 'project-claim-flow',
+        id: 'claim-flow',
         icon: Timer,
         heading: (
           <>
@@ -582,7 +571,7 @@ const data: {
                 strokeLinejoin="round"
               />
             </svg>
-            Project claim flow
+            Claim flow
           </>
         ),
         subheading: (
@@ -636,7 +625,7 @@ const data: {
             <span className="text-foreground">
               UI components for the Management API that you can embed directly in your app
             </span>{' '}
-            so they never have to leave it to interact with their project.
+            so your users never have to leave it to interact with their projects.
           </>
         ),
       },
@@ -681,7 +670,7 @@ const data: {
                 strokeLinejoin="round"
               />
             </svg>
-            Compute instance on shared architecture
+            Pico instances
           </>
         ),
         subheading: (
diff --git a/apps/www/lib/authors.json b/apps/www/lib/authors.json
index 5f558251d573b..6952903225472 100644
--- a/apps/www/lib/authors.json
+++ b/apps/www/lib/authors.json
@@ -777,5 +777,13 @@
     "position": "Engineering",
     "author_url": "https://twitter.com/the_ross_man",
     "author_image_url": "https://github.com/mattrossman.png"
+  },
+  {
+    "author_id": "eduardo_gurgel",
+    "author": "Eduardo Gurgel",
+    "username": "edgurgel",
+    "position": "Engineering",
+    "author_url": "https://github.com/edgurgel",
+    "author_image_url": "https://github.com/edgurgel.png"
   }
 ]
diff --git a/apps/www/lib/redirects.js b/apps/www/lib/redirects.js
index 82446afdb164b..7a5a4214d5cb8 100644
--- a/apps/www/lib/redirects.js
+++ b/apps/www/lib/redirects.js
@@ -2434,6 +2434,11 @@ module.exports = [
     source: '/docs/guides/platform/oauth-apps/authorize-an-oauth-app',
     destination: '/docs/guides/platform/oauth-apps/build-a-supabase-integration',
   },
+  {
+    permanent: true,
+    source: '/docs/guides/platform/oauth-apps/build-a-supabase-integration',
+    destination: '/docs/guides/platform/oauth-apps/build-a-supabase-oauth-integration',
+  },
   { permanent: true, source: '/docs/reference/cli/config', destination: '/docs/guides/cli/config' },
   {
     permanent: true,
diff --git a/apps/www/pages/solutions/ai-builders.tsx b/apps/www/pages/solutions/ai-builders.tsx
index 84a624df9fef7..fdaee1a7398a0 100644
--- a/apps/www/pages/solutions/ai-builders.tsx
+++ b/apps/www/pages/solutions/ai-builders.tsx
@@ -1,6 +1,8 @@
 import { NextPage } from 'next'
 import dynamic from 'next/dynamic'
 import { NextSeo } from 'next-seo'
+import { useRouter } from 'next/router'
+import { useEffect } from 'react'
 
 import Layout from 'components/Layouts/Default'
 import ProductHeader from 'components/Sections/ProductHeader2'
@@ -16,38 +18,54 @@ const FeaturesGrid = dynamic(() => import('components/Solutions/FeaturesGrid'))
 const VideosSection = dynamic(() => import('components/Solutions/Videos'))
 const CTAForm = dynamic(() => import('components/Solutions/CTAForm'))
 
-const Enterprise: NextPage = () => (
-  <>
-    <NextSeo
-      title={content.metadata.metaTitle}
-      description={content.metadata.metaDescription}
-      openGraph={{
-        title: content.metadata.metaTitle,
-        description: content.metadata.metaDescription,
-        url: `https://supabase.com/solutions/ai-builders`,
-        images: [
-          {
-            url: `/images/solutions/ai-builders/ai-builders-og.png`,
-          },
-        ],
-      }}
-    />
-    <Layout className="overflow-visible">
-      <SolutionsStickyNav activeItem={Solutions.aiBuilders} type="skill-based" />
-      <ProductHeader
-        {...content.heroSection}
-        className="[&_h1]:2xl:!text-5xl bg-default border-0 lg:pb-8 [&_.ph-footer]:mt-0 [&_.ph-footer]:lg:mt-16 [&_.ph-footer]:xl:mt-32"
-        sectionContainerClassName="lg:gap-4"
-        footer={<AIBuildersLogos className="mt-16 md:mt-0" />}
-        footerPosition="left"
+const Enterprise: NextPage = () => {
+  const { asPath } = useRouter()
+
+  useEffect(() => {
+    const hash = asPath.split('#')[1]
+    if (!hash) return
+
+    setTimeout(() => {
+      const element = document.getElementById(hash)
+      if (element) {
+        element.scrollIntoView({ behavior: 'smooth' })
+      }
+    }, 100)
+  }, [asPath])
+
+  return (
+    <>
+      <NextSeo
+        title={content.metadata.metaTitle}
+        description={content.metadata.metaDescription}
+        openGraph={{
+          title: content.metadata.metaTitle,
+          description: content.metadata.metaDescription,
+          url: `https://supabase.com/solutions/ai-builders`,
+          images: [
+            {
+              url: `/images/solutions/ai-builders/ai-builders-og.png`,
+            },
+          ],
+        }}
       />
-      <Quotes {...content.quotes} />
-      <WhySupabase {...content.why} />
-      <FeaturesGrid {...content.features} />
-      <VideosSection {...content.testimonials} />
-      <CTAForm />
-    </Layout>
-  </>
-)
+      <Layout className="overflow-visible">
+        <SolutionsStickyNav activeItem={Solutions.aiBuilders} type="skill-based" />
+        <ProductHeader
+          {...content.heroSection}
+          className="[&_h1]:2xl:!text-5xl bg-default border-0 lg:pb-8 [&_.ph-footer]:mt-0 [&_.ph-footer]:lg:mt-16 [&_.ph-footer]:xl:mt-32"
+          sectionContainerClassName="lg:gap-4"
+          footer={<AIBuildersLogos className="mt-16 md:mt-0" />}
+          footerPosition="left"
+        />
+        <Quotes {...content.quotes} />
+        <WhySupabase {...content.why} />
+        <FeaturesGrid {...content.features} />
+        <VideosSection {...content.testimonials} />
+        <CTAForm />
+      </Layout>
+    </>
+  )
+}
 
 export default Enterprise
diff --git a/apps/www/public/images/blog/2025-12-05-introducing-supabase-for-platforms/og.png b/apps/www/public/images/blog/2025-12-05-introducing-supabase-for-platforms/og.png
new file mode 100644
index 0000000000000..a2cd4a48998d2
Binary files /dev/null and b/apps/www/public/images/blog/2025-12-05-introducing-supabase-for-platforms/og.png differ
diff --git a/apps/www/public/images/blog/2025-12-05-introducing-supabase-for-platforms/thumb.png b/apps/www/public/images/blog/2025-12-05-introducing-supabase-for-platforms/thumb.png
new file mode 100644
index 0000000000000..4cf7d9abf328b
Binary files /dev/null and b/apps/www/public/images/blog/2025-12-05-introducing-supabase-for-platforms/thumb.png differ
diff --git a/apps/www/public/images/blog/2025-12-05-realtime-broadcast-replay/og.png b/apps/www/public/images/blog/2025-12-05-realtime-broadcast-replay/og.png
new file mode 100644
index 0000000000000..1ad604971fc5b
Binary files /dev/null and b/apps/www/public/images/blog/2025-12-05-realtime-broadcast-replay/og.png differ
diff --git a/apps/www/public/images/blog/2025-12-05-realtime-broadcast-replay/thumb.png b/apps/www/public/images/blog/2025-12-05-realtime-broadcast-replay/thumb.png
new file mode 100644
index 0000000000000..1ad604971fc5b
Binary files /dev/null and b/apps/www/public/images/blog/2025-12-05-realtime-broadcast-replay/thumb.png differ
diff --git a/apps/www/public/rss.xml b/apps/www/public/rss.xml
index 66f98bfb793e8..d7cf01f09d780 100644
--- a/apps/www/public/rss.xml
+++ b/apps/www/public/rss.xml
@@ -7,6 +7,13 @@
       <lastBuildDate>Thu, 04 Dec 2025 00:00:00 -0700</lastBuildDate>
       <atom:link href="https://supabase.com/rss.xml" rel="self" type="application/rss+xml"/>
       <item>
+  <guid>https://supabase.com/blog/introducing-supabase-for-platforms</guid>
+  <title>Introducing Supabase for Platforms</title>
+  <link>https://supabase.com/blog/introducing-supabase-for-platforms</link>
+  <description>White-label Supabase backends for your platform or tools</description>
+  <pubDate>Thu, 05 Dec 2025 00:00:00 -0700</pubDate>
+</item>
+<item>
   <guid>https://supabase.com/blog/adding-async-streaming-to-pg-fdw</guid>
   <title>Adding Async Streaming to Postgres Foreign Data Wrappers</title>
   <link>https://supabase.com/blog/adding-async-streaming-to-pg-fdw</link>
diff --git a/packages/eslint-config-supabase/next.js b/packages/eslint-config-supabase/next.js
index b59b28777b2af..22f88d362252b 100644
--- a/packages/eslint-config-supabase/next.js
+++ b/packages/eslint-config-supabase/next.js
@@ -21,7 +21,7 @@ const tanstackQueryConfig = {
   plugins: { '@tanstack/query': fixupPluginRules(tanstackQuery) },
   rules: {
     '@tanstack/query/exhaustive-deps': 'warn',
-    '@tanstack/query/no-deprecated-options': 'warn',
+    '@tanstack/query/no-deprecated-options': 'error',
     '@tanstack/query/prefer-query-object-syntax': 'warn',
     '@tanstack/query/stable-query-client': 'warn',
   },
diff --git a/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx b/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx
index a9e6547d870dc..dbf6428403d78 100644
--- a/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx
+++ b/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx
@@ -1,7 +1,8 @@
 'use client'
 
 import { zodResolver } from '@hookform/resolvers/zod'
-import { ReactNode, forwardRef, useEffect } from 'react'
+import { Check, Copy } from 'lucide-react'
+import { ReactNode, forwardRef, useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import {
   Alert_Shadcn_,
@@ -20,6 +21,7 @@ import {
   Form_Shadcn_,
   Input_Shadcn_,
   cn,
+  copyToClipboard,
 } from 'ui'
 import { DialogHeader } from 'ui/src/components/shadcn/ui/dialog'
 import { z } from 'zod'
@@ -49,6 +51,7 @@ export interface TextConfirmModalProps {
   description?: React.ComponentProps<typeof FormDescription_Shadcn_>
   blockDeleteButton?: boolean
   errorMessage?: string
+  enableCopy?: boolean
 }
 
 export const TextConfirmModal = forwardRef<
@@ -77,10 +80,13 @@ export const TextConfirmModal = forwardRef<
       blockDeleteButton = true,
       variant = 'default',
       errorMessage = 'Value entered does not match',
+      enableCopy = false,
       ...props
     },
     ref
   ) => {
+    const [showCopied, setShowCopied] = useState(false)
+
     const formSchema = z.object({
       confirmValue: z.preprocess(
         (val) => (typeof val === 'string' ? val.trim() : val),
@@ -112,6 +118,12 @@ export const TextConfirmModal = forwardRef<
       if (confirmString) form.reset()
     }, [confirmString])
 
+    useEffect(() => {
+      if (!showCopied) return
+      const timer = setTimeout(() => setShowCopied(false), 2000)
+      return () => clearTimeout(timer)
+    }, [showCopied])
+
     return (
       <Dialog
         open={visible}
@@ -161,11 +173,27 @@ export const TextConfirmModal = forwardRef<
                 name="confirmValue"
                 render={({ field }) => (
                   <FormItem_Shadcn_ className="flex flex-col gap-y-2">
-                    <FormLabel_Shadcn_ {...label} enableSelection>
+                    <FormLabel_Shadcn_ {...label} enableSelection={!enableCopy}>
                       Type{' '}
-                      <span className="text-foreground break-all whitespace-pre">
-                        {confirmString}
-                      </span>{' '}
+                      {enableCopy ? (
+                        <Button
+                          type="default"
+                          className="h-[23px] px-1.5 py-0 border-muted text-sm whitespace-pre break-all"
+                          iconRight={
+                            showCopied ? <Check strokeWidth={2} className="text-brand" /> : <Copy />
+                          }
+                          onClick={() => {
+                            setShowCopied(true)
+                            copyToClipboard(confirmString)
+                          }}
+                        >
+                          {confirmString}
+                        </Button>
+                      ) : (
+                        <span className="text-foreground break-all whitespace-pre">
+                          {confirmString}
+                        </span>
+                      )}{' '}
                       to confirm.
                     </FormLabel_Shadcn_>
                     <FormControl_Shadcn_>
diff --git a/supa-mdx-lint/Rule001HeadingCase.toml b/supa-mdx-lint/Rule001HeadingCase.toml
index e046d71d57f2e..e1f6a201bb86c 100644
--- a/supa-mdx-lint/Rule001HeadingCase.toml
+++ b/supa-mdx-lint/Rule001HeadingCase.toml
@@ -46,7 +46,7 @@ may_uppercase = [
     "Cron",
     "Cron Jobs?",
     "Data API",
-    "DataDog",
+    "Datadog",
     "Dart",
     "Dashboard",
     "Database Functions?",
@@ -91,6 +91,7 @@ may_uppercase = [
     "Google",
     "Google Workspace",
     "Grafana",
+    "Grafana Cloud",
     "GraphQL",
     "Heroku",
     "Homebrew",
@@ -133,6 +134,7 @@ may_uppercase = [
     "Mailpit",
     "Management API",
     "Marketplace",
+    "Metrics API",
     "Mixpeek",
     "Mixpeek Embed",
     "Model Context Protocol",
@@ -149,6 +151,7 @@ may_uppercase = [
     "OpenAI",
     "OpenID Connect",
     "Open ID Connect",
+    "OpenMetrics",
     "OrbStack",
     "OrioleDB",
     "PGAudit",
@@ -176,6 +179,7 @@ may_uppercase = [
     "React Email",
     "React Native",
     "Read Replicas?",
+    "Realtime",
     "Reciprocal Ranked Fusion",
     "Redis",
     "RedwoodJS",
@@ -214,6 +218,7 @@ may_uppercase = [
     "Telegram",
     "Third-Party Auth",
     "TimescaleDB",
+    "TooManyChannels",
     "Transformers.js",
     "Twilio",
     "Twitch",
diff --git a/supa-mdx-lint/Rule003Spelling.toml b/supa-mdx-lint/Rule003Spelling.toml
index c8d32266ab1ee..f1ac4e5eab769 100644
--- a/supa-mdx-lint/Rule003Spelling.toml
+++ b/supa-mdx-lint/Rule003Spelling.toml
@@ -77,6 +77,7 @@ allow_list = [
     "[Ii]dempotency",
     "[KMG]bps",
     "[KMG]iB",
+    "[Kk]ubernetes",
     "[Ll]iveness",
     "LogEvent",
     "[Mm]atryoshka",
@@ -129,6 +130,7 @@ allow_list = [
     "[Tt]imebox(ed)?",
     "[Tt]odos?",
     "[Tt]radeoffs?",
+    "[Tt]unneled",
     "UncaughtException",
     "[Uu]nlink(ing|s|ed)?",
     "[Uu]pserts?",
@@ -138,6 +140,8 @@ allow_list = [
     "[Ww]ebhooks?",
     "WorkerMemoryUsed",
     "Airbyte",
+    "Alertmanager",
+    "AWS Distro for OpenTelemetry",
     "AndroidX",
     "AppleAuthentication",
     "Astro",
@@ -164,7 +168,7 @@ allow_list = [
     "Colab",
     "DBeaver",
     "Database Functions?",
-    "DataDog",
+    "Datadog",
     "Deadpool",
     "DDoS",
     "Deno",
@@ -196,6 +200,7 @@ allow_list = [
     "GoTrue",
     "Golang",
     "Grafana",
+    "Grafana OnCall",
     "GraphQL",
     "Groonga",
     "HackerOne",
@@ -253,13 +258,18 @@ allow_list = [
     "OneLogin",
     "OpenAI",
     "OpenID",
+    "OpenMetrics",
+    "Opsgenie",
     "OrbStack",
     "OrioleDB",
     "OpenTelemetry",
+    "PaaS",
+    "PagerDuty",
     "PGAudit",
     "PGroonga",
     "PgBouncer",
     "PHI",
+    "Pico",
     "PingIdentity",
     "Paulo",
     # For historical purposes
@@ -284,6 +294,7 @@ allow_list = [
     "RedwoodJS",
     "Refine",
     "Roboflow",
+    "SaaS",
     "SDKs",
     "SQLAlchemy",
     "SQLModel",
@@ -302,11 +313,11 @@ allow_list = [
     "Supabase",
     "Remapper",
     "TextLocal",
+    "Thanos",
     "TimescaleDB",
     "tmux",
     "Transformers.js",
     "tsquery",
-    "[Tt]unneled",
     "Twilio",
     "Undici",
     "UnionPay",
@@ -318,6 +329,7 @@ allow_list = [
     "VSCode",
     "Vecs",
     "Vercel",
+    "VictoriaMetrics",
     "Vite",
     "Vonage",
     "Vue",
@@ -348,6 +360,8 @@ allow_list = [
     "https?:\\/\\/\\S+",
     "i.e.",
     "imgproxy",
+    "undo-ing",
+    "sign ins",
     "iOS",
     "localStorage",
     "localhost",
diff --git a/turbo.json b/turbo.json
index 66455bb6507cd..d88c231dfb984 100644
--- a/turbo.json
+++ b/turbo.json
@@ -123,7 +123,8 @@
         "AI_PRO_MODEL",
         "AI_NORMAL_MODEL",
         "SUPPORT_SUPABASE_SECRET_KEY",
-        "NEXT_PUBLIC_IS_NIMBUS"
+        "NEXT_PUBLIC_IS_NIMBUS",
+        "NEXT_PUBLIC_ONGOING_INCIDENT"
       ],
       "passThroughEnv": ["CURRENT_CLI_VERSION", "VERCEL_GIT_COMMIT_SHA"],
       "outputs": [".next/**", "!.next/cache/**"]