diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
index 2afa1d2bf3536..60f771da0bb8d 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
@@ -3123,28 +3123,28 @@ export const self_hosting: NavMenuConstant = {
       name: 'Add Reverse Proxy with HTTPS',
       url: '/guides/self-hosting/self-hosted-proxy-https',
     },
+    { name: 'Upgrade to Postgres 17', url: '/guides/self-hosting/postgres-upgrade-17' },
+    { name: 'Remove superuser access', url: '/guides/self-hosting/remove-superuser-access' },
     { name: 'Update your deployment', url: '/guides/self-hosting/updating' },
     {
       name: 'How-to Guides',
       items: [
-        { name: 'Upgrade to Postgres 17', url: '/guides/self-hosting/postgres-upgrade-17' },
-        { name: 'Remove superuser access', url: '/guides/self-hosting/remove-superuser-access' },
         { name: 'Run Self-Hosted Functions', url: '/guides/self-hosting/self-hosted-functions' },
         { name: 'Configure S3 Storage', url: '/guides/self-hosting/self-hosted-s3' },
-        { name: 'Add Custom Email Templates', url: '/guides/self-hosting/custom-email-templates' },
+        { name: 'Enable MCP server', url: '/guides/self-hosting/enable-mcp' },
         { name: 'Configure Social Login (OAuth)', url: '/guides/self-hosting/self-hosted-oauth' },
         { name: 'Configure Phone Login & MFA', url: '/guides/self-hosting/self-hosted-phone-mfa' },
+        { name: 'Add Custom Email Templates', url: '/guides/self-hosting/custom-email-templates' },
         { name: 'Configure SAML 2.0 SSO', url: '/guides/self-hosting/self-hosted-saml-sso' },
-        { name: 'Enable MCP server', url: '/guides/self-hosting/enable-mcp' },
-        {
-          name: 'Build Custom Extensions',
-          url: '/guides/self-hosting/custom-postgres-extensions',
-        },
         {
           name: 'Restore Project from Platform',
           url: '/guides/self-hosting/restore-from-platform',
         },
         { name: 'Copy Storage from Platform', url: '/guides/self-hosting/copy-from-platform-s3' },
+        {
+          name: 'Build Custom Extensions',
+          url: '/guides/self-hosting/custom-postgres-extensions',
+        },
       ],
     },
     {
diff --git a/apps/kb/package.json b/apps/kb/package.json
index 109857da3d7f4..4e440f7e8bbe1 100644
--- a/apps/kb/package.json
+++ b/apps/kb/package.json
@@ -14,6 +14,7 @@
   "dependencies": {
     "@astrojs/react": "^6.0.4",
     "astro": "^7.2.6",
+    "lucide-react": "*",
     "react": "catalog:",
     "react-dom": "catalog:",
     "ui": "workspace:*"
diff --git a/apps/kb/src/components/Nav.tsx b/apps/kb/src/components/Nav.tsx
index 268a5953a1e87..d28f765a059c4 100644
--- a/apps/kb/src/components/Nav.tsx
+++ b/apps/kb/src/components/Nav.tsx
@@ -30,7 +30,7 @@ const menus = [
 ]
 
 const triggerClass =
-  'h-(--header-height) p-2 border-transparent font-normal rounded-none text-foreground-light hover:text-foreground data-open:text-foreground! border-0 focus-ring focus-visible:text-foreground h-full focus-visible:rounded-sm shadow-none!'
+  'h-(--header-height) p-2 bg-transparent border-transparent font-normal rounded-none text-foreground-light hover:text-foreground data-open:text-foreground! border-0 focus-ring focus-visible:text-foreground h-full focus-visible:rounded-sm shadow-none!'
 // docs gates this at `md:absolute` (its own base component class) because its
 // nav is hidden entirely below `lg` in favor of a separate mobile menu. kb
 // doesn't have that split — the nav is always visible — so `absolute` is
diff --git a/apps/kb/src/content.config.ts b/apps/kb/src/content.config.ts
new file mode 100644
index 0000000000000..92612a16b7949
--- /dev/null
+++ b/apps/kb/src/content.config.ts
@@ -0,0 +1,18 @@
+import { defineCollection } from 'astro:content'
+import { glob } from 'astro/loaders'
+import { z } from 'astro/zod'
+
+// Every entry here is rendered through GuideLayout by
+// src/pages/guides/[...slug].astro — dropping a new file in
+// src/content/guides doesn't need any per-file layout wiring.
+const guides = defineCollection({
+  loader: glob({ pattern: '**/*.md', base: './src/content/guides' }),
+  schema: z.object({
+    title: z.string(),
+    description: z.string().optional(),
+    topics: z.array(z.string()).optional(),
+    github_url: z.string().optional(),
+  }),
+})
+
+export const collections = { guides }
diff --git a/apps/kb/src/content/guides/sample-guide.md b/apps/kb/src/content/guides/sample-guide.md
new file mode 100644
index 0000000000000..6a69b4987bc2c
--- /dev/null
+++ b/apps/kb/src/content/guides/sample-guide.md
@@ -0,0 +1,81 @@
+---
+title: 'Markdown elements sample'
+description: 'A lorem ipsum sample guide exercising every base Markdown element supported by the guide layout.'
+topics: ['example', 'markdown']
+github_url: 'https://github.com/supabase/supabase/discussions/0000000'
+---
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
+nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+
+## Heading level 2
+
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore
+eu fugiat nulla pariatur. This paragraph mixes **bold text**, _italic text_,
+**_bold italic text_**, ~~strikethrough text~~, and `inline code`.
+
+### Heading level 3
+
+Here's a [link to the Astro docs](https://docs.astro.build/en/basics/layouts/),
+followed by an unordered list with a nested list:
+
+- Excepteur sint occaecat cupidatat non proident
+- Sunt in culpa qui officia deserunt mollit anim id est laborum
+  - Nested item one
+  - Nested item two
+- Curabitur blandit tempus porttitor
+
+#### Heading level 4
+
+And an ordered list with a nested list:
+
+1. Lorem ipsum dolor sit amet
+2. Consectetur adipiscing elit
+   1. Nested step one
+   2. Nested step two
+3. Sed do eiusmod tempor incididunt
+
+##### Heading level 5
+
+> Neque porro quisquam est qui dolorem ipsum quia dolor sit amet,
+> consectetur, adipisci velit.
+>
+> > Nested blockquote: at vero eos et accusamus et iusto odio dignissimos.
+
+###### Heading level 6
+
+A fenced code block with a language tag:
+
+```js
+function add(a, b) {
+  return a + b
+}
+
+console.log(add(2, 3))
+```
+
+And another in a different language:
+
+```bash
+npm install
+npm run dev
+```
+
+A table:
+
+| Element  | Supported | Notes                        |
+| -------- | --------- | ---------------------------- |
+| Headings | Yes       | h2 through h6                |
+| Tables   | Yes       | via GitHub-flavored Markdown |
+| Images   | Yes       | see below                    |
+
+An image:
+
+![Placeholder image](https://placehold.co/800x400?text=Placeholder+Image)
+
+---
+
+Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium
+doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore
+veritatis et quasi architecto beatae vitae dicta sunt explicabo.
diff --git a/apps/kb/src/layouts/GuideLayout.astro b/apps/kb/src/layouts/GuideLayout.astro
new file mode 100644
index 0000000000000..49b82d04b1cf3
--- /dev/null
+++ b/apps/kb/src/layouts/GuideLayout.astro
@@ -0,0 +1,39 @@
+---
+import { Github } from 'lucide-react'
+import { Badge } from 'ui'
+
+import Layout from './Layout.astro'
+
+interface Props {
+	title: string
+	description?: string
+	topics?: string[]
+	github_url?: string
+}
+
+const { title, description, topics = [], github_url } = Astro.props
+---
+
+<Layout title={title} description={description}>
+	<article class="prose max-w-3xl mx-auto px-6 py-16">
+		<h1>{title}</h1>
+		{description && <p class="lead">{description}</p>}
+		{
+			topics.length > 0 && (
+				<div class="flex flex-wrap gap-2">
+					{topics.map((topic) => <Badge>{topic}</Badge>)}
+				</div>
+			)
+		}
+		<slot />
+		{
+			github_url && (
+				<p>
+					<a href={github_url} target="_blank" rel="noreferrer" class="inline-flex items-center gap-1.5">
+						<Github size={16} /> Go to the GitHub discussion
+					</a>
+				</p>
+			)
+		}
+	</article>
+</Layout>
diff --git a/apps/kb/src/layouts/Layout.astro b/apps/kb/src/layouts/Layout.astro
index fc04f9e14e599..b49bd21652003 100644
--- a/apps/kb/src/layouts/Layout.astro
+++ b/apps/kb/src/layouts/Layout.astro
@@ -1,6 +1,13 @@
 ---
 import { Header } from '../components/Header'
 import '../styles/globals.css'
+
+interface Props {
+	title: string
+	description?: string
+}
+
+const { title, description } = Astro.props
 ---
 
 <!doctype html>
@@ -9,6 +16,7 @@ import '../styles/globals.css'
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width" />
 		<meta name="robots" content="noindex, nofollow" />
+		{description && <meta name="description" content={description} />}
 		<script is:inline>
 			// Set data-theme on <html> before first paint, so the page doesn't flash
 			// the wrong theme while this loads. Defaults to dark (no system-preference
@@ -50,7 +58,7 @@ import '../styles/globals.css'
 			rel="stylesheet"
 			href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=Manrope:wght@400;500;600;700;800&display=swap"
 		/>
-		<title>Supabase Knowledge Base</title>
+		<title>{title} | Supabase Knowledge Base</title>
 	</head>
 	<body>
 		<Header client:load />
diff --git a/apps/kb/src/pages/guides/[...slug].astro b/apps/kb/src/pages/guides/[...slug].astro
new file mode 100644
index 0000000000000..d6b5c5de93163
--- /dev/null
+++ b/apps/kb/src/pages/guides/[...slug].astro
@@ -0,0 +1,21 @@
+---
+import { getCollection, render } from 'astro:content'
+
+import GuideLayout from '../../layouts/GuideLayout.astro'
+
+export async function getStaticPaths() {
+	const guides = await getCollection('guides')
+	return guides.map((guide) => ({
+		params: { slug: guide.id },
+		props: { guide },
+	}))
+}
+
+const { guide } = Astro.props
+const { title, description, topics, github_url } = guide.data
+const { Content } = await render(guide)
+---
+
+<GuideLayout title={title} description={description} topics={topics} github_url={github_url}>
+	<Content />
+</GuideLayout>
diff --git a/apps/kb/src/pages/index.astro b/apps/kb/src/pages/index.astro
index d860bb804ea9a..fe909f38c6511 100644
--- a/apps/kb/src/pages/index.astro
+++ b/apps/kb/src/pages/index.astro
@@ -3,6 +3,6 @@ import { Hero } from '../components/Hero'
 import Layout from '../layouts/Layout.astro'
 ---
 
-<Layout>
+<Layout title="Home" description="In-depth guides, tutorials, and explainers for best practices for Supabase databases.">
 	<Hero />
 </Layout>
diff --git a/apps/kb/src/styles/globals.css b/apps/kb/src/styles/globals.css
index bd5c11ac0689f..b15951345ece9 100644
--- a/apps/kb/src/styles/globals.css
+++ b/apps/kb/src/styles/globals.css
@@ -72,3 +72,9 @@ h6:not(.font-mono),
 ::file-selector-button {
   border-color: var(--border-default, currentColor);
 }
+
+/* TEMPORARY UNTIL WE IMPLEMENT OUR OWN CODE COMPONENT */
+.prose pre code {
+  padding: 1rem;
+  display: inline-block;
+}
diff --git a/apps/studio/TANSTACK_MIGRATION.md b/apps/studio/TANSTACK_MIGRATION.md
index 0fdd44ca2006c..177ec0ab5d248 100644
--- a/apps/studio/TANSTACK_MIGRATION.md
+++ b/apps/studio/TANSTACK_MIGRATION.md
@@ -290,6 +290,7 @@ These are the layout-only TanStack files. Most hold a single product layout comp
 
 ### Project shell — `/advisors/*`
 
+- [x] A `routes/project/$ref/advisors/health.tsx` ← `pages/project/[ref]/advisors/health.tsx`
 - [x] A `routes/project/$ref/advisors/performance.tsx` ← `pages/project/[ref]/advisors/performance.tsx`
 - [x] A `routes/project/$ref/advisors/security.tsx` ← `pages/project/[ref]/advisors/security.tsx`
 - [x] A `routes/project/$ref/advisors/rules/performance.tsx` ← `pages/project/[ref]/advisors/rules/performance.tsx`
diff --git a/apps/studio/components/interfaces/Linter/Linter.constants.ts b/apps/studio/components/interfaces/Linter/Linter.constants.ts
index a251a0465aa74..1644a22f12678 100644
--- a/apps/studio/components/interfaces/Linter/Linter.constants.ts
+++ b/apps/studio/components/interfaces/Linter/Linter.constants.ts
@@ -16,7 +16,7 @@ export type LintInfo = {
   link: (args: { projectRef: string; metadata: Lint['metadata'] }) => string
   linkText: string
   docsLink: string
-  category: 'security' | 'performance'
+  category: 'security' | 'performance' | 'health'
 }
 
 export const LINT_TABS: ReadonlyArray<{
diff --git a/apps/studio/components/interfaces/Linter/Linter.utils.test.tsx b/apps/studio/components/interfaces/Linter/Linter.utils.test.tsx
index 054c0d01c66d3..8eebac5a5bb84 100644
--- a/apps/studio/components/interfaces/Linter/Linter.utils.test.tsx
+++ b/apps/studio/components/interfaces/Linter/Linter.utils.test.tsx
@@ -2,7 +2,8 @@ import { Ruler } from 'lucide-react'
 import { isValidElement } from 'react'
 import { describe, expect, it } from 'vitest'
 
-import { lintInfoMap } from './Linter.utils'
+import { lintInfoMap, parseLinterLevel } from './Linter.utils'
+import { LINTER_LEVELS } from '@/components/interfaces/Linter/Linter.constants'
 import { Lint } from '@/data/lint/lint-query'
 
 const projectRef = 'abc'
@@ -83,3 +84,17 @@ describe('Linter.utils lintInfoMap pitr_archiving_stale entry', () => {
     expect(info!.docsLink).toContain('/guides/platform/backups#point-in-time-recovery')
   })
 })
+
+describe('parseLinterLevel', () => {
+  it('returns the matching level', () => {
+    expect(parseLinterLevel('ERROR')).toBe(LINTER_LEVELS.ERROR)
+    expect(parseLinterLevel('WARN')).toBe(LINTER_LEVELS.WARN)
+    expect(parseLinterLevel('INFO')).toBe(LINTER_LEVELS.INFO)
+  })
+
+  it('returns undefined for values that are not a level', () => {
+    expect(parseLinterLevel('error')).toBeUndefined()
+    expect(parseLinterLevel('SOMETHING_ELSE')).toBeUndefined()
+    expect(parseLinterLevel(undefined)).toBeUndefined()
+  })
+})
diff --git a/apps/studio/components/interfaces/Linter/Linter.utils.tsx b/apps/studio/components/interfaces/Linter/Linter.utils.tsx
index bc373167d904a..a4e240fcc2e52 100644
--- a/apps/studio/components/interfaces/Linter/Linter.utils.tsx
+++ b/apps/studio/components/interfaces/Linter/Linter.utils.tsx
@@ -1,11 +1,16 @@
 import {
+  Activity,
+  AlertTriangle,
   Box,
   Clock,
+  Database,
   Eye,
+  Gauge,
   Lock,
   LockIcon,
   Ruler,
   Scaling,
+  Server,
   Table2,
   TextSearch,
   Unlock,
@@ -393,6 +398,80 @@ export const lintInfoMap: LintInfo[] = [
     docsLink: `${DOCS_URL}/guides/database/database-linter?lint=0029_authenticated_security_definer_function_executable`,
     category: 'security',
   },
+  // Health lints report on the running project rather than on schema, so they link to the
+  // page that shows what is happening rather than to an object to edit.
+  {
+    name: 'instance_db_down',
+    title: 'Database process is down',
+    icon: <Database className="text-foreground-muted" size={15} strokeWidth={1.5} />,
+    link: ({ projectRef }) => `/project/${projectRef}/logs/postgres-logs`,
+    linkText: 'View database logs',
+    docsLink: `${DOCS_URL}/guides/platform/troubleshooting`,
+    category: 'health',
+  },
+  {
+    name: 'db_not_reachable',
+    title: 'Database not usable',
+    icon: <Server className="text-foreground-muted" size={15} strokeWidth={1.5} />,
+    link: ({ projectRef }) => `/project/${projectRef}/database/settings`,
+    linkText: 'View connection settings',
+    docsLink: `${DOCS_URL}/guides/database/connecting-to-postgres`,
+    category: 'health',
+  },
+  {
+    name: 'db_connection_limit_reached',
+    title: 'Database connection limit reached',
+    icon: <Gauge className="text-foreground-muted" size={15} strokeWidth={1.5} />,
+    link: ({ projectRef }) => `/project/${projectRef}/observability/connections`,
+    linkText: 'View connections',
+    docsLink: `${DOCS_URL}/guides/database/connection-management`,
+    category: 'health',
+  },
+  {
+    name: 'log_data_api_error_rate_high',
+    title: 'Data API error rate is persistently high',
+    icon: <Activity className="text-foreground-muted" size={15} strokeWidth={1.5} />,
+    link: ({ projectRef }) => `/project/${projectRef}/logs/edge-logs`,
+    linkText: 'View logs',
+    docsLink: `${DOCS_URL}/guides/platform/troubleshooting`,
+    category: 'health',
+  },
+  {
+    name: 'log_auth_error_rate_high',
+    title: 'Auth error rate is persistently high',
+    icon: <Activity className="text-foreground-muted" size={15} strokeWidth={1.5} />,
+    link: ({ projectRef }) => `/project/${projectRef}/logs/edge-logs`,
+    linkText: 'View logs',
+    docsLink: `${DOCS_URL}/guides/platform/troubleshooting`,
+    category: 'health',
+  },
+  {
+    name: 'log_storage_error_rate_high',
+    title: 'Storage error rate is persistently high',
+    icon: <Activity className="text-foreground-muted" size={15} strokeWidth={1.5} />,
+    link: ({ projectRef }) => `/project/${projectRef}/logs/edge-logs`,
+    linkText: 'View logs',
+    docsLink: `${DOCS_URL}/guides/platform/troubleshooting`,
+    category: 'health',
+  },
+  {
+    name: 'log_edge_function_error_rate_high',
+    title: 'Edge Function error rate is persistently high',
+    icon: <Activity className="text-foreground-muted" size={15} strokeWidth={1.5} />,
+    link: ({ projectRef }) => `/project/${projectRef}/logs/edge-logs`,
+    linkText: 'View logs',
+    docsLink: `${DOCS_URL}/guides/platform/troubleshooting`,
+    category: 'health',
+  },
+  {
+    name: 'instance_alert_firing',
+    title: 'Infrastructure alerts firing',
+    icon: <AlertTriangle className="text-foreground-muted" size={15} strokeWidth={1.5} />,
+    link: ({ projectRef }) => `/project/${projectRef}/settings/infrastructure`,
+    linkText: 'View infrastructure',
+    docsLink: `${DOCS_URL}/guides/platform/troubleshooting`,
+    category: 'health',
+  },
 ]
 
 export const LintCTA = ({
@@ -444,6 +523,8 @@ export const EntityTypeIcon = ({ type }: { type: string | undefined }) => {
       return <Eye className="text-foreground-muted" size={15} strokeWidth={1.5} />
     case 'auth':
       return <Lock className="text-foreground-muted" size={15} strokeWidth={1.5} />
+    case 'health':
+      return <Activity className="text-foreground-muted" size={15} strokeWidth={1.5} />
     default:
       return <Box className="text-foreground-muted" size={15} strokeWidth={1.5} />
   }
@@ -490,6 +571,15 @@ Issue Details: ${issue}
 Description: ${description}`
 }
 
+const LINTER_LEVEL_VALUES = Object.values(LINTER_LEVELS)
+
+/**
+ * The `preset` query param is user controlled, so match it against the known levels
+ * instead of trusting it to be one.
+ */
+export const parseLinterLevel = (value?: string) =>
+  LINTER_LEVEL_VALUES.find((level) => level === value)
+
 export const getLintEntityString = (metadata: Lint['metadata']) => {
   if (!metadata) {
     return undefined
diff --git a/apps/studio/components/interfaces/Linter/useAdvisorPageShortcuts.ts b/apps/studio/components/interfaces/Linter/useAdvisorPageShortcuts.ts
index e821f25e0698b..98f3fc1fdcd8d 100644
--- a/apps/studio/components/interfaces/Linter/useAdvisorPageShortcuts.ts
+++ b/apps/studio/components/interfaces/Linter/useAdvisorPageShortcuts.ts
@@ -12,8 +12,8 @@ interface UseAdvisorPageShortcutsParams {
 }
 
 /**
- * Registers shortcuts that apply across the Security and Performance Advisor
- * pages:
+ * Registers shortcuts that apply across the Health, Security, and Performance
+ * Advisor pages:
  *   - 1 / 2 / 3: switch to Errors / Warnings / Info tab
  *   - Shift+R: rerun the linter
  *   - Escape: close the lint detail panel (only when a lint is selected)
diff --git a/apps/studio/components/interfaces/ProjectHome/AdvisorSection.tsx b/apps/studio/components/interfaces/ProjectHome/AdvisorSection.tsx
index b0dc49349fac8..9b9b99ee0c8c8 100644
--- a/apps/studio/components/interfaces/ProjectHome/AdvisorSection.tsx
+++ b/apps/studio/components/interfaces/ProjectHome/AdvisorSection.tsx
@@ -1,5 +1,5 @@
 import { useParams } from 'common'
-import { BarChart, Shield } from 'lucide-react'
+import { Shield } from 'lucide-react'
 import { useCallback, useMemo } from 'react'
 import { AiIconAnimation, Badge, Button, Card, CardContent, CardHeader, CardTitle, cn } from 'ui'
 import { Row } from 'ui-patterns/Row'
@@ -11,8 +11,10 @@ import { createLintSummaryPrompt } from '@/components/interfaces/Linter/Linter.u
 import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import type { AdvisorItem } from '@/components/ui/AdvisorPanel/AdvisorPanel.types'
 import {
+  advisorCategoryIcons,
   createAdvisorLintItems,
   getAdvisorItemDisplayTitle,
+  getAdvisorItemTelemetryCategory,
   MAX_HOMEPAGE_ADVISOR_ITEMS,
   severityBadgeVariants,
   severityColorClasses,
@@ -20,6 +22,7 @@ import {
 } from '@/components/ui/AdvisorPanel/AdvisorPanel.utils'
 import { useAdvisorSignals } from '@/components/ui/AdvisorPanel/useAdvisorSignals'
 import { AiAssistantDropdown } from '@/components/ui/AiAssistantDropdown'
+import { useProjectHealthLintsQuery } from '@/data/lint/health-lints-query'
 import { useProjectLintsQuery } from '@/data/lint/lint-query'
 import { useTrack } from '@/lib/telemetry/track'
 import { useAdvisorStateSnapshot } from '@/state/advisor-state'
@@ -38,15 +41,21 @@ export const AdvisorSection = ({ showEmptyState = false }: { showEmptyState?: bo
     { enabled: !showEmptyState }
   )
 
+  const { data: healthLints } = useProjectHealthLintsQuery(
+    { projectRef },
+    { enabled: !showEmptyState }
+  )
+
   const { data: signalItems } = useAdvisorSignals({ projectRef, enabled: !showEmptyState })
 
   const advisorItems = useMemo<AdvisorItem[]>(() => {
-    const criticalLintItems = createAdvisorLintItems(lints).filter(
-      (item) => item.source === 'lint' && item.original.level === LINTER_LEVELS.ERROR
-    )
+    const criticalLintItems = createAdvisorLintItems([
+      ...(lints ?? []),
+      ...(healthLints ?? []),
+    ]).filter((item) => item.source === 'lint' && item.original.level === LINTER_LEVELS.ERROR)
 
     return sortAdvisorItems([...criticalLintItems, ...signalItems])
-  }, [lints, signalItems])
+  }, [lints, healthLints, signalItems])
 
   const visibleAdvisorItems = useMemo(
     () => advisorItems.slice(0, MAX_HOMEPAGE_ADVISOR_ITEMS),
@@ -80,12 +89,7 @@ export const AdvisorSection = ({ showEmptyState = false }: { showEmptyState?: bo
       setSelectedItem(item.id, item.source)
       openSidebar(SIDEBAR_KEYS.ADVISOR_PANEL)
 
-      const advisorCategory =
-        item.source === 'lint'
-          ? item.original.categories[0]
-          : item.source === 'signal'
-            ? 'SECURITY'
-            : undefined
+      const advisorCategory = getAdvisorItemTelemetryCategory(item)
       const advisorType =
         item.source === 'signal'
           ? item.type
@@ -136,7 +140,9 @@ export const AdvisorSection = ({ showEmptyState = false }: { showEmptyState?: bo
           <Row maxColumns={4} minWidth={280}>
             {visibleAdvisorItems.map((item) => {
               const isLint = item.source === 'lint'
-              const categoryLabel = item.tab === 'performance' ? 'PERFORMANCE' : 'SECURITY'
+              // Only security, performance and health items reach the homepage row
+              const categoryLabel = item.category.toUpperCase()
+              const CategoryIcon = advisorCategoryIcons[item.category]
               const title = getAdvisorItemDisplayTitle(item)
               const description =
                 item.source === 'signal' ? item.summary : isLint ? item.original.detail : ''
@@ -160,19 +166,11 @@ export const AdvisorSection = ({ showEmptyState = false }: { showEmptyState?: bo
                 >
                   <CardHeader className="border-b-0 shrink-0 flex flex-row gap-2 space-y-0 justify-between items-center">
                     <div className="flex flex-row items-center gap-3">
-                      {item.tab === 'security' ? (
-                        <Shield
-                          size={16}
-                          strokeWidth={1.5}
-                          className={severityColorClasses[item.severity]}
-                        />
-                      ) : (
-                        <BarChart
-                          size={16}
-                          strokeWidth={1.5}
-                          className={severityColorClasses[item.severity]}
-                        />
-                      )}
+                      <CategoryIcon
+                        size={16}
+                        strokeWidth={1.5}
+                        className={severityColorClasses[item.severity]}
+                      />
                       <CardTitle className="text-foreground-light">{categoryLabel}</CardTitle>
                     </div>
                     <div className="flex items-center gap-2">
@@ -199,7 +197,7 @@ export const AdvisorSection = ({ showEmptyState = false }: { showEmptyState?: bo
                               })
                               track('advisor_assistant_button_clicked', {
                                 origin: 'homepage',
-                                advisorCategory: item.original.categories[0],
+                                advisorCategory: getAdvisorItemTelemetryCategory(item),
                                 advisorType: item.original.name,
                                 advisorLevel: item.original.level,
                               })
@@ -243,7 +241,7 @@ function EmptyState() {
       <CardContent className="flex flex-col items-center justify-center gap-2 p-16 h-full">
         <Shield size={20} strokeWidth={1.5} className="text-foreground-muted" />
         <p className="text-sm text-foreground-light text-center">
-          No security or performance issues found
+          No security, performance or health issues found
         </p>
       </CardContent>
     </Card>
diff --git a/apps/studio/components/layouts/AdvisorsLayout/Advisors.Commands.tsx b/apps/studio/components/layouts/AdvisorsLayout/Advisors.Commands.tsx
index 38512594661c4..1c25557ecf62d 100644
--- a/apps/studio/components/layouts/AdvisorsLayout/Advisors.Commands.tsx
+++ b/apps/studio/components/layouts/AdvisorsLayout/Advisors.Commands.tsx
@@ -1,8 +1,10 @@
 import { useParams } from 'common'
 import type { CommandOptions } from 'ui-patterns/CommandMenu'
 import { useRegisterCommands } from 'ui-patterns/CommandMenu'
+import type { IRouteCommand } from 'ui-patterns/CommandMenu/internal/types'
 
 import { COMMAND_MENU_SECTIONS } from '@/components/interfaces/App/CommandMenu/CommandMenu.utils'
+import { IS_PLATFORM } from '@/lib/constants'
 
 export function useAdvisorsGoToCommands(options?: CommandOptions) {
   let { ref } = useParams()
@@ -11,6 +13,16 @@ export function useAdvisorsGoToCommands(options?: CommandOptions) {
   useRegisterCommands(
     COMMAND_MENU_SECTIONS.NAVIGATE,
     [
+      ...(IS_PLATFORM
+        ? [
+            {
+              id: 'nav-advisors-health',
+              name: 'Health Advisor',
+              route: `/project/${ref}/advisors/health`,
+              defaultHidden: true,
+            } satisfies IRouteCommand,
+          ]
+        : []),
       {
         id: 'nav-advisors-security',
         name: 'Security Advisor',
diff --git a/apps/studio/components/layouts/AdvisorsLayout/AdvisorsMenu.utils.test.ts b/apps/studio/components/layouts/AdvisorsLayout/AdvisorsMenu.utils.test.ts
new file mode 100644
index 0000000000000..de9471bd92ee5
--- /dev/null
+++ b/apps/studio/components/layouts/AdvisorsLayout/AdvisorsMenu.utils.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest'
+
+import { generateAdvisorsMenu } from './AdvisorsMenu.utils'
+
+describe('generateAdvisorsMenu', () => {
+  it('puts Health Advisor first on platform', () => {
+    const [advisors] = generateAdvisorsMenu({
+      ref: 'abc',
+      isAdvisorRulesEnabled: false,
+      isPlatform: true,
+    })
+
+    expect(advisors.items.map((item) => item.key)).toEqual([
+      'health',
+      'security',
+      'performance',
+      'query-performance',
+    ])
+    expect(advisors.items[0].url).toBe('/project/abc/advisors/health')
+  })
+
+  it('omits Health Advisor when not on platform', () => {
+    const [advisors] = generateAdvisorsMenu({
+      ref: 'abc',
+      isAdvisorRulesEnabled: false,
+      isPlatform: false,
+    })
+
+    expect(advisors.items.map((item) => item.key)).toEqual([
+      'security',
+      'performance',
+      'query-performance',
+    ])
+  })
+})
diff --git a/apps/studio/components/layouts/AdvisorsLayout/AdvisorsMenu.utils.tsx b/apps/studio/components/layouts/AdvisorsLayout/AdvisorsMenu.utils.tsx
index 602873ec9194b..1c37b9f47b651 100644
--- a/apps/studio/components/layouts/AdvisorsLayout/AdvisorsMenu.utils.tsx
+++ b/apps/studio/components/layouts/AdvisorsLayout/AdvisorsMenu.utils.tsx
@@ -2,42 +2,63 @@ import { useParams } from 'common'
 import { ArrowUpRight } from 'lucide-react'
 
 import { useIsAdvisorRulesEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
-import type { ProductMenuGroup } from '@/components/ui/ProductMenu/ProductMenu.types'
+import type {
+  ProductMenuGroup,
+  ProductMenuGroupItem,
+} from '@/components/ui/ProductMenu/ProductMenu.types'
 import { IS_PLATFORM } from '@/lib/constants'
 import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
 
-export const useGenerateAdvisorsMenu = (): ProductMenuGroup[] => {
-  const { ref } = useParams()
-  const isAdvisorRulesEnabled = useIsAdvisorRulesEnabled()
+export const generateAdvisorsMenu = ({
+  ref,
+  isAdvisorRulesEnabled,
+  isPlatform,
+}: {
+  ref: string | undefined
+  isAdvisorRulesEnabled: boolean
+  isPlatform: boolean
+}): ProductMenuGroup[] => {
+  const advisorItems: ProductMenuGroupItem[] = [
+    ...(isPlatform
+      ? [
+          {
+            name: 'Health Advisor',
+            key: 'health',
+            url: `/project/${ref}/advisors/health`,
+            items: [],
+            shortcutId: SHORTCUT_IDS.NAV_ADVISORS_HEALTH,
+          },
+        ]
+      : []),
+    {
+      name: 'Security Advisor',
+      key: 'security',
+      url: `/project/${ref}/advisors/security`,
+      items: [],
+      shortcutId: SHORTCUT_IDS.NAV_ADVISORS_SECURITY,
+    },
+    {
+      name: 'Performance Advisor',
+      key: 'performance',
+      url: `/project/${ref}/advisors/performance`,
+      items: [],
+      shortcutId: SHORTCUT_IDS.NAV_ADVISORS_PERFORMANCE,
+    },
+    {
+      name: 'Query Performance',
+      key: 'query-performance',
+      url: `/project/${ref}/observability/query-performance`,
+      items: [],
+      rightIcon: <ArrowUpRight size={14} strokeWidth={1.5} className="h-4 w-4" />,
+    },
+  ]
 
   return [
     {
       title: 'Advisors',
-      items: [
-        {
-          name: 'Security Advisor',
-          key: 'security',
-          url: `/project/${ref}/advisors/security`,
-          items: [],
-          shortcutId: SHORTCUT_IDS.NAV_ADVISORS_SECURITY,
-        },
-        {
-          name: 'Performance Advisor',
-          key: 'performance',
-          url: `/project/${ref}/advisors/performance`,
-          items: [],
-          shortcutId: SHORTCUT_IDS.NAV_ADVISORS_PERFORMANCE,
-        },
-        {
-          name: 'Query Performance',
-          key: 'query-performance',
-          url: `/project/${ref}/observability/query-performance`,
-          items: [],
-          rightIcon: <ArrowUpRight size={14} strokeWidth={1.5} className="h-4 w-4" />,
-        },
-      ],
+      items: advisorItems,
     },
-    ...(IS_PLATFORM && isAdvisorRulesEnabled
+    ...(isPlatform && isAdvisorRulesEnabled
       ? [
           {
             title: 'Configuration',
@@ -55,3 +76,14 @@ export const useGenerateAdvisorsMenu = (): ProductMenuGroup[] => {
       : []),
   ]
 }
+
+export const useGenerateAdvisorsMenu = (): ProductMenuGroup[] => {
+  const { ref } = useParams()
+  const isAdvisorRulesEnabled = useIsAdvisorRulesEnabled()
+
+  return generateAdvisorsMenu({
+    ref,
+    isAdvisorRulesEnabled,
+    isPlatform: IS_PLATFORM,
+  })
+}
diff --git a/apps/studio/components/ui/AdvisorPanel/AdvisorFilters.tsx b/apps/studio/components/ui/AdvisorPanel/AdvisorFilters.tsx
index 7a15ddf8dfda0..3c919aaad5fb0 100644
--- a/apps/studio/components/ui/AdvisorPanel/AdvisorFilters.tsx
+++ b/apps/studio/components/ui/AdvisorPanel/AdvisorFilters.tsx
@@ -1,9 +1,30 @@
 import { X } from 'lucide-react'
-import { Tabs, TabsList, TabsTrigger } from 'ui'
+import { z } from 'zod'
 
+import { advisorCategoryLabels } from './AdvisorPanel.utils'
 import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
 import { FilterPopover } from '@/components/ui/FilterPopover'
-import { AdvisorSeverity, AdvisorTab } from '@/state/advisor-state'
+import {
+  AdvisorCategory,
+  advisorCategorySchema,
+  AdvisorSeverity,
+  advisorSeveritySchema,
+} from '@/state/advisor-state'
+
+/**
+ * FilterPopover reports its selection as plain strings, so validate them against the
+ * schema before they flow back into typed state. Unrecognized values are dropped rather
+ * than throwing — a stale option should not take the panel down.
+ */
+const parseFilterValues = <T extends string>(schema: z.ZodType<T>, values: string[]): T[] =>
+  values.flatMap((value) => {
+    const result = schema.safeParse(value)
+    return result.success ? [result.data] : []
+  })
+
+const platformCategories: AdvisorCategory[] = ['security', 'performance', 'health', 'messages']
+// Health runs against platform infrastructure and messages are platform notifications
+const selfHostedCategories: AdvisorCategory[] = ['security', 'performance']
 
 const severityOptions = [
   { label: 'Critical', value: 'critical' },
@@ -17,8 +38,8 @@ const statusOptions = [
 ]
 
 interface AdvisorFiltersProps {
-  activeTab: AdvisorTab
-  onTabChange: (tab: string) => void
+  categoryFilters: AdvisorCategory[]
+  onCategoryFiltersChange: (filters: AdvisorCategory[]) => void
   severityFilters: AdvisorSeverity[]
   onSeverityFiltersChange: (filters: AdvisorSeverity[]) => void
   statusFilters: string[]
@@ -28,8 +49,8 @@ interface AdvisorFiltersProps {
 }
 
 export const AdvisorFilters = ({
-  activeTab,
-  onTabChange,
+  categoryFilters,
+  onCategoryFiltersChange,
   severityFilters,
   onSeverityFiltersChange,
   statusFilters,
@@ -37,28 +58,25 @@ export const AdvisorFilters = ({
   onClose,
   isPlatform = false,
 }: AdvisorFiltersProps) => {
+  const categoryOptions = (isPlatform ? platformCategories : selfHostedCategories).map(
+    (category) => ({ label: advisorCategoryLabels[category], value: category })
+  )
+
   return (
     <div className="border-b overflow-x-auto">
       <div className="flex items-center justify-between gap-x-4 h-[calc(var(--header-height)-1px)]">
-        <Tabs value={activeTab} onValueChange={onTabChange} className="h-full pl-4">
-          <TabsList className="border-b-0 gap-4 h-full">
-            <TabsTrigger value="all" className="h-full text-xs">
-              All
-            </TabsTrigger>
-            <TabsTrigger value="security" className="h-full text-xs">
-              Security
-            </TabsTrigger>
-            <TabsTrigger value="performance" className="h-full text-xs">
-              Performance
-            </TabsTrigger>
-            {isPlatform && (
-              <TabsTrigger value="messages" className="h-full text-xs flex items-center gap-2">
-                Messages
-              </TabsTrigger>
-            )}
-          </TabsList>
-        </Tabs>
-        <div className="flex items-center gap-x-2 pr-3">
+        <div className="flex items-center gap-x-2 pl-3">
+          <FilterPopover
+            name="Category"
+            options={categoryOptions}
+            activeOptions={[...categoryFilters]}
+            valueKey="value"
+            labelKey="label"
+            isMinimized={true}
+            onSaveFilters={(values) => {
+              onCategoryFiltersChange(parseFilterValues(advisorCategorySchema, values))
+            }}
+          />
           {isPlatform && (
             <FilterPopover
               name="Status"
@@ -78,17 +96,17 @@ export const AdvisorFilters = ({
             labelKey="label"
             isMinimized={true}
             onSaveFilters={(values) => {
-              onSeverityFiltersChange(values as AdvisorSeverity[])
+              onSeverityFiltersChange(parseFilterValues(advisorSeveritySchema, values))
             }}
           />
-          <ButtonTooltip
-            variant="text"
-            className="w-7 h-7 p-0"
-            icon={<X strokeWidth={1.5} />}
-            onClick={onClose}
-            tooltip={{ content: { side: 'bottom', text: 'Close Advisor Center' } }}
-          />
         </div>
+        <ButtonTooltip
+          variant="text"
+          className="w-7 h-7 p-0 mr-3"
+          icon={<X strokeWidth={1.5} />}
+          onClick={onClose}
+          tooltip={{ content: { side: 'bottom', text: 'Close Advisor Center' } }}
+        />
       </div>
     </div>
   )
diff --git a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.tsx b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.tsx
index e19bd4b16740b..1ea6e46cdfca9 100644
--- a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.tsx
+++ b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.tsx
@@ -6,12 +6,14 @@ import type { AdvisorItem } from './AdvisorPanel.types'
 import {
   createAdvisorLintItems,
   createAdvisorNotificationItems,
+  getAdvisorItemTelemetryCategory,
   sortAdvisorItems,
 } from './AdvisorPanel.utils'
 import { AdvisorPanelBody } from './AdvisorPanelBody'
 import { AdvisorPanelHeader } from './AdvisorPanelHeader'
 import { useAdvisorSignals } from './useAdvisorSignals'
 import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useProjectHealthLintsQuery } from '@/data/lint/health-lints-query'
 import { useProjectLintsQuery } from '@/data/lint/lint-query'
 import { Notification, useNotificationsV2Query } from '@/data/notifications/notifications-v2-query'
 import { useNotificationsV2UpdateMutation } from '@/data/notifications/notifications-v2-update-mutation'
@@ -19,24 +21,24 @@ import { useProjectsInfiniteQuery } from '@/data/projects/projects-infinite-quer
 import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
 import { IS_PLATFORM } from '@/lib/constants'
 import { useTrack } from '@/lib/telemetry/track'
-import { AdvisorTab, useAdvisorStateSnapshot } from '@/state/advisor-state'
+import { AdvisorCategory, useAdvisorStateSnapshot } from '@/state/advisor-state'
 import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'
 
 export const AdvisorPanel = () => {
   const track = useTrack()
   const {
-    activeTab,
+    categoryFilters,
     severityFilters,
     selectedItemId,
     selectedItemSource,
-    setActiveTab,
+    setCategoryFilters,
     setSeverityFilters,
-    clearSeverityFilters,
     setSelectedItem,
     notificationFilterStatuses,
     notificationFilterPriorities,
     setNotificationFilters,
-    resetNotificationFilters,
+    clearFilters,
+    clearNarrowingFilters,
   } = useAdvisorStateSnapshot()
   const { data: project } = useSelectedProjectQuery()
   const { activeSidebar, closeSidebar } = useSidebarManagerSnapshot()
@@ -44,17 +46,32 @@ export const AdvisorPanel = () => {
   const isSidebarOpen = activeSidebar?.id === SIDEBAR_KEYS.ADVISOR_PANEL
   const markedRead = useRef<string[]>([])
   const hasProjectRef = !!project?.ref
-  const shouldLoadProjectAdvisorData = isSidebarOpen && hasProjectRef && activeTab !== 'messages'
+  const isCategorySelected = (category: AdvisorCategory) =>
+    categoryFilters.length === 0 || categoryFilters.includes(category)
+  // Each source is fetched only when a category it can produce items for is selected, so
+  // filtering down to one category doesn't run the checks behind the others. Health in
+  // particular hits live infrastructure, and signals only ever produce security items.
+  const canLoadProjectData = isSidebarOpen && hasProjectRef
+  const shouldLoadLints =
+    canLoadProjectData && (isCategorySelected('security') || isCategorySelected('performance'))
+  const shouldLoadHealthLints = canLoadProjectData && isCategorySelected('health')
+  const shouldLoadSignals = canLoadProjectData && isCategorySelected('security')
 
   const {
     data: lintData,
     isPending: isLintsLoading,
     isError: isLintsError,
-  } = useProjectLintsQuery({ projectRef: project?.ref }, { enabled: shouldLoadProjectAdvisorData })
+  } = useProjectLintsQuery({ projectRef: project?.ref }, { enabled: shouldLoadLints })
+
+  const {
+    data: healthLintData,
+    isPending: isHealthLintsLoading,
+    isError: isHealthLintsError,
+  } = useProjectHealthLintsQuery({ projectRef: project?.ref }, { enabled: shouldLoadHealthLints })
 
   const { data: signalItems } = useAdvisorSignals({
     projectRef: project?.ref,
-    enabled: shouldLoadProjectAdvisorData,
+    enabled: shouldLoadSignals,
   })
 
   // Notifications should always load when sidebar is open (shown in both 'all' and 'messages' tabs)
@@ -115,8 +132,8 @@ export const AdvisorPanel = () => {
   }
 
   const lintItems = useMemo<AdvisorItem[]>(() => {
-    return createAdvisorLintItems(lintData ?? [])
-  }, [lintData])
+    return createAdvisorLintItems([...(lintData ?? []), ...(healthLintData ?? [])])
+  }, [lintData, healthLintData])
 
   const notificationItems = useMemo<AdvisorItem[]>(() => {
     if (!IS_PLATFORM) return []
@@ -127,40 +144,21 @@ export const AdvisorPanel = () => {
     return sortAdvisorItems([...lintItems, ...signalItems, ...notificationItems])
   }, [lintItems, signalItems, notificationItems])
 
-  const filteredItems = useMemo<AdvisorItem[]>(() => {
+  const itemsFilteredByCategory = useMemo<AdvisorItem[]>(() => {
     return combinedItems.filter((item) => {
-      // Filter by severity
-      if (severityFilters.length > 0 && !severityFilters.includes(item.severity)) {
-        return false
-      }
+      // Notifications are the only items that exist without a project
+      if (!hasProjectRef && item.source !== 'notification') return false
 
-      // Filter by tab
-      if (activeTab === 'all') {
-        // When no projectRef, only show notifications in 'all' tab
-        if (!hasProjectRef && item.source !== 'notification') {
-          return false
-        }
-        return true
-      }
-
-      return item.tab === activeTab
+      return categoryFilters.length === 0 || categoryFilters.includes(item.category)
     })
-  }, [combinedItems, severityFilters, activeTab, hasProjectRef])
+  }, [combinedItems, categoryFilters, hasProjectRef])
 
-  const itemsFilteredByTabOnly = useMemo<AdvisorItem[]>(() => {
-    return combinedItems.filter((item) => {
-      if (activeTab === 'all') {
-        // When no projectRef, only show notifications in 'all' tab
-        if (!hasProjectRef && item.source !== 'notification') {
-          return false
-        }
-        return true
-      }
-      return item.tab === activeTab
-    })
-  }, [combinedItems, activeTab, hasProjectRef])
+  const filteredItems = useMemo<AdvisorItem[]>(() => {
+    if (severityFilters.length === 0) return itemsFilteredByCategory
+    return itemsFilteredByCategory.filter((item) => severityFilters.includes(item.severity))
+  }, [itemsFilteredByCategory, severityFilters])
 
-  const hiddenItemsCount = itemsFilteredByTabOnly.length - filteredItems.length
+  const hiddenItemsCount = itemsFilteredByCategory.length - filteredItems.length
 
   const selectedItem = combinedItems.find(
     (item) => item.id === selectedItemId && item.source === selectedItemSource
@@ -168,17 +166,20 @@ export const AdvisorPanel = () => {
   const isDetailView = !!selectedItem
 
   // Only show loading state if the query is actually enabled
-  const isLintsActuallyLoading = shouldLoadProjectAdvisorData && isLintsLoading
+  const isLintsActuallyLoading = shouldLoadLints && isLintsLoading
   const isNotificationsActuallyLoading = shouldLoadNotifications && isNotificationsLoading
+  // Health checks hit live infrastructure and are the slowest of the three. They only block
+  // the list when health is all the user asked for — otherwise health items just fill in
+  // once they arrive, rather than holding up everything else.
+  const isShowingHealthOnly = categoryFilters.length === 1 && categoryFilters[0] === 'health'
+  const isHealthLintsActuallyLoading =
+    shouldLoadHealthLints && isHealthLintsLoading && isShowingHealthOnly
 
   // [Joshen] Opting to ignore loading and error state of advisor signals - render lints irregardless of banned ips
-  const isLoading = isLintsActuallyLoading || isNotificationsActuallyLoading
-  const isError = isLintsError || isNotificationsError
-
-  const handleTabChange = (tab: string) => {
-    setActiveTab(tab as AdvisorTab)
-    setSelectedItem(undefined)
-  }
+  const isLoading =
+    isLintsActuallyLoading || isNotificationsActuallyLoading || isHealthLintsActuallyLoading
+  const isError =
+    isLintsError || isNotificationsError || (isHealthLintsError && isShowingHealthOnly)
 
   const handleBackToList = () => {
     setSelectedItem(undefined)
@@ -200,12 +201,7 @@ export const AdvisorPanel = () => {
       }
     }
 
-    const advisorCategory =
-      item.source === 'lint'
-        ? item.original.categories[0]
-        : item.source === 'signal'
-          ? 'SECURITY'
-          : undefined
+    const advisorCategory = getAdvisorItemTelemetryCategory(item)
     const advisorType =
       item.source === 'signal'
         ? item.type
@@ -227,12 +223,9 @@ export const AdvisorPanel = () => {
     updateNotifications({ ids: [id], status })
   }
 
-  const handleClearAllFilters = () => {
-    clearSeverityFilters()
-    resetNotificationFilters()
-  }
-
-  const hasAnyFilters = severityFilters.length > 0 || notificationFilterStatuses.length > 0
+  // Category selection changes which kinds of item are listed; severity and status hide
+  // items within them, which is what the empty state and "show more" need to know about.
+  const hasNarrowingFilters = severityFilters.length > 0 || notificationFilterStatuses.length > 0
 
   return (
     <div className="flex h-full flex-col bg-background">
@@ -263,8 +256,11 @@ export const AdvisorPanel = () => {
       ) : (
         <>
           <AdvisorFilters
-            activeTab={activeTab}
-            onTabChange={handleTabChange}
+            categoryFilters={[...categoryFilters]}
+            onCategoryFiltersChange={(categories) => {
+              setCategoryFilters(categories)
+              setSelectedItem(undefined)
+            }}
             severityFilters={[...severityFilters]}
             onSeverityFiltersChange={setSeverityFilters}
             statusFilters={[...notificationFilterStatuses]}
@@ -284,12 +280,13 @@ export const AdvisorPanel = () => {
               isLoading={isLoading}
               isError={isError}
               filteredItems={filteredItems}
-              activeTab={activeTab}
+              categoryFilters={[...categoryFilters]}
               severityFilters={[...severityFilters]}
               onItemClick={handleItemClick}
-              onClearFilters={handleClearAllFilters}
+              onClearFilters={clearFilters}
+              onShowHiddenItems={clearNarrowingFilters}
               hiddenItemsCount={hiddenItemsCount}
-              hasAnyFilters={hasAnyFilters}
+              hasAnyFilters={hasNarrowingFilters}
               hasProjectRef={hasProjectRef}
               projectNameByRef={projectNameByRef}
             />
diff --git a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.types.ts b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.types.ts
index 17f8fd43ea288..75820e7eadb34 100644
--- a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.types.ts
+++ b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.types.ts
@@ -1,6 +1,6 @@
 import type { Lint } from '@/data/lint/lint-query'
 import type { Notification } from '@/data/notifications/notifications-v2-query'
-import type { AdvisorItemSource, AdvisorSeverity } from '@/state/advisor-state'
+import type { AdvisorCategory, AdvisorItemSource, AdvisorSeverity } from '@/state/advisor-state'
 
 export type AdvisorSignalType = 'banned-ip'
 
@@ -14,7 +14,7 @@ type AdvisorBaseItem = {
   title: string
   severity: AdvisorSeverity
   createdAt?: number
-  tab: 'security' | 'performance' | 'messages'
+  category: AdvisorCategory
   source: AdvisorItemSource
 }
 
diff --git a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.utils.test.ts b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.utils.test.ts
index 23366adc4ec45..13178bf372d67 100644
--- a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.utils.test.ts
+++ b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.utils.test.ts
@@ -5,6 +5,7 @@ import {
   createAdvisorLintItems,
   createAdvisorNotificationItems,
   getAdvisorItemSecondaryText,
+  getAdvisorItemTelemetryCategory,
   sortAdvisorItems,
 } from './AdvisorPanel.utils'
 import type { Lint } from '@/data/lint/lint-query'
@@ -41,7 +42,7 @@ const createBannedIPSignalItem = (ip: string): AdvisorSignalItem => ({
   source: 'signal',
   type: 'banned-ip',
   severity: 'warning',
-  tab: 'security',
+  category: 'security',
   title: 'Banned IP address',
   summary: `The IP address \`${ip}\` is temporarily blocked.`,
   docsUrl: 'https://supabase.com/docs/reference/cli/supabase-network-bans',
@@ -72,6 +73,37 @@ describe('AdvisorPanel.utils', () => {
     expect(getAdvisorItemSecondaryText(bannedIpSignal)).toBe('Database · 203.0.113.10')
   })
 
+  describe('lint categories', () => {
+    it('files a health lint under the health category', () => {
+      const [item] = createAdvisorLintItems([
+        createLint({
+          cache_key: 'instance_db_down',
+          name: 'instance_db_down',
+          categories: ['HEALTH'],
+          metadata: { type: 'health', entity: 'Database' },
+        }),
+      ])
+
+      expect(item?.category).toBe('health')
+      expect(getAdvisorItemTelemetryCategory(item!)).toBe('HEALTH')
+    })
+
+    it('keeps security ahead of health when a lint carries both categories', () => {
+      const [item] = createAdvisorLintItems([
+        createLint({ cache_key: 'both', categories: ['HEALTH', 'SECURITY'] }),
+      ])
+
+      expect(item?.category).toBe('security')
+      expect(getAdvisorItemTelemetryCategory(item!)).toBe('SECURITY')
+    })
+
+    it('drops lints with no recognised category', () => {
+      expect(
+        createAdvisorLintItems([createLint({ categories: [] as Lint['categories'] })])
+      ).toEqual([])
+    })
+  })
+
   describe('notification secondary text', () => {
     const [notificationWithProject] = createAdvisorNotificationItems([
       createNotification({
diff --git a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.utils.ts b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.utils.ts
index 9ee683d0e2076..efdd02e2efd91 100644
--- a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.utils.ts
+++ b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.utils.ts
@@ -1,12 +1,12 @@
 import dayjs from 'dayjs'
-import { Gauge, Inbox, Shield } from 'lucide-react'
+import { Activity, Gauge, Inbox, Shield } from 'lucide-react'
 import type { ElementType } from 'react'
 
 import type { AdvisorItem, AdvisorLintItem, AdvisorNotificationItem } from './AdvisorPanel.types'
 import { lintInfoMap } from '@/components/interfaces/Linter/Linter.utils'
 import type { Lint } from '@/data/lint/lint-query'
 import type { Notification, NotificationData } from '@/data/notifications/notifications-v2-query'
-import type { AdvisorSeverity, AdvisorTab } from '@/state/advisor-state'
+import type { AdvisorCategory, AdvisorSeverity } from '@/state/advisor-state'
 
 export const MAX_HOMEPAGE_ADVISOR_ITEMS = 4
 
@@ -40,26 +40,48 @@ export const notificationPriorityToSeverity = (
   }
 }
 
+export type LintCategory = Lint['categories'][number]
+
+/**
+ * A lint can carry more than one category, so the order here decides which one it is
+ * filtered and reported under.
+ */
+const lintCategoryPriority = ['SECURITY', 'PERFORMANCE', 'HEALTH'] as const
+
+const lintToAdvisorCategory = {
+  SECURITY: 'security',
+  PERFORMANCE: 'performance',
+  HEALTH: 'health',
+} as const satisfies Record<LintCategory, AdvisorCategory>
+
+export const getLintCategory = (lint: Lint): LintCategory | undefined =>
+  lintCategoryPriority.find((category) => (lint.categories || []).includes(category))
+
+/**
+ * Telemetry reports the API's own category names. Notifications have no API category;
+ * signals are security-only today.
+ */
+export const getAdvisorItemTelemetryCategory = (item: AdvisorItem): LintCategory | undefined => {
+  if (item.source === 'lint') return getLintCategory(item.original)
+  if (item.source === 'signal') return 'SECURITY'
+  return undefined
+}
+
 export const createAdvisorLintItems = (lintData?: Lint[]): AdvisorLintItem[] => {
   if (!lintData) return []
 
   return lintData
     .map((lint): AdvisorLintItem | null => {
-      const categories = lint.categories || []
-      const tab = categories.includes('SECURITY')
-        ? ('security' as const)
-        : categories.includes('PERFORMANCE')
-          ? ('performance' as const)
-          : undefined
+      const category = getLintCategory(lint)
 
-      if (!tab) return null
+      if (!category) return null
 
       return {
+        category: lintToAdvisorCategory[category],
         id: lint.cache_key,
         title: lint.detail,
         severity: lintLevelToSeverity(lint.level),
         createdAt: undefined,
-        tab,
         source: 'lint',
         original: lint,
       }
@@ -80,7 +102,7 @@ export const createAdvisorNotificationItems = (
       title: data.title,
       severity: notificationPriorityToSeverity(notification.priority),
       createdAt: dayjs(notification.inserted_at).valueOf(),
-      tab: 'messages' as const,
+      category: 'messages' as const,
       source: 'notification' as const,
       original: notification,
       project_ref: data.project_ref,
@@ -150,12 +172,20 @@ export const getAdvisorItemSecondaryText = (
   return undefined
 }
 
-export const tabIconMap: Record<Exclude<AdvisorTab, 'all'>, ElementType> = {
+export const advisorCategoryIcons: Record<AdvisorCategory, ElementType> = {
   security: Shield,
   performance: Gauge,
+  health: Activity,
   messages: Inbox,
 }
 
+export const advisorCategoryLabels: Record<AdvisorCategory, string> = {
+  security: 'Security',
+  performance: 'Performance',
+  health: 'Health',
+  messages: 'Messages',
+}
+
 export const severityColorClasses: Record<AdvisorSeverity, string> = {
   critical: 'text-destructive',
   warning: 'text-warning',
diff --git a/apps/studio/components/ui/AdvisorPanel/AdvisorPanelBody.tsx b/apps/studio/components/ui/AdvisorPanel/AdvisorPanelBody.tsx
index dc231bd50807c..78015273dec04 100644
--- a/apps/studio/components/ui/AdvisorPanel/AdvisorPanelBody.tsx
+++ b/apps/studio/components/ui/AdvisorPanel/AdvisorPanelBody.tsx
@@ -4,17 +4,17 @@ import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
 
 import type { AdvisorItem } from './AdvisorPanel.types'
 import {
+  advisorCategoryIcons,
   formatItemDate,
   getAdvisorItemSecondaryText,
   getAdvisorPanelItemDisplayTitle,
   severityBadgeVariants,
   severityColorClasses,
   severityLabels,
-  tabIconMap,
 } from './AdvisorPanel.utils'
 import { EmptyAdvisor } from './EmptyAdvisor'
 import type { Notification } from '@/data/notifications/notifications-v2-query'
-import type { AdvisorSeverity, AdvisorTab } from '@/state/advisor-state'
+import type { AdvisorCategory, AdvisorSeverity } from '@/state/advisor-state'
 
 const NoProjectNotice = () => {
   return (
@@ -23,7 +23,7 @@ const NoProjectNotice = () => {
       <div className="text-center">
         <p className="heading-default">Project required</p>
         <p className="text-foreground-light text-sm">
-          Select a project to view security and performance advisories
+          Select a project to view its security, performance and health advisories
         </p>
       </div>
     </div>
@@ -34,10 +34,11 @@ interface AdvisorPanelBodyProps {
   isLoading: boolean
   isError: boolean
   filteredItems: AdvisorItem[]
-  activeTab: AdvisorTab
+  categoryFilters: AdvisorCategory[]
   severityFilters: AdvisorSeverity[]
   onItemClick: (item: AdvisorItem) => void
   onClearFilters: () => void
+  onShowHiddenItems: () => void
   hiddenItemsCount: number
   hasAnyFilters: boolean
   hasProjectRef?: boolean
@@ -48,17 +49,21 @@ export const AdvisorPanelBody = ({
   isLoading,
   isError,
   filteredItems,
-  activeTab,
+  categoryFilters,
   severityFilters,
   onItemClick,
   onClearFilters,
+  onShowHiddenItems,
   hiddenItemsCount,
   hasAnyFilters,
   hasProjectRef = true,
   projectNameByRef,
 }: AdvisorPanelBodyProps) => {
-  // Show notice if no project ref and trying to view project-specific tabs
-  if (!hasProjectRef && activeTab !== 'messages' && activeTab !== 'all') {
+  // Notifications are the only items that exist without a project, so the notice replaces
+  // the list whenever the user has narrowed to categories that need one.
+  const needsProject =
+    categoryFilters.length > 0 && categoryFilters.every((category) => category !== 'messages')
+  if (!hasProjectRef && needsProject) {
     return <NoProjectNotice />
   }
 
@@ -85,7 +90,7 @@ export const AdvisorPanelBody = ({
   if (filteredItems.length === 0) {
     return (
       <EmptyAdvisor
-        activeTab={activeTab}
+        categoryFilters={categoryFilters}
         hasFilters={hasAnyFilters}
         onClearFilters={onClearFilters}
       />
@@ -96,7 +101,7 @@ export const AdvisorPanelBody = ({
     <>
       <div className="flex flex-col">
         {filteredItems.map((item) => {
-          const SeverityIcon = tabIconMap[item.tab as Exclude<AdvisorTab, 'all'>]
+          const CategoryIcon = advisorCategoryIcons[item.category]
           const severityClass = severityColorClasses[item.severity]
           const isNotification = item.source === 'notification'
           const notification = isNotification ? (item.original as Notification) : null
@@ -122,7 +127,7 @@ export const AdvisorPanelBody = ({
               >
                 <div className="flex items-center justify-between gap-2">
                   <div className="flex items-center gap-3 overflow-hidden">
-                    <SeverityIcon
+                    <CategoryIcon
                       size={16}
                       strokeWidth={1.5}
                       className={cn('shrink-0', severityClass)}
@@ -160,7 +165,7 @@ export const AdvisorPanelBody = ({
       </div>
       {severityFilters.length > 0 && hiddenItemsCount > 0 && (
         <div className="px-4 py-3">
-          <Button variant="text" className="w-full" onClick={onClearFilters}>
+          <Button variant="text" className="w-full" onClick={onShowHiddenItems}>
             Show {hiddenItemsCount} more issue{hiddenItemsCount !== 1 ? 's' : ''}
           </Button>
         </div>
diff --git a/apps/studio/components/ui/AdvisorPanel/EmptyAdvisor.tsx b/apps/studio/components/ui/AdvisorPanel/EmptyAdvisor.tsx
index c8a2773fe32d3..5f195753203d8 100644
--- a/apps/studio/components/ui/AdvisorPanel/EmptyAdvisor.tsx
+++ b/apps/studio/components/ui/AdvisorPanel/EmptyAdvisor.tsx
@@ -1,53 +1,68 @@
 import { TextSearch } from 'lucide-react'
 import { Button } from 'ui'
 
-import type { AdvisorTab } from '@/state/advisor-state'
+import type { AdvisorCategory } from '@/state/advisor-state'
+
+const emptyCopyByCategory: Record<AdvisorCategory, { heading: string; message: string }> = {
+  security: {
+    heading: 'No security issues detected',
+    message: 'Congrats! There are no security issues detected for this project',
+  },
+  performance: {
+    heading: 'No performance issues detected',
+    message: 'Congrats! There are no performance issues detected for this project',
+  },
+  health: {
+    heading: 'No health issues detected',
+    message: 'Your database, instance and services are all responding normally',
+  },
+  messages: {
+    heading: 'No messages',
+    message: 'Messages alert you of upcoming changes or potential issues with your project',
+  },
+}
 
 interface EmptyAdvisorProps {
-  activeTab: AdvisorTab
+  categoryFilters: AdvisorCategory[]
+  /**
+   * Whether severity or status filters are narrowing the list. Unlike the category filter,
+   * these can hide items the user would otherwise see, so we can't claim nothing was found.
+   */
   hasFilters: boolean
   onClearFilters: () => void
 }
 
-export const EmptyAdvisor = ({ activeTab, hasFilters, onClearFilters }: EmptyAdvisorProps) => {
-  const getHeading = () => {
-    if (hasFilters) return 'No items found'
-
-    switch (activeTab) {
-      case 'security':
-        return 'No security issues detected'
-      case 'performance':
-        return 'No performance issues detected'
-      case 'messages':
-        return 'No messages'
-      default:
-        return 'No issues detected'
-    }
-  }
+export const EmptyAdvisor = ({
+  categoryFilters,
+  hasFilters,
+  onClearFilters,
+}: EmptyAdvisorProps) => {
+  const singleCategory = categoryFilters.length === 1 ? categoryFilters[0] : undefined
+  const canClearFilters = hasFilters || categoryFilters.length > 0
 
-  const getMessage = () => {
-    if (hasFilters) return 'No advisor items match your current filters'
-
-    switch (activeTab) {
-      case 'security':
-        return 'Congrats! There are no security issues detected for this project'
-      case 'performance':
-        return 'Congrats! There are no performance issues detected for this project'
-      case 'messages':
-        return 'Messages alert you of upcoming changes or potential issues with your project'
-      default:
-        return 'Congrats! There are no issues detected'
+  const getCopy = () => {
+    if (hasFilters) {
+      return {
+        heading: 'No items found',
+        message: 'No advisor items match your current filters',
+      }
     }
+
+    if (singleCategory) return emptyCopyByCategory[singleCategory]
+
+    return { heading: 'No issues detected', message: 'Congrats! There are no issues detected' }
   }
 
+  const { heading, message } = getCopy()
+
   return (
     <div className="h-full px-6 flex flex-col items-center justify-center w-full gap-y-2">
       <TextSearch className="text-foreground-muted" strokeWidth={1} />
       <div className="flex flex-col items-center gap-y-0.5 text-center">
-        <h3 className="heading-default">{getHeading()}</h3>
-        <p className="text-foreground-light text-sm text-balance">{getMessage()}</p>
+        <h3 className="heading-default">{heading}</h3>
+        <p className="text-foreground-light text-sm text-balance">{message}</p>
       </div>
-      {hasFilters && (
+      {canClearFilters && (
         <Button variant="outline" onClick={onClearFilters}>
           Clear filters
         </Button>
diff --git a/apps/studio/components/ui/AdvisorPanel/useAdvisorSignals.ts b/apps/studio/components/ui/AdvisorPanel/useAdvisorSignals.ts
index 08592d73b2474..19f5561ee8b3e 100644
--- a/apps/studio/components/ui/AdvisorPanel/useAdvisorSignals.ts
+++ b/apps/studio/components/ui/AdvisorPanel/useAdvisorSignals.ts
@@ -26,7 +26,7 @@ const createBannedIPSignalItems = ({
     source: 'signal' as const,
     type: 'banned-ip' as const,
     severity: 'warning' as const,
-    tab: 'security' as const,
+    category: 'security' as const,
     title: 'Banned IP address',
     summary: `The IP address \`${ip}\` is temporarily blocked because of suspicious traffic or repeated failed password attempts.`,
     description:
diff --git a/apps/studio/data/lint/health-lints-query.test.ts b/apps/studio/data/lint/health-lints-query.test.ts
new file mode 100644
index 0000000000000..9f5ef69f8e0ec
--- /dev/null
+++ b/apps/studio/data/lint/health-lints-query.test.ts
@@ -0,0 +1,81 @@
+import { HttpResponse } from 'msw'
+import { describe, expect, it } from 'vitest'
+
+import { getProjectHealthLints, HEALTH_LINT_NAMES } from './health-lints-query'
+import type { components } from '@/data/api'
+import { addAPIMock } from '@/tests/lib/msw'
+
+type AdvisorsResponse = components['schemas']['V2ProjectAdvisorsResponse_Output']
+type AdvisorsRequestBody = components['schemas']['V2RunProjectAdvisorsBody']
+type AdvisorLint = AdvisorsResponse['data']['attributes']['lints'][number]
+
+const createLint = (overrides: Partial<AdvisorLint> = {}): AdvisorLint =>
+  ({
+    cache_key: 'instance_db_down',
+    name: 'instance_db_down',
+    title: 'Database process is down',
+    level: 'ERROR',
+    facing: 'EXTERNAL',
+    categories: ['HEALTH'],
+    description: 'The instance is running but Postgres is not accepting connections locally.',
+    detail: 'The on-host check of Postgres is failing.',
+    remediation: 'https://supabase.com/docs/guides/platform/troubleshooting',
+    metadata: { type: 'health', entity: 'Database' },
+    ...overrides,
+  }) as AdvisorLint
+
+const mockAdvisorsRun = (lints: AdvisorLint[], onRequest?: (body: AdvisorsRequestBody) => void) => {
+  addAPIMock({
+    method: 'post',
+    path: '/v2/projects/:ref/advisors/run',
+    response: async ({ request }) => {
+      onRequest?.((await request.json()) as AdvisorsRequestBody)
+      return HttpResponse.json<AdvisorsResponse>({
+        data: { type: 'project_advisors', attributes: { lints } },
+      })
+    },
+  })
+}
+
+describe('getProjectHealthLints', () => {
+  it('asks the endpoint for the health lints Studio surfaces', async () => {
+    let requestBody: AdvisorsRequestBody | undefined
+    mockAdvisorsRun([], (body) => {
+      requestBody = body
+    })
+
+    await getProjectHealthLints({ projectRef: 'default' })
+
+    expect(requestBody?.data.attributes.lints.map((lint) => lint.name)).toEqual([
+      ...HEALTH_LINT_NAMES,
+    ])
+  })
+
+  it('returns the health issues the project actually has', async () => {
+    mockAdvisorsRun([createLint()])
+
+    const result = await getProjectHealthLints({ projectRef: 'default' })
+
+    expect(result.map((lint) => lint.name)).toEqual(['instance_db_down'])
+  })
+
+  it('drops results that report on the check rather than on the project', async () => {
+    mockAdvisorsRun([
+      createLint(),
+      createLint({
+        cache_key: 'advisor_check_unavailable:metrics_unavailable',
+        name: 'advisor_check_unavailable',
+        level: 'INFO',
+      }),
+      createLint({ cache_key: 'project_not_active', name: 'project_not_active' }),
+    ])
+
+    const result = await getProjectHealthLints({ projectRef: 'default' })
+
+    expect(result.map((lint) => lint.name)).toEqual(['instance_db_down'])
+  })
+
+  it('throws when no project ref is given', async () => {
+    await expect(getProjectHealthLints({})).rejects.toThrow('Project ref is required')
+  })
+})
diff --git a/apps/studio/data/lint/health-lints-query.ts b/apps/studio/data/lint/health-lints-query.ts
new file mode 100644
index 0000000000000..2008da4d68cb8
--- /dev/null
+++ b/apps/studio/data/lint/health-lints-query.ts
@@ -0,0 +1,91 @@
+import { useQuery } from '@tanstack/react-query'
+import type { components } from 'api-types'
+
+import { lintKeys } from './keys'
+import type { Lint } from './lint-query'
+import { handleError, post } from '@/data/fetchers'
+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { IS_PLATFORM, PROJECT_STATUS } from '@/lib/constants'
+import { EMPTY_ARR } from '@/lib/void'
+import type { ResponseError, UseCustomQueryOptions } from '@/types'
+
+type AdvisorLintName =
+  components['schemas']['V2RunProjectAdvisorsBody']['data']['attributes']['lints'][number]['name']
+
+/**
+ * Health lints are on-demand only on the API side — each one opens a live database
+ * connection or queries the metrics/logs store — so the endpoint runs only the lints it
+ * is asked for. We request the checks that mean the project is actually broken, and leave
+ * out the diagnostic ones (`db_connection_failing`, `instance_telemetry_lost`), which
+ * describe the state of our own probes more than the state of the project.
+ */
+export const HEALTH_LINT_NAMES = [
+  'instance_db_down',
+  'db_not_reachable',
+  'db_connection_limit_reached',
+  'log_data_api_error_rate_high',
+  'log_auth_error_rate_high',
+  'log_storage_error_rate_high',
+  'log_edge_function_error_rate_high',
+  'instance_alert_firing',
+] as const satisfies readonly AdvisorLintName[]
+
+/**
+ * Names the API only ever returns as a result: they report that a check could not run
+ * rather than an issue with the project, and several checks can return the same one, so
+ * they'd show up as duplicate non-issues in the advisor lists.
+ */
+const RESULT_ONLY_LINT_NAMES = new Set(['project_not_active', 'advisor_check_unavailable'])
+
+type ProjectHealthLintsVariables = {
+  projectRef?: string
+}
+
+export async function getProjectHealthLints(
+  { projectRef }: ProjectHealthLintsVariables,
+  signal?: AbortSignal
+) {
+  if (!projectRef) throw new Error('Project ref is required')
+
+  const { data, error } = await post('/v2/projects/{ref}/advisors/run', {
+    params: { path: { ref: projectRef } },
+    body: {
+      data: {
+        type: 'project_advisors',
+        attributes: { lints: HEALTH_LINT_NAMES.map((name) => ({ name })) },
+      },
+    },
+    signal,
+  })
+
+  if (error) handleError(error)
+
+  const lints: Lint[] = data?.data.attributes.lints ?? EMPTY_ARR
+  return lints.filter((lint) => !RESULT_ONLY_LINT_NAMES.has(lint.name))
+}
+
+export type ProjectHealthLintsData = Awaited<ReturnType<typeof getProjectHealthLints>>
+export type ProjectHealthLintsError = ResponseError
+
+export const useProjectHealthLintsQuery = <TData = ProjectHealthLintsData>(
+  { projectRef }: ProjectHealthLintsVariables,
+  {
+    enabled = true,
+    ...options
+  }: UseCustomQueryOptions<ProjectHealthLintsData, ProjectHealthLintsError, TData> = {}
+) => {
+  const { data: project } = useSelectedProjectQuery()
+  const isActive = project?.status === PROJECT_STATUS.ACTIVE_HEALTHY
+
+  return useQuery<ProjectHealthLintsData, ProjectHealthLintsError, TData>({
+    queryKey: lintKeys.healthLints(projectRef),
+    queryFn: ({ signal }) => getProjectHealthLints({ projectRef }, signal),
+    enabled: enabled && IS_PLATFORM && typeof projectRef !== 'undefined' && isActive,
+    // Every run costs a live database connection plus a metrics and a logs query, so keep
+    // repeat mounts (homepage row, advisor panel) on one result and don't retry failures.
+    staleTime: 60_000,
+    retry: false,
+    refetchOnWindowFocus: false,
+    ...options,
+  })
+}
diff --git a/apps/studio/data/lint/keys.ts b/apps/studio/data/lint/keys.ts
index d1a110e0ddd87..a618628c10dac 100644
--- a/apps/studio/data/lint/keys.ts
+++ b/apps/studio/data/lint/keys.ts
@@ -1,4 +1,6 @@
 export const lintKeys = {
   lint: (projectRef: string | undefined) => ['projects', projectRef, 'lint'] as const,
+  healthLints: (projectRef: string | undefined) =>
+    ['projects', projectRef, 'lint', 'health'] as const,
   lintRules: (projectRef: string | undefined) => ['projects', projectRef, 'lint-rules'] as const,
 }
diff --git a/apps/studio/pages/project/[ref]/advisors/health.tsx b/apps/studio/pages/project/[ref]/advisors/health.tsx
new file mode 100644
index 0000000000000..6fbd58d8972a9
--- /dev/null
+++ b/apps/studio/pages/project/[ref]/advisors/health.tsx
@@ -0,0 +1,101 @@
+import { useParams } from 'common'
+import { useMemo, useState } from 'react'
+import { LoadingLine } from 'ui'
+
+import { LINTER_LEVELS } from '@/components/interfaces/Linter/Linter.constants'
+import { lintInfoMap, parseLinterLevel } from '@/components/interfaces/Linter/Linter.utils'
+import { LinterDataGrid } from '@/components/interfaces/Linter/LinterDataGrid'
+import LinterFilters from '@/components/interfaces/Linter/LinterFilters'
+import LintPageTabs from '@/components/interfaces/Linter/LintPageTabs'
+import { useAdvisorPageShortcuts } from '@/components/interfaces/Linter/useAdvisorPageShortcuts'
+import AdvisorsLayout from '@/components/layouts/AdvisorsLayout/AdvisorsLayout'
+import { DefaultLayout } from '@/components/layouts/DefaultLayout'
+import { FormHeader } from '@/components/ui/Forms/FormHeader'
+import { useProjectHealthLintsQuery } from '@/data/lint/health-lints-query'
+import { Lint } from '@/data/lint/lint-query'
+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { IS_PLATFORM } from '@/lib/constants'
+import type { NextPageWithLayout } from '@/types'
+
+const ProjectHealthLints: NextPageWithLayout = () => {
+  const { preset, id } = useParams()
+  const { data: project } = useSelectedProjectQuery()
+
+  const [filters, setFilters] = useState<{ level: LINTER_LEVELS; filters: string[] }[]>([
+    { level: LINTER_LEVELS.ERROR, filters: [] },
+    { level: LINTER_LEVELS.WARN, filters: [] },
+    { level: LINTER_LEVELS.INFO, filters: [] },
+  ])
+  const [currentTab, setCurrentTab] = useState<LINTER_LEVELS>(
+    parseLinterLevel(preset) ?? LINTER_LEVELS.ERROR
+  )
+  const { data, isPending, isRefetching, refetch } = useProjectHealthLintsQuery({
+    projectRef: project?.ref,
+  })
+
+  // Health checks are platform-only. If this page is opened self-hosted the query stays
+  // disabled, and `isPending` would otherwise spin forever.
+  const isLoading = IS_PLATFORM && isPending
+
+  const activeLints = (data ?? []).filter((lint) => lint.categories.includes('HEALTH'))
+  const currentTabFilters = filters.find((filter) => filter.level === currentTab)?.filters ?? []
+  const filteredLints = activeLints
+    .filter((x) => x.level === currentTab)
+    .filter((x) => (currentTabFilters.length > 0 ? currentTabFilters.includes(x.name) : x))
+  const filterOptions = lintInfoMap
+    .filter((item) =>
+      activeLints.some((lint) => lint.name === item.name && lint.level === currentTab)
+    )
+    .map((type) => ({
+      name: type.title,
+      value: type.name,
+    }))
+
+  const selectedLint: Lint | null = useMemo(() => {
+    return activeLints.find((lint) => lint.cache_key === id) ?? null
+  }, [id, activeLints])
+
+  useAdvisorPageShortcuts({
+    setCurrentTab,
+    refetch,
+    hasSelectedLint: selectedLint !== null,
+    isRefreshDisabled: isLoading || isRefetching,
+  })
+
+  return (
+    <div className="h-full flex flex-col">
+      <FormHeader className="py-4 px-6 -mb-px!" title="Health Advisor" />
+      <LintPageTabs
+        activeLints={activeLints}
+        isLoading={isLoading}
+        currentTab={currentTab}
+        setCurrentTab={setCurrentTab}
+      />
+      <LinterFilters
+        filterOptions={filterOptions}
+        filteredLints={filteredLints}
+        activeLints={activeLints}
+        currentTab={currentTab}
+        filters={filters}
+        isLoading={isLoading || isRefetching}
+        setFilters={setFilters}
+        onClickRefresh={refetch}
+      />
+      <LoadingLine loading={isRefetching} />
+      <LinterDataGrid
+        filteredLints={filteredLints}
+        currentTab={currentTab}
+        selectedLint={selectedLint}
+        isLoading={isLoading}
+      />
+    </div>
+  )
+}
+
+ProjectHealthLints.getLayout = (page) => (
+  <DefaultLayout>
+    <AdvisorsLayout title="Linter">{page}</AdvisorsLayout>
+  </DefaultLayout>
+)
+
+export default ProjectHealthLints
diff --git a/apps/studio/routeTree.gen.ts b/apps/studio/routeTree.gen.ts
index 8c15cc0547c0e..5525691e47180 100644
--- a/apps/studio/routeTree.gen.ts
+++ b/apps/studio/routeTree.gen.ts
@@ -178,6 +178,7 @@ import { Route as ProjectRefAuthAuditLogsRouteImport } from './routes/project/$r
 import { Route as ProjectRefAdvisorsSecurityRouteImport } from './routes/project/$ref/advisors/security'
 import { Route as ProjectRefAdvisorsRulesRouteImport } from './routes/project/$ref/advisors/rules'
 import { Route as ProjectRefAdvisorsPerformanceRouteImport } from './routes/project/$ref/advisors/performance'
+import { Route as ProjectRefAdvisorsHealthRouteImport } from './routes/project/$ref/advisors/health'
 import { Route as ApiPlatformTelemetryEventRouteImport } from './routes/api/platform/telemetry/event'
 import { Route as ApiPlatformIntegrationsSlugRouteImport } from './routes/api/platform/integrations/$slug'
 import { Route as ApiAiSqlTitleV2RouteImport } from './routes/api/ai/sql/title-v2'
@@ -1238,6 +1239,12 @@ const ProjectRefAdvisorsPerformanceRoute =
     path: '/performance',
     getParentRoute: () => ProjectRefAdvisorsRoute,
   } as any)
+const ProjectRefAdvisorsHealthRoute =
+  ProjectRefAdvisorsHealthRouteImport.update({
+    id: '/health',
+    path: '/health',
+    getParentRoute: () => ProjectRefAdvisorsRoute,
+  } as any)
 const ApiPlatformTelemetryEventRoute =
   ApiPlatformTelemetryEventRouteImport.update({
     id: '/api/platform/telemetry/event',
@@ -2207,6 +2214,7 @@ export interface FileRoutesByFullPath {
   '/api/ai/sql/title-v2': typeof ApiAiSqlTitleV2Route
   '/api/platform/integrations/$slug': typeof ApiPlatformIntegrationsSlugRoute
   '/api/platform/telemetry/event': typeof ApiPlatformTelemetryEventRoute
+  '/project/$ref/advisors/health': typeof ProjectRefAdvisorsHealthRoute
   '/project/$ref/advisors/performance': typeof ProjectRefAdvisorsPerformanceRoute
   '/project/$ref/advisors/rules': typeof ProjectRefAdvisorsRulesRouteWithChildren
   '/project/$ref/advisors/security': typeof ProjectRefAdvisorsSecurityRoute
@@ -2514,6 +2522,7 @@ export interface FileRoutesByTo {
   '/api/ai/sql/title-v2': typeof ApiAiSqlTitleV2Route
   '/api/platform/integrations/$slug': typeof ApiPlatformIntegrationsSlugRoute
   '/api/platform/telemetry/event': typeof ApiPlatformTelemetryEventRoute
+  '/project/$ref/advisors/health': typeof ProjectRefAdvisorsHealthRoute
   '/project/$ref/advisors/performance': typeof ProjectRefAdvisorsPerformanceRoute
   '/project/$ref/advisors/rules': typeof ProjectRefAdvisorsRulesRouteWithChildren
   '/project/$ref/advisors/security': typeof ProjectRefAdvisorsSecurityRoute
@@ -2832,6 +2841,7 @@ export interface FileRoutesById {
   '/api/ai/sql/title-v2': typeof ApiAiSqlTitleV2Route
   '/api/platform/integrations/$slug': typeof ApiPlatformIntegrationsSlugRoute
   '/api/platform/telemetry/event': typeof ApiPlatformTelemetryEventRoute
+  '/project/$ref/advisors/health': typeof ProjectRefAdvisorsHealthRoute
   '/project/$ref/advisors/performance': typeof ProjectRefAdvisorsPerformanceRoute
   '/project/$ref/advisors/rules': typeof ProjectRefAdvisorsRulesRouteWithChildren
   '/project/$ref/advisors/security': typeof ProjectRefAdvisorsSecurityRoute
@@ -3152,6 +3162,7 @@ export interface FileRouteTypes {
     | '/api/ai/sql/title-v2'
     | '/api/platform/integrations/$slug'
     | '/api/platform/telemetry/event'
+    | '/project/$ref/advisors/health'
     | '/project/$ref/advisors/performance'
     | '/project/$ref/advisors/rules'
     | '/project/$ref/advisors/security'
@@ -3459,6 +3470,7 @@ export interface FileRouteTypes {
     | '/api/ai/sql/title-v2'
     | '/api/platform/integrations/$slug'
     | '/api/platform/telemetry/event'
+    | '/project/$ref/advisors/health'
     | '/project/$ref/advisors/performance'
     | '/project/$ref/advisors/rules'
     | '/project/$ref/advisors/security'
@@ -3776,6 +3788,7 @@ export interface FileRouteTypes {
     | '/api/ai/sql/title-v2'
     | '/api/platform/integrations/$slug'
     | '/api/platform/telemetry/event'
+    | '/project/$ref/advisors/health'
     | '/project/$ref/advisors/performance'
     | '/project/$ref/advisors/rules'
     | '/project/$ref/advisors/security'
@@ -5303,6 +5316,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof ProjectRefAdvisorsPerformanceRouteImport
       parentRoute: typeof ProjectRefAdvisorsRoute
     }
+    '/project/$ref/advisors/health': {
+      id: '/project/$ref/advisors/health'
+      path: '/health'
+      fullPath: '/project/$ref/advisors/health'
+      preLoaderRoute: typeof ProjectRefAdvisorsHealthRouteImport
+      parentRoute: typeof ProjectRefAdvisorsRoute
+    }
     '/api/platform/telemetry/event': {
       id: '/api/platform/telemetry/event'
       path: '/api/platform/telemetry/event'
@@ -6504,12 +6524,14 @@ const ProjectRefAdvisorsRulesRouteWithChildren =
   )
 
 interface ProjectRefAdvisorsRouteChildren {
+  ProjectRefAdvisorsHealthRoute: typeof ProjectRefAdvisorsHealthRoute
   ProjectRefAdvisorsPerformanceRoute: typeof ProjectRefAdvisorsPerformanceRoute
   ProjectRefAdvisorsRulesRoute: typeof ProjectRefAdvisorsRulesRouteWithChildren
   ProjectRefAdvisorsSecurityRoute: typeof ProjectRefAdvisorsSecurityRoute
 }
 
 const ProjectRefAdvisorsRouteChildren: ProjectRefAdvisorsRouteChildren = {
+  ProjectRefAdvisorsHealthRoute: ProjectRefAdvisorsHealthRoute,
   ProjectRefAdvisorsPerformanceRoute: ProjectRefAdvisorsPerformanceRoute,
   ProjectRefAdvisorsRulesRoute: ProjectRefAdvisorsRulesRouteWithChildren,
   ProjectRefAdvisorsSecurityRoute: ProjectRefAdvisorsSecurityRoute,
diff --git a/apps/studio/routes/project/$ref/advisors/health.tsx b/apps/studio/routes/project/$ref/advisors/health.tsx
new file mode 100644
index 0000000000000..4e1c0fc0cb1fc
--- /dev/null
+++ b/apps/studio/routes/project/$ref/advisors/health.tsx
@@ -0,0 +1,14 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+import AdvisorsHealthPage from '@/pages/project/[ref]/advisors/health'
+
+export const Route = createFileRoute('/project/$ref/advisors/health')({
+  component: AdvisorsHealthRoute,
+  staticData: {
+    advisorsLayoutTitle: 'Linter',
+  },
+})
+
+function AdvisorsHealthRoute() {
+  return <AdvisorsHealthPage dehydratedState={undefined} />
+}
diff --git a/apps/studio/state/advisor-state.ts b/apps/studio/state/advisor-state.ts
index adb66003ef78e..0916c4a288aa3 100644
--- a/apps/studio/state/advisor-state.ts
+++ b/apps/studio/state/advisor-state.ts
@@ -1,11 +1,16 @@
 import { proxy, snapshot, useSnapshot } from 'valtio'
+import { z } from 'zod'
 
-export type AdvisorTab = 'all' | 'security' | 'performance' | 'messages'
-export type AdvisorSeverity = 'critical' | 'warning' | 'info'
+export const advisorCategorySchema = z.enum(['security', 'performance', 'health', 'messages'])
+export const advisorSeveritySchema = z.enum(['critical', 'warning', 'info'])
+
+export type AdvisorCategory = z.infer<typeof advisorCategorySchema>
+export type AdvisorSeverity = z.infer<typeof advisorSeveritySchema>
 export type AdvisorItemSource = 'lint' | 'notification' | 'signal'
 
 const createInitialState = () => ({
-  activeTab: 'all' as AdvisorTab,
+  // An empty selection means every category is shown, matching the severity filter
+  categoryFilters: [] as AdvisorCategory[],
   severityFilters: ['critical', 'warning'] as AdvisorSeverity[],
   selectedItemId: undefined as string | undefined,
   selectedItemSource: undefined as AdvisorItemSource | undefined,
@@ -16,23 +21,17 @@ const createInitialState = () => ({
 
 export const advisorState = proxy({
   ...createInitialState(),
-  setActiveTab(tab: AdvisorTab) {
-    advisorState.activeTab = tab
+  setCategoryFilters(categories: AdvisorCategory[]) {
+    advisorState.categoryFilters = categories
   },
   setSeverityFilters(severities: AdvisorSeverity[]) {
     advisorState.severityFilters = severities
   },
-  clearSeverityFilters() {
-    advisorState.severityFilters = []
-  },
   setSelectedItem(id: string | undefined, source?: AdvisorItemSource) {
     advisorState.selectedItemId = id
     advisorState.selectedItemSource = source
   },
-  focusItem({ id, tab, source }: { id: string; tab?: AdvisorTab; source?: AdvisorItemSource }) {
-    if (tab) {
-      advisorState.activeTab = tab
-    }
+  focusItem({ id, source }: { id: string; source?: AdvisorItemSource }) {
     advisorState.selectedItemId = id
     advisorState.selectedItemSource = source
   },
@@ -60,7 +59,15 @@ export const advisorState = proxy({
         break
     }
   },
-  resetNotificationFilters() {
+  /** Clears the filters that hide items within the selected categories, but not the categories themselves. */
+  clearNarrowingFilters() {
+    advisorState.severityFilters = []
+    advisorState.notificationFilterStatuses = []
+    advisorState.notificationFilterPriorities = []
+  },
+  clearFilters() {
+    advisorState.categoryFilters = []
+    advisorState.severityFilters = []
     advisorState.notificationFilterStatuses = []
     advisorState.notificationFilterPriorities = []
   },
diff --git a/apps/studio/state/shortcuts/registry/advisors-nav.ts b/apps/studio/state/shortcuts/registry/advisors-nav.ts
index eb129776b0f87..0f061fe69874a 100644
--- a/apps/studio/state/shortcuts/registry/advisors-nav.ts
+++ b/apps/studio/state/shortcuts/registry/advisors-nav.ts
@@ -10,6 +10,7 @@ import { RegistryDefinations } from '../types'
  * global key. `A` is already in use by Auth.
  */
 export const ADVISORS_NAV_SHORTCUT_IDS = {
+  NAV_ADVISORS_HEALTH: 'nav.advisors-health',
   NAV_ADVISORS_SECURITY: 'nav.advisors-security',
   NAV_ADVISORS_PERFORMANCE: 'nav.advisors-performance',
   NAV_ADVISORS_RULES: 'nav.advisors-rules',
@@ -19,6 +20,13 @@ export type AdvisorsNavShortcutId =
   (typeof ADVISORS_NAV_SHORTCUT_IDS)[keyof typeof ADVISORS_NAV_SHORTCUT_IDS]
 
 export const advisorsNavRegistry: RegistryDefinations<AdvisorsNavShortcutId> = {
+  [ADVISORS_NAV_SHORTCUT_IDS.NAV_ADVISORS_HEALTH]: {
+    id: ADVISORS_NAV_SHORTCUT_IDS.NAV_ADVISORS_HEALTH,
+    label: 'Go to Health Advisor',
+    sequence: ['V', 'H'],
+    showInSettings: false,
+    referenceGroup: SHORTCUT_REFERENCE_GROUPS.NAVIGATION_ADVISORS,
+  },
   [ADVISORS_NAV_SHORTCUT_IDS.NAV_ADVISORS_SECURITY]: {
     id: ADVISORS_NAV_SHORTCUT_IDS.NAV_ADVISORS_SECURITY,
     label: 'Go to Security Advisor',
diff --git a/apps/studio/state/shortcuts/registry/advisors-page.ts b/apps/studio/state/shortcuts/registry/advisors-page.ts
index 02b84b5c707c4..147d685c0b17c 100644
--- a/apps/studio/state/shortcuts/registry/advisors-page.ts
+++ b/apps/studio/state/shortcuts/registry/advisors-page.ts
@@ -2,7 +2,7 @@ import { SHORTCUT_REFERENCE_GROUPS } from '../referenceGroups'
 import { RegistryDefinations } from '../types'
 
 /**
- * Shortcuts scoped to the Security and Performance Advisor pages — tab digit
+ * Shortcuts scoped to the Health, Security, and Performance Advisor pages — tab digit
  * shortcuts, refresh, and detail panel close. The tab digits mirror the
  * functions-detail-nav pattern (`ignoreInputs: true` so they don't fire from
  * inputs), and `Escape` follows the auth-users close-panel pattern with
diff --git a/apps/www/app/state-of-startups/components/StateOfStartupsAuroraHeader.tsx b/apps/www/app/state-of-startups/components/StateOfStartupsAuroraHeader.tsx
index 0d624038a3cdd..b63bd89fce7c9 100644
--- a/apps/www/app/state-of-startups/components/StateOfStartupsAuroraHeader.tsx
+++ b/apps/www/app/state-of-startups/components/StateOfStartupsAuroraHeader.tsx
@@ -49,7 +49,7 @@ export function StateOfStartupsAuroraHeader() {
       />
 
       {/* Content — constrained to default container */}
-      <div className="relative z-10 max-w-240 mx-auto px-8 flex flex-col gap-4 justify-end pb-16 md:pb-18 min-h-[26rem] md:min-h-[50vh]">
+      <div className="relative z-10 max-w-240 mx-auto px-8 pt-40 md:pt-36 flex flex-col gap-4 justify-end pb-16 md:pb-18 min-h-[26rem] md:min-h-[50vh]">
         <p className="font-mono uppercase tracking-wide text-sm text-foreground-light">
           Supabase Presents
         </p>
diff --git a/apps/www/components/Nav/index.tsx b/apps/www/components/Nav/index.tsx
index 1f45ce23f2e3d..8464a96d02ed3 100644
--- a/apps/www/components/Nav/index.tsx
+++ b/apps/www/components/Nav/index.tsx
@@ -81,7 +81,7 @@ const Nav = ({ hideNavbar, stickyNavbar = true }: Props) => {
 
   return (
     <>
-      <AnnouncementBanner />
+      {!isStateOfStartupsPage && <AnnouncementBanner />}
       <div
         className={cn(
           'sticky top-0 z-40 transform',
@@ -91,6 +91,7 @@ const Nav = ({ hideNavbar, stickyNavbar = true }: Props) => {
         style={{ transform: 'translate3d(0,0,999px)' }}
         data-nav-transparent={isTransparent ? '' : undefined}
       >
+        {isStateOfStartupsPage && <AnnouncementBanner />}
         <div
           className={cn(
             'absolute inset-0 h-full w-full bg-background/90 dark:bg-background/95 transition-all duration-300',
diff --git a/packages/api-types/types/api-v1.d.ts b/packages/api-types/types/api-v1.d.ts
index 1a8ef0636fbda..8c91525db8104 100644
--- a/packages/api-types/types/api-v1.d.ts
+++ b/packages/api-types/types/api-v1.d.ts
@@ -5469,7 +5469,10 @@ export interface components {
           | 'instance_telemetry_lost'
           | 'instance_db_down'
           | 'instance_alert_firing'
-          | 'log_service_error_rate_high'
+          | 'log_data_api_error_rate_high'
+          | 'log_auth_error_rate_high'
+          | 'log_storage_error_rate_high'
+          | 'log_edge_function_error_rate_high'
           | 'project_not_active'
           | 'advisor_check_unavailable'
         /** Format: date-time */
diff --git a/packages/api-types/types/api-v2.d.ts b/packages/api-types/types/api-v2.d.ts
index 7fc9ee5023c5d..93193ccfcf1dc 100644
--- a/packages/api-types/types/api-v2.d.ts
+++ b/packages/api-types/types/api-v2.d.ts
@@ -1865,7 +1865,10 @@ export interface components {
               | 'instance_telemetry_lost'
               | 'instance_db_down'
               | 'instance_alert_firing'
-              | 'log_service_error_rate_high'
+              | 'log_data_api_error_rate_high'
+              | 'log_auth_error_rate_high'
+              | 'log_storage_error_rate_high'
+              | 'log_edge_function_error_rate_high'
               | 'project_not_active'
               | 'advisor_check_unavailable'
             /** Format: date-time */
@@ -2082,7 +2085,10 @@ export interface components {
               | 'instance_telemetry_lost'
               | 'instance_db_down'
               | 'instance_alert_firing'
-              | 'log_service_error_rate_high'
+              | 'log_data_api_error_rate_high'
+              | 'log_auth_error_rate_high'
+              | 'log_storage_error_rate_high'
+              | 'log_edge_function_error_rate_high'
           }[]
         }
         /**
diff --git a/packages/api-types/types/platform.d.ts b/packages/api-types/types/platform.d.ts
index 6baf4030898da..507bbc4ac76e6 100644
--- a/packages/api-types/types/platform.d.ts
+++ b/packages/api-types/types/platform.d.ts
@@ -7993,7 +7993,10 @@ export interface components {
         | 'instance_telemetry_lost'
         | 'instance_db_down'
         | 'instance_alert_firing'
-        | 'log_service_error_rate_high'
+        | 'log_data_api_error_rate_high'
+        | 'log_auth_error_rate_high'
+        | 'log_storage_error_rate_high'
+        | 'log_edge_function_error_rate_high'
         | 'project_not_active'
         | 'advisor_check_unavailable'
       /** Format: date-time */
diff --git a/packages/ui-patterns/src/MultipleCodeBlock/index.test.tsx b/packages/ui-patterns/src/MultipleCodeBlock/index.test.tsx
index fa9025fa192d4..a4d272671d5c7 100644
--- a/packages/ui-patterns/src/MultipleCodeBlock/index.test.tsx
+++ b/packages/ui-patterns/src/MultipleCodeBlock/index.test.tsx
@@ -35,4 +35,22 @@ describe('MultipleCodeBlock', () => {
     expect(screen.getByRole('tab', { selected: true })).toHaveTextContent('.env')
     expect(screen.getByText('VITE_SUPABASE_URL=https://react.example')).toBeVisible()
   })
+
+  it('renders tab content with vertical auto-scrolling instead of forced overflow scrollbars', () => {
+    const { container } = render(
+      <MultipleCodeBlock
+        files={[
+          {
+            name: 'page.tsx',
+            language: 'tsx',
+            code: 'export default function Page() { return null }',
+          },
+        ]}
+      />
+    )
+
+    const tabContent = container.querySelector('[data-connect-tab-content]')
+    expect(tabContent).toHaveClass('overflow-y-auto')
+    expect(tabContent).not.toHaveClass('overflow-scroll')
+  })
 })
diff --git a/packages/ui-patterns/src/MultipleCodeBlock/index.tsx b/packages/ui-patterns/src/MultipleCodeBlock/index.tsx
index 901be3a7f865b..59ca1098aeb5c 100644
--- a/packages/ui-patterns/src/MultipleCodeBlock/index.tsx
+++ b/packages/ui-patterns/src/MultipleCodeBlock/index.tsx
@@ -153,7 +153,7 @@ export const MultipleCodeBlock = ({
           key={file.name}
           value={file.name}
           forceMount
-          className="p-0 max-h-72 overflow-scroll data-[state=inactive]:hidden"
+          className="p-0 max-h-72 overflow-y-auto data-[state=inactive]:hidden"
           data-connect-tab-content
           data-tab-label={file.name}
         >
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ca4cb7e898141..359e330270c4b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -596,7 +596,7 @@ importers:
         version: 7.29.7(supports-color@8.1.1)
       '@graphiql/toolkit':
         specifier: ^0.9.1
-        version: 0.9.1(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)
+        version: 0.9.1(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)
       '@graphql-codegen/cli':
         specifier: 5.0.5
         version: 5.0.5(@parcel/watcher@2.5.6)(@types/node@22.13.14)(encoding@0.1.13)(graphql-sock@1.0.1(graphql@16.11.0))(graphql@16.11.0)(supports-color@8.1.1)(typescript@6.0.2)
@@ -677,7 +677,7 @@ importers:
         version: 13.2.2
       graphiql:
         specifier: ^4.0.2
-        version: 4.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 4.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -741,6 +741,9 @@ importers:
       astro:
         specifier: ^7.2.6
         version: 7.2.9(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.3)(@types/node@22.13.14)(aws4fetch@1.0.20)(db0@0.3.4(@electric-sql/pglite@0.4.5))(ioredis@5.10.1(supports-color@8.1.1))(jiti@2.7.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      lucide-react:
+        specifier: '*'
+        version: 0.436.0(react@19.2.6)
       react:
         specifier: 'catalog:'
         version: 19.2.6
@@ -14714,10 +14717,6 @@ packages:
     resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
     engines: {node: '>=4'}
 
-  mrmime@2.0.0:
-    resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
-    engines: {node: '>=10'}
-
   mrmime@2.0.1:
     resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
     engines: {node: '>=10'}
@@ -20685,9 +20684,9 @@ snapshots:
 
   '@floating-ui/utils@0.2.9': {}
 
-  '@graphiql/plugin-doc-explorer@0.0.1(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@graphiql/plugin-doc-explorer@0.0.1(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@headlessui/react': 2.2.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       graphql: 16.11.0
       react: 19.2.6
@@ -20715,10 +20714,10 @@ snapshots:
       - immer
       - use-sync-external-store
 
-  '@graphiql/plugin-history@0.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@graphiql/plugin-history@0.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@graphiql/toolkit': 0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)
+      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/toolkit': 0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)
       react: 19.2.6
       react-compiler-runtime: 19.1.0-rc.1(react@19.2.6)
       react-dom: 19.2.6(react@19.2.6)
@@ -20747,9 +20746,9 @@ snapshots:
       - immer
       - use-sync-external-store
 
-  '@graphiql/react@0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@graphiql/react@0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@graphiql/toolkit': 0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)
+      '@graphiql/toolkit': 0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)
       '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@radix-ui/react-dropdown-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@radix-ui/react-tooltip': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -20817,23 +20816,23 @@ snapshots:
     transitivePeerDependencies:
       - '@types/node'
 
-  '@graphiql/toolkit@0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)':
+  '@graphiql/toolkit@0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)':
     dependencies:
       '@n1ru4l/push-pull-async-iterable-iterator': 3.2.0
       graphql: 16.11.0
       meros: 1.3.0(@types/node@22.13.14)
     optionalDependencies:
-      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.3)
+      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.0)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@graphiql/toolkit@0.9.1(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)':
+  '@graphiql/toolkit@0.9.1(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)':
     dependencies:
       '@n1ru4l/push-pull-async-iterable-iterator': 3.2.0
       graphql: 16.11.0
       meros: 1.3.0(@types/node@22.13.14)
     optionalDependencies:
-      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.3)
+      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.0)
     transitivePeerDependencies:
       - '@types/node'
 
@@ -30306,11 +30305,11 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
-  graphiql@4.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
+  graphiql@4.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      '@graphiql/plugin-doc-explorer': 0.0.1(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@graphiql/plugin-history': 0.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/plugin-doc-explorer': 0.0.1(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/plugin-history': 0.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       graphql: 16.11.0
       react: 19.2.6
       react-compiler-runtime: 19.1.0-rc.1(react@19.2.6)
@@ -30409,13 +30408,6 @@ snapshots:
     optionalDependencies:
       ws: 8.21.0
 
-  graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3):
-    dependencies:
-      graphql: 16.11.0
-    optionalDependencies:
-      ws: 8.21.3
-    optional: true
-
   graphql@16.11.0: {}
 
   gray-matter@2.1.1:
@@ -33086,8 +33078,6 @@ snapshots:
 
   mri@1.2.0: {}
 
-  mrmime@2.0.0: {}
-
   mrmime@2.0.1: {}
 
   ms@2.0.0: {}
@@ -35996,7 +35986,7 @@ snapshots:
   sirv@3.0.2:
     dependencies:
       '@polka/url': 1.0.0-next.25
-      mrmime: 2.0.0
+      mrmime: 2.0.1
       totalist: 3.0.1
 
   sisteransi@1.0.5: {}