diff --git a/apps/studio/components/grid/components/grid/ColumnHeader.tsx b/apps/studio/components/grid/components/grid/ColumnHeader.tsx
index 0997dbe204f0f..06fad9c4f381b 100644
--- a/apps/studio/components/grid/components/grid/ColumnHeader.tsx
+++ b/apps/studio/components/grid/components/grid/ColumnHeader.tsx
@@ -1,10 +1,14 @@
 import type { XYCoord } from 'dnd-core'
-import { ArrowRight, Key, Link, Lock } from 'lucide-react'
+import { ArrowRight, Key, Link, Lock, Lightbulb } from 'lucide-react'
 import { useEffect, useRef } from 'react'
 import { useDrag, useDrop } from 'react-dnd'
 
 import { getForeignKeyCascadeAction } from 'components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils'
 import { FOREIGN_KEY_CASCADE_ACTION } from 'data/database/database-query-constants'
+import {
+  useColumnHasIndexSuggestion,
+  useTableIndexAdvisor,
+} from '../../context/TableIndexAdvisorContext'
 import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'
 import { Tooltip, TooltipContent, TooltipTrigger } from 'ui'
 import type { ColumnHeaderProps, ColumnType, DragItem, GridForeignKey } from '../../types'
@@ -24,6 +28,8 @@ export function ColumnHeader<R>({
   const columnFormat = getColumnFormat(columnType, format)
   const snap = useTableEditorTableStateSnapshot()
   const hoverValue = column.name as string
+  const hasIndexSuggestion = useColumnHasIndexSuggestion(column.name as string)
+  const { openSheet } = useTableIndexAdvisor()
 
   // keep snap.gridColumns' order in sync with data grid component
   useEffect(() => {
@@ -144,6 +150,21 @@ export function ColumnHeader<R>({
               </TooltipContent>
             </Tooltip>
           )}
+          {hasIndexSuggestion && (
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <button
+                  className="flex items-center"
+                  onClick={() => openSheet(column.name as string)}
+                >
+                  <Lightbulb size={14} strokeWidth={2} className="!text-warning" />
+                </button>
+              </TooltipTrigger>
+              <TooltipContent side="bottom" className="font-normal">
+                Index might improve performance. Click for details.
+              </TooltipContent>
+            </Tooltip>
+          )}
         </div>
         <ColumnMenu column={column} isEncrypted={isEncrypted} />
       </div>
diff --git a/apps/studio/components/grid/components/header/RefreshButton.tsx b/apps/studio/components/grid/components/header/RefreshButton.tsx
index d63217423209c..da14e7798724d 100644
--- a/apps/studio/components/grid/components/header/RefreshButton.tsx
+++ b/apps/studio/components/grid/components/header/RefreshButton.tsx
@@ -2,6 +2,7 @@ import { useQueryClient } from '@tanstack/react-query'
 import { RefreshCw } from 'lucide-react'
 
 import { useParams } from 'common'
+import { useTableIndexAdvisor } from 'components/grid/context/TableIndexAdvisorContext'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import { tableRowKeys } from 'data/table-rows/keys'
 
@@ -13,10 +14,12 @@ export type RefreshButtonProps = {
 export const RefreshButton = ({ tableId, isRefetching }: RefreshButtonProps) => {
   const { ref } = useParams()
   const queryClient = useQueryClient()
+  const { invalidate: invalidateIndexAdvisor } = useTableIndexAdvisor()
   const queryKey = tableRowKeys.tableRowsAndCount(ref, tableId)
 
   async function onClick() {
     await queryClient.invalidateQueries({ queryKey })
+    await invalidateIndexAdvisor()
   }
 
   return (
diff --git a/apps/studio/components/grid/context/TableIndexAdvisorContext.tsx b/apps/studio/components/grid/context/TableIndexAdvisorContext.tsx
new file mode 100644
index 0000000000000..5423b3c315f4b
--- /dev/null
+++ b/apps/studio/components/grid/context/TableIndexAdvisorContext.tsx
@@ -0,0 +1,144 @@
+import { useQueryClient } from '@tanstack/react-query'
+import { createContext, useContext, PropsWithChildren, useState, useCallback } from 'react'
+
+import { QueryIndexes } from 'components/interfaces/QueryPerformance/QueryIndexes'
+import { useIndexAdvisorStatus } from 'components/interfaces/QueryPerformance/hooks/useIsIndexAdvisorStatus'
+import { databaseKeys } from 'data/database/keys'
+import {
+  useTableIndexAdvisorQuery,
+  TableIndexAdvisorData,
+  IndexAdvisorSuggestion,
+} from 'data/database/table-index-advisor-query'
+import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
+import { Sheet, SheetContent, SheetHeader, SheetTitle } from 'ui'
+
+interface TableIndexAdvisorContextValue {
+  isLoading: boolean
+  isAvailable: boolean
+  isEnabled: boolean
+  columnsWithSuggestions: string[]
+  suggestions: TableIndexAdvisorData['suggestions']
+  openSheet: (columnName: string) => void
+  getSuggestionsForColumn: (columnName: string) => IndexAdvisorSuggestion[]
+  invalidate: () => Promise<void>
+}
+
+const TableIndexAdvisorContext = createContext<TableIndexAdvisorContextValue>({
+  isLoading: false,
+  isAvailable: false,
+  isEnabled: false,
+  columnsWithSuggestions: [],
+  suggestions: [],
+  openSheet: () => {},
+  getSuggestionsForColumn: () => [],
+  invalidate: async () => {},
+})
+
+interface TableIndexAdvisorProviderProps {
+  schema: string
+  table: string
+}
+
+export function TableIndexAdvisorProvider({
+  children,
+  schema,
+  table,
+}: PropsWithChildren<TableIndexAdvisorProviderProps>) {
+  const { data: project } = useSelectedProjectQuery()
+  const { isIndexAdvisorAvailable, isIndexAdvisorEnabled } = useIndexAdvisorStatus()
+  const queryClient = useQueryClient()
+  const [isSheetOpen, setIsSheetOpen] = useState(false)
+  const [selectedColumn, setSelectedColumn] = useState<string | undefined>(undefined)
+
+  const { data, isLoading } = useTableIndexAdvisorQuery(
+    {
+      projectRef: project?.ref,
+      connectionString: project?.connectionString,
+      schema,
+      table,
+    },
+    {
+      enabled: isIndexAdvisorEnabled && !!schema && !!table,
+    }
+  )
+
+  const openSheet = useCallback((columnName: string) => {
+    setSelectedColumn(columnName)
+    setIsSheetOpen(true)
+  }, [])
+
+  const closeSheet = useCallback(() => {
+    setIsSheetOpen(false)
+    setSelectedColumn(undefined)
+  }, [])
+
+  const getSuggestionsForColumn = useCallback(
+    (columnName: string): IndexAdvisorSuggestion[] => {
+      if (!data?.suggestions) return []
+      // Filter suggestions that include this column in their index statements
+      return data.suggestions.filter((suggestion) =>
+        suggestion.index_statements.some((stmt) => {
+          const match = stmt.match(/USING\s+\w+\s*\(([^)]+)\)/i)
+          if (match) {
+            const columns = match[1].split(',').map((c) => c.trim().replace(/^"(.+)"$/, '$1'))
+            return columns.includes(columnName)
+          }
+          return false
+        })
+      )
+    },
+    [data?.suggestions]
+  )
+
+  const invalidate = useCallback(async () => {
+    if (project?.ref && schema && table) {
+      await queryClient.invalidateQueries({
+        queryKey: databaseKeys.tableIndexAdvisor(project.ref, schema, table),
+      })
+    }
+  }, [queryClient, project?.ref, schema, table])
+
+  // Get the first suggestion for the selected column to pass to QueryIndexes
+  const selectedSuggestion = selectedColumn ? getSuggestionsForColumn(selectedColumn)[0] : null
+
+  const value: TableIndexAdvisorContextValue = {
+    isLoading,
+    isAvailable: isIndexAdvisorAvailable,
+    isEnabled: isIndexAdvisorEnabled,
+    columnsWithSuggestions: data?.columnsWithSuggestions ?? [],
+    suggestions: data?.suggestions ?? [],
+    openSheet,
+    getSuggestionsForColumn,
+    invalidate,
+  }
+
+  return (
+    <TableIndexAdvisorContext.Provider value={value}>
+      {children}
+      <Sheet open={isSheetOpen} onOpenChange={(open) => !open && closeSheet()}>
+        <SheetContent className="flex flex-col gap-0 p-0 sm:max-w-[500px]">
+          <SheetHeader className="border-b px-5 py-3">
+            <SheetTitle>Index Recommendation</SheetTitle>
+          </SheetHeader>
+          {selectedSuggestion && (
+            <QueryIndexes
+              selectedRow={{ query: selectedSuggestion.query }}
+              columnName={selectedColumn}
+              suggestedSelectQuery={selectedSuggestion.query}
+              onClose={closeSheet}
+            />
+          )}
+        </SheetContent>
+      </Sheet>
+    </TableIndexAdvisorContext.Provider>
+  )
+}
+
+export function useTableIndexAdvisor() {
+  return useContext(TableIndexAdvisorContext)
+}
+
+export function useColumnHasIndexSuggestion(columnName: string): boolean {
+  const { columnsWithSuggestions } = useTableIndexAdvisor()
+  return columnsWithSuggestions.includes(columnName)
+}
diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx
index 8afc26625ee47..371e7131c9fd5 100644
--- a/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx
+++ b/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx
@@ -1,5 +1,5 @@
-import { Check, Lightbulb, Table2 } from 'lucide-react'
-import { useEffect, useState } from 'react'
+import { Check, Table2, Lightbulb } from 'lucide-react'
+import { useState, useEffect } from 'react'
 
 import { AccordionTrigger } from '@ui/components/shadcn/ui/accordion'
 import { useIndexAdvisorStatus } from 'components/interfaces/QueryPerformance/hooks/useIsIndexAdvisorStatus'
@@ -33,18 +33,28 @@ import {
   createIndexes,
   hasIndexRecommendations,
 } from './IndexAdvisor/index-advisor.utils'
+import { QueryPerformanceRow } from './QueryPerformance.types'
 import { IndexAdvisorDisabledState } from './IndexAdvisor/IndexAdvisorDisabledState'
 import { IndexImprovementText } from './IndexAdvisor/IndexImprovementText'
 import { QueryPanelContainer, QueryPanelScoreSection, QueryPanelSection } from './QueryPanel'
 
 interface QueryIndexesProps {
-  selectedRow: any
+  selectedRow: Pick<QueryPerformanceRow, 'query'>
+  columnName?: string
+  suggestedSelectQuery?: string
+
+  onClose?: () => void
 }
 
 // [Joshen] There's several more UX things we can do to help ease the learning curve of indexes I think
 // e.g understanding "costs", what numbers of "costs" are actually considered insignificant
 
-export const QueryIndexes = ({ selectedRow }: QueryIndexesProps) => {
+export const QueryIndexes = ({
+  selectedRow,
+  columnName,
+  suggestedSelectQuery,
+  onClose,
+}: QueryIndexesProps) => {
   // [Joshen] TODO implement this logic once the linter rules are in
   const isLinterWarning = false
   const { data: project } = useSelectedProjectQuery()
@@ -142,6 +152,8 @@ export const QueryIndexes = ({ selectedRow }: QueryIndexesProps) => {
       setIsExecuting(false)
     } finally {
       setIsExecuting(false)
+
+      onClose?.()
     }
   }
 
@@ -165,7 +177,36 @@ export const QueryIndexes = ({ selectedRow }: QueryIndexesProps) => {
   }
 
   return (
-    <QueryPanelContainer className="h-full">
+    <QueryPanelContainer className="h-full overflow-y-auto py-0 pt-4">
+      {(columnName || suggestedSelectQuery) && (
+        <QueryPanelSection className="pt-2 pb-6 border-b">
+          <div className="flex flex-col gap-y-3">
+            <div>
+              <h4 className="mb-2">Recommendation reason</h4>
+              {columnName && (
+                <p className="text-sm text-foreground-light">
+                  Recommendation for column: <span className="font-mono">{columnName}</span>
+                </p>
+              )}
+            </div>
+            {suggestedSelectQuery && (
+              <div className="flex flex-col gap-y-4">
+                <p className="text-sm text-foreground-light">Based on the following query:</p>
+                <CodeBlock
+                  hideLineNumbers
+                  value={suggestedSelectQuery}
+                  language="sql"
+                  className={cn(
+                    'max-w-full max-h-[200px]',
+                    '!py-2 !px-2.5 prose dark:prose-dark',
+                    '[&>code]:m-0 [&>code>span]:flex [&>code>span]:flex-wrap'
+                  )}
+                />
+              </div>
+            )}
+          </div>
+        </QueryPanelSection>
+      )}
       <QueryPanelSection className="pt-2 mb-6">
         <div className="mb-4 flex flex-col gap-y-1">
           <h4 className="mb-2">Indexes in use</h4>
diff --git a/apps/studio/components/interfaces/QueryPerformance/hooks/useIndexInvalidation.ts b/apps/studio/components/interfaces/QueryPerformance/hooks/useIndexInvalidation.ts
index 017b6304eac78..8679e85f1b2a7 100644
--- a/apps/studio/components/interfaces/QueryPerformance/hooks/useIndexInvalidation.ts
+++ b/apps/studio/components/interfaces/QueryPerformance/hooks/useIndexInvalidation.ts
@@ -15,6 +15,8 @@ import {
   QUERY_PERFORMANCE_REPORT_TYPES,
 } from '../QueryPerformance.constants'
 import { useIndexAdvisorStatus } from './useIsIndexAdvisorStatus'
+import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'
+import { useTableIndexAdvisor } from 'components/grid/context/TableIndexAdvisorContext'
 
 export function useIndexInvalidation() {
   const router = useRouter()
@@ -29,6 +31,8 @@ export function useIndexInvalidation() {
     preset: parseAsString.withDefault('unified'),
   })
 
+  const { invalidate: invalidateTableIndexAdvisor } = useTableIndexAdvisor()
+
   const preset = QUERY_PERFORMANCE_PRESET_MAP[urlPreset as QUERY_PERFORMANCE_REPORT_TYPES]
   const orderBy = !!sort ? ({ column: sort, order } as QueryPerformanceSort) : undefined
   const roles = router?.query?.roles ?? []
@@ -47,5 +51,7 @@ export function useIndexInvalidation() {
       queryKey: databaseKeys.indexAdvisorFromQuery(project?.ref, ''),
     })
     queryClient.invalidateQueries({ queryKey: databaseIndexesKeys.list(project?.ref) })
-  }, [queryPerformanceQuery, queryClient, project?.ref])
+
+    invalidateTableIndexAdvisor()
+  }, [queryPerformanceQuery, queryClient, project?.ref, invalidateTableIndexAdvisor])
 }
diff --git a/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx b/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx
index 60f4fafec628f..c1f7675a84a5e 100644
--- a/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx
@@ -2,6 +2,8 @@ import { useEffect, useState } from 'react'
 import { toast } from 'sonner'
 
 import { useParams } from 'common'
+import { ButtonTooltip } from 'components/ui/ButtonTooltip'
+import { useCheckOpenAIKeyQuery } from 'data/ai/check-api-key-query'
 import { useSqlTitleGenerateMutation } from 'data/ai/sql-title-mutation'
 import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'
 import { getContentById } from 'data/content/content-id-query'
@@ -13,6 +15,7 @@ import { Snippet } from 'data/content/sql-folders-query'
 import type { SqlSnippet } from 'data/content/sql-snippets-query'
 import { useOrgSubscriptionQuery } from 'data/subscriptions/org-subscription-query'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
+import { useRouter } from 'next/router'
 import { useSqlEditorV2StateSnapshot } from 'state/sql-editor-v2'
 import { createTabId, useTabsStateSnapshot } from 'state/tabs'
 import { AiIconAnimation, Button, Form, Input, Modal } from 'ui'
@@ -32,6 +35,7 @@ const RenameQueryModal = ({
   onComplete,
 }: RenameQueryModalProps) => {
   const { ref } = useParams()
+  const router = useRouter()
   const { data: organization } = useSelectedOrganizationQuery()
 
   const snapV2 = useSqlEditorV2StateSnapshot()
@@ -61,6 +65,8 @@ const RenameQueryModal = ({
       toast.error(`Failed to rename query: ${error.message}`)
     },
   })
+  const { data: check } = useCheckOpenAIKeyQuery()
+  const isApiKeySet = !!check?.hasKey
 
   const generateTitle = async () => {
     if ('content' in snippet && isSQLSnippet) {
@@ -149,11 +155,19 @@ const RenameQueryModal = ({
               />
               <div className="flex w-full justify-end mt-2">
                 {!hasHipaaAddon && (
-                  <Button
+                  <ButtonTooltip
                     type="default"
                     onClick={() => generateTitle()}
                     size="tiny"
-                    disabled={isTitleGenerationLoading}
+                    disabled={isTitleGenerationLoading || !isApiKeySet}
+                    tooltip={{
+                      content: {
+                        side: 'bottom',
+                        text: isApiKeySet
+                          ? undefined
+                          : 'Add your "OPENAI_API_KEY" to your environment variables to use this feature.',
+                      },
+                    }}
                   >
                     <div className="flex items-center gap-1">
                       <div className="scale-75">
@@ -161,7 +175,7 @@ const RenameQueryModal = ({
                       </div>
                       <span>Rename with Supabase AI</span>
                     </div>
-                  </Button>
+                  </ButtonTooltip>
                 )}
               </div>
               <Input.TextArea
diff --git a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx
index 05dd4357aef06..441b25d55593c 100644
--- a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx
@@ -6,7 +6,7 @@ import { useRouter } from 'next/router'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { toast } from 'sonner'
 
-import { LOCAL_STORAGE_KEYS, useParams } from 'common'
+import { IS_PLATFORM, LOCAL_STORAGE_KEYS, useParams } from 'common'
 import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import ResizableAIWidget from 'components/ui/AIEditor/ResizableAIWidget'
 import { GridFooter } from 'components/ui/GridFooter'
@@ -38,6 +38,7 @@ import { getSqlEditorV2StateSnapshot, useSqlEditorV2StateSnapshot } from 'state/
 import { createTabId, useTabsStateSnapshot } from 'state/tabs'
 import {
   Button,
+  cn,
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuRadioGroup,
@@ -49,7 +50,6 @@ import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
-  cn,
 } from 'ui'
 import { useSqlEditorDiff, useSqlEditorPrompt } from './hooks'
 import { RunQueryWarningModal } from './RunQueryWarningModal'
@@ -285,7 +285,11 @@ export const SQLEditor = () => {
           return
         }
 
-        if (!isHipaaProjectDisallowed && snippet?.snippet.name === untitledSnippetTitle) {
+        if (
+          !isHipaaProjectDisallowed &&
+          snippet?.snippet.name.startsWith(untitledSnippetTitle) &&
+          IS_PLATFORM
+        ) {
           // Intentionally don't await title gen (lazy)
           setAiTitle(id, sql)
         }
diff --git a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityActions.tsx b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityActions.tsx
index 1de2e9d886eb3..aaa9cdcd4c186 100644
--- a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityActions.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityActions.tsx
@@ -92,23 +92,27 @@ const UtilityActions = ({
             </span>
             {intellisenseEnabled && <Check className="text-brand" size={16} />}
           </DropdownMenuItem>
-          <DropdownMenuSeparator />
-          <DropdownMenuItem
-            className="gap-x-2"
-            onClick={() => {
-              if (isFavorite) removeFavorite()
-              else addFavorite()
-            }}
-          >
-            <Heart
-              size={14}
-              strokeWidth={2}
-              className={
-                isFavorite ? 'fill-brand stroke-none' : 'fill-none stroke-foreground-light'
-              }
-            />
-            {isFavorite ? 'Remove from' : 'Add to'} favorites
-          </DropdownMenuItem>
+          {IS_PLATFORM && (
+            <>
+              <DropdownMenuSeparator />
+              <DropdownMenuItem
+                className="gap-x-2"
+                onClick={() => {
+                  if (isFavorite) removeFavorite()
+                  else addFavorite()
+                }}
+              >
+                <Heart
+                  size={14}
+                  strokeWidth={2}
+                  className={
+                    isFavorite ? 'fill-brand stroke-none' : 'fill-none stroke-foreground-light'
+                  }
+                />
+                {isFavorite ? 'Remove from' : 'Add to'} favorites
+              </DropdownMenuItem>
+            </>
+          )}
           <DropdownMenuItem className="gap-x-2" onClick={prettifyQuery}>
             <AlignLeft size={14} strokeWidth={2} className="text-foreground-light" />
             Prettify SQL
diff --git a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
index d4aea095088d2..83781c793ac0a 100644
--- a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
@@ -1,11 +1,13 @@
 import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { Lock, MousePointer2, PlusCircle, Unlock } from 'lucide-react'
+import { Lightbulb, Lock, MousePointer2, PlusCircle, Unlock } from 'lucide-react'
 import Link from 'next/link'
 import { useState } from 'react'
 import { toast } from 'sonner'
 
 import { useParams } from 'common'
 import { RefreshButton } from 'components/grid/components/header/RefreshButton'
+import { useTableIndexAdvisor } from 'components/grid/context/TableIndexAdvisorContext'
+import { EnableIndexAdvisorButton } from 'components/interfaces/QueryPerformance/IndexAdvisor/EnableIndexAdvisorButton'
 import { getEntityLintDetails } from 'components/interfaces/TableGridEditor/TableEntity.utils'
 import { APIDocsButton } from 'components/ui/APIDocsButton'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
@@ -64,6 +66,10 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProp
   // need project lints to get security status for views
   const { data: lints = [] } = useProjectLintsQuery({ projectRef: project?.ref })
 
+  // Use table-specific index advisor context
+  const { isAvailable: isIndexAdvisorAvailable, isEnabled: isIndexAdvisorEnabled } =
+    useTableIndexAdvisor()
+
   const isTable = isTableLike(table)
   const isForeignTable = isTableLikeForeignTable(table)
   const isView = isTableLikeView(table)
@@ -336,6 +342,32 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProp
             )
           ) : null}
 
+          {isTable && isIndexAdvisorAvailable && !isIndexAdvisorEnabled && (
+            <Popover_Shadcn_ modal={false}>
+              <PopoverTrigger_Shadcn_ asChild>
+                <Button type="default" icon={<Lightbulb strokeWidth={1.5} />}>
+                  Index Advisor
+                </Button>
+              </PopoverTrigger_Shadcn_>
+              <PopoverContent_Shadcn_ portal className="w-80 text-sm" align="end">
+                <h4 className="flex items-center gap-2">
+                  <Lightbulb size={16} /> Index Advisor
+                </h4>
+                <div className="grid gap-2 mt-4 text-foreground-light text-xs">
+                  <p>
+                    Index Advisor recommends indexes to improve query performance on this table.
+                  </p>
+                  <p>
+                    Enable Index Advisor to get recommendations based on your actual query patterns.
+                  </p>
+                  <div className="mt-2">
+                    <EnableIndexAdvisorButton />
+                  </div>
+                </div>
+              </PopoverContent_Shadcn_>
+            </Popover_Shadcn_>
+          )}
+
           {isTable && activeRealtimeVariant === RealtimeButtonVariant.TRIGGERS ? (
             <Button
               asChild
diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorNav.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorNav.tsx
index 25e3866604d3e..5eab1c04aaf2e 100644
--- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorNav.tsx
+++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorNav.tsx
@@ -1,10 +1,10 @@
+import { keepPreviousData } from '@tanstack/react-query'
 import { Heart } from 'lucide-react'
 import { useRouter } from 'next/router'
 import { useEffect, useMemo, useState } from 'react'
 import { toast } from 'sonner'
 
-import { keepPreviousData } from '@tanstack/react-query'
-import { LOCAL_STORAGE_KEYS, useParams } from 'common'
+import { IS_PLATFORM, LOCAL_STORAGE_KEYS, useParams } from 'common'
 import DownloadSnippetModal from 'components/interfaces/SQLEditor/DownloadSnippetModal'
 import { MoveQueryModal } from 'components/interfaces/SQLEditor/MoveQueryModal'
 import RenameQueryModal from 'components/interfaces/SQLEditor/RenameQueryModal'
@@ -440,160 +440,168 @@ export const SQLEditorNav = ({ sort = 'inserted_at' }: SQLEditorNavProps) => {
   return (
     <>
       <InnerSideMenuSeparator />
-
-      <InnerSideMenuCollapsible
-        className="px-0"
-        open={showSharedSnippets}
-        onOpenChange={(value) => {
-          setSectionVisibility({ ...(sectionVisibility ?? DEFAULT_SECTION_STATE), shared: value })
-        }}
-      >
-        <InnerSideMenuCollapsibleTrigger
-          title={`Shared ${numProjectSnippets > 0 ? ` (${numProjectSnippets})` : ''}`}
-        />
-        <InnerSideMenuCollapsibleContent className="group-data-[state=open]:pt-2">
-          {isLoadingSharedSqlSnippets ? (
-            <SQLEditorLoadingSnippets />
-          ) : sharedSnippets.length === 0 ? (
-            <InnerSideBarEmptyPanel
-              className="mx-2"
-              title="No shared queries"
-              description="Share queries with your team by right-clicking on the query."
-            />
-          ) : (
-            <TreeView
-              data={projectSnippetsTreeState}
-              aria-label="project-level-snippets"
-              nodeRenderer={({ element, ...props }) => {
-                const isOpened = Object.values(tabs.tabsMap).some(
-                  (tab) => tab.metadata?.sqlId === element.metadata?.id
-                )
-                const tabId = createTabId('sql', {
-                  id: element?.metadata?.id as unknown as Snippet['id'],
-                })
-                const isPreview = tabs.previewTabId === tabId
-                const isActive = !isPreview && element.metadata?.id === id
-                const isSelected = selectedSnippets.some((x) => x.id === element.metadata?.id)
-
-                return (
-                  <SQLEditorTreeViewItem
-                    {...props}
-                    isOpened={isOpened && !isPreview}
-                    isSelected={isActive || isSelected}
-                    isPreview={isPreview}
-                    onDoubleClick={(e) => {
-                      e.preventDefault()
-                      tabs.makeTabPermanent(tabId)
-                    }}
-                    element={element}
-                    onSelectDelete={() => {
-                      setShowDeleteModal(true)
-                      setSelectedSnippets([element.metadata as unknown as Snippet])
-                    }}
-                    onSelectRename={() => {
-                      setShowRenameModal(true)
-                      setSelectedSnippetToRename(element.metadata as Snippet)
-                    }}
-                    onSelectDownload={() => {
-                      setSelectedSnippetToDownload(element.metadata as Snippet)
-                    }}
-                    onSelectUnshare={() => {
-                      setSelectedSnippetToUnshare(element.metadata as Snippet)
-                    }}
-                    isLastItem={projectSnippetsLastItemIds.has(element.id as string)}
-                    hasNextPage={hasMoreSharedSqlSnippets}
-                    fetchNextPage={fetchNextSharedSqlSnippets}
-                    isFetchingNextPage={isFetchingMoreSharedSqlSnippets}
-                  />
-                )
-              }}
-            />
-          )}
-        </InnerSideMenuCollapsibleContent>
-      </InnerSideMenuCollapsible>
-
-      <InnerSideMenuSeparator />
-
-      <InnerSideMenuCollapsible
-        className="px-0"
-        open={showFavoriteSnippets}
-        onOpenChange={(value) => {
-          setSectionVisibility({ ...(sectionVisibility ?? DEFAULT_SECTION_STATE), favorite: value })
-        }}
-      >
-        <InnerSideMenuCollapsibleTrigger
-          title={`Favorites ${numFavoriteSnippets > 0 ? ` (${numFavoriteSnippets})` : ''}`}
-        />
-        <InnerSideMenuCollapsibleContent className="group-data-[state=open]:pt-2">
-          {isLoadingFavoriteSqlSnippets ? (
-            <SQLEditorLoadingSnippets />
-          ) : favoriteSnippets.length === 0 ? (
-            <InnerSideBarEmptyPanel
-              title="No favorite queries"
-              className="mx-2 px-3"
-              description={
-                <>
-                  Save a query to favorites for easy accessibility by clicking the{' '}
-                  <Heart size={12} className="inline-block relative align-center -top-[1px]" />{' '}
-                  icon.
-                </>
-              }
+      {IS_PLATFORM && (
+        <>
+          <InnerSideMenuCollapsible
+            className="px-0"
+            open={showSharedSnippets}
+            onOpenChange={(value) => {
+              setSectionVisibility({
+                ...(sectionVisibility ?? DEFAULT_SECTION_STATE),
+                shared: value,
+              })
+            }}
+          >
+            <InnerSideMenuCollapsibleTrigger
+              title={`Shared ${numProjectSnippets > 0 ? ` (${numProjectSnippets})` : ''}`}
             />
-          ) : (
-            <TreeView
-              data={favoritesTreeState}
-              aria-label="favorite-snippets"
-              nodeRenderer={({ element, ...props }) => {
-                const isOpened = Object.values(tabs.tabsMap).some(
-                  (tab) => tab.metadata?.sqlId === element.metadata?.id
-                )
-                const tabId = createTabId('sql', {
-                  id: element?.metadata?.id as unknown as Snippet['id'],
-                })
-                const isPreview = tabs.previewTabId === tabId
-                const isActive = !isPreview && element.metadata?.id === id
-                const isSelected = selectedSnippets.some((x) => x.id === element.metadata?.id)
-
-                return (
-                  <SQLEditorTreeViewItem
-                    {...props}
-                    isSelected={isActive || isSelected}
-                    isOpened={isOpened && !isPreview}
-                    isPreview={isPreview}
-                    onDoubleClick={(e) => {
-                      e.preventDefault()
-                      tabs.makeTabPermanent(tabId)
-                    }}
-                    element={element}
-                    onSelectDelete={() => {
-                      setShowDeleteModal(true)
-                      setSelectedSnippets([element.metadata as unknown as Snippet])
-                    }}
-                    onSelectRename={() => {
-                      setShowRenameModal(true)
-                      setSelectedSnippetToRename(element.metadata as Snippet)
-                    }}
-                    onSelectDownload={() => {
-                      setSelectedSnippetToDownload(element.metadata as Snippet)
-                    }}
-                    onSelectShare={() => setSelectedSnippetToShare(element.metadata as Snippet)}
-                    onSelectUnshare={() => {
-                      setSelectedSnippetToUnshare(element.metadata as Snippet)
-                    }}
-                    isLastItem={favoriteSnippetsLastItemIds.has(element.id as string)}
-                    hasNextPage={hasMoreFavoriteSqlSnippets}
-                    fetchNextPage={fetchNextFavoriteSqlSnippets}
-                    isFetchingNextPage={isFetchingMoreFavoriteSqlSnippets}
-                  />
-                )
-              }}
+            <InnerSideMenuCollapsibleContent className="group-data-[state=open]:pt-2">
+              {isLoadingSharedSqlSnippets ? (
+                <SQLEditorLoadingSnippets />
+              ) : sharedSnippets.length === 0 ? (
+                <InnerSideBarEmptyPanel
+                  className="mx-2"
+                  title="No shared queries"
+                  description="Share queries with your team by right-clicking on the query."
+                />
+              ) : (
+                <TreeView
+                  data={projectSnippetsTreeState}
+                  aria-label="project-level-snippets"
+                  nodeRenderer={({ element, ...props }) => {
+                    const isOpened = Object.values(tabs.tabsMap).some(
+                      (tab) => tab.metadata?.sqlId === element.metadata?.id
+                    )
+                    const tabId = createTabId('sql', {
+                      id: element?.metadata?.id as unknown as Snippet['id'],
+                    })
+                    const isPreview = tabs.previewTabId === tabId
+                    const isActive = !isPreview && element.metadata?.id === id
+                    const isSelected = selectedSnippets.some((x) => x.id === element.metadata?.id)
+
+                    return (
+                      <SQLEditorTreeViewItem
+                        {...props}
+                        isOpened={isOpened && !isPreview}
+                        isSelected={isActive || isSelected}
+                        isPreview={isPreview}
+                        onDoubleClick={(e) => {
+                          e.preventDefault()
+                          tabs.makeTabPermanent(tabId)
+                        }}
+                        element={element}
+                        onSelectDelete={() => {
+                          setShowDeleteModal(true)
+                          setSelectedSnippets([element.metadata as unknown as Snippet])
+                        }}
+                        onSelectRename={() => {
+                          setShowRenameModal(true)
+                          setSelectedSnippetToRename(element.metadata as Snippet)
+                        }}
+                        onSelectDownload={() => {
+                          setSelectedSnippetToDownload(element.metadata as Snippet)
+                        }}
+                        onSelectUnshare={() => {
+                          setSelectedSnippetToUnshare(element.metadata as Snippet)
+                        }}
+                        isLastItem={projectSnippetsLastItemIds.has(element.id as string)}
+                        hasNextPage={hasMoreSharedSqlSnippets}
+                        fetchNextPage={fetchNextSharedSqlSnippets}
+                        isFetchingNextPage={isFetchingMoreSharedSqlSnippets}
+                      />
+                    )
+                  }}
+                />
+              )}
+            </InnerSideMenuCollapsibleContent>
+          </InnerSideMenuCollapsible>
+
+          <InnerSideMenuSeparator />
+
+          <InnerSideMenuCollapsible
+            className="px-0"
+            open={showFavoriteSnippets}
+            onOpenChange={(value) => {
+              setSectionVisibility({
+                ...(sectionVisibility ?? DEFAULT_SECTION_STATE),
+                favorite: value,
+              })
+            }}
+          >
+            <InnerSideMenuCollapsibleTrigger
+              title={`Favorites ${numFavoriteSnippets > 0 ? ` (${numFavoriteSnippets})` : ''}`}
             />
-          )}
-        </InnerSideMenuCollapsibleContent>
-      </InnerSideMenuCollapsible>
-
-      <InnerSideMenuSeparator />
-
+            <InnerSideMenuCollapsibleContent className="group-data-[state=open]:pt-2">
+              {isLoadingFavoriteSqlSnippets ? (
+                <SQLEditorLoadingSnippets />
+              ) : favoriteSnippets.length === 0 ? (
+                <InnerSideBarEmptyPanel
+                  title="No favorite queries"
+                  className="mx-2 px-3"
+                  description={
+                    <>
+                      Save a query to favorites for easy accessibility by clicking the{' '}
+                      <Heart size={12} className="inline-block relative align-center -top-[1px]" />{' '}
+                      icon.
+                    </>
+                  }
+                />
+              ) : (
+                <TreeView
+                  data={favoritesTreeState}
+                  aria-label="favorite-snippets"
+                  nodeRenderer={({ element, ...props }) => {
+                    const isOpened = Object.values(tabs.tabsMap).some(
+                      (tab) => tab.metadata?.sqlId === element.metadata?.id
+                    )
+                    const tabId = createTabId('sql', {
+                      id: element?.metadata?.id as unknown as Snippet['id'],
+                    })
+                    const isPreview = tabs.previewTabId === tabId
+                    const isActive = !isPreview && element.metadata?.id === id
+                    const isSelected = selectedSnippets.some((x) => x.id === element.metadata?.id)
+
+                    return (
+                      <SQLEditorTreeViewItem
+                        {...props}
+                        isSelected={isActive || isSelected}
+                        isOpened={isOpened && !isPreview}
+                        isPreview={isPreview}
+                        onDoubleClick={(e) => {
+                          e.preventDefault()
+                          tabs.makeTabPermanent(tabId)
+                        }}
+                        element={element}
+                        onSelectDelete={() => {
+                          setShowDeleteModal(true)
+                          setSelectedSnippets([element.metadata as unknown as Snippet])
+                        }}
+                        onSelectRename={() => {
+                          setShowRenameModal(true)
+                          setSelectedSnippetToRename(element.metadata as Snippet)
+                        }}
+                        onSelectDownload={() => {
+                          setSelectedSnippetToDownload(element.metadata as Snippet)
+                        }}
+                        onSelectShare={() => setSelectedSnippetToShare(element.metadata as Snippet)}
+                        onSelectUnshare={() => {
+                          setSelectedSnippetToUnshare(element.metadata as Snippet)
+                        }}
+                        isLastItem={favoriteSnippetsLastItemIds.has(element.id as string)}
+                        hasNextPage={hasMoreFavoriteSqlSnippets}
+                        fetchNextPage={fetchNextFavoriteSqlSnippets}
+                        isFetchingNextPage={isFetchingMoreFavoriteSqlSnippets}
+                      />
+                    )
+                  }}
+                />
+              )}
+            </InnerSideMenuCollapsibleContent>
+          </InnerSideMenuCollapsible>
+
+          <InnerSideMenuSeparator />
+        </>
+      )}
       <InnerSideMenuCollapsible
         open={showPrivateSnippets}
         onOpenChange={(value) => {
diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx
index 3753976bfca4a..222bf17ac5f83 100644
--- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx
+++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx
@@ -354,16 +354,19 @@ export const SQLEditorTreeViewItem = ({
                   Move query
                 </ContextMenuItem_Shadcn_>
               )}
-              {onSelectShare !== undefined && !isSharedSnippet && canCreateSQLSnippet && (
-                <ContextMenuItem_Shadcn_
-                  className="gap-x-2"
-                  onSelect={() => onSelectShare()}
-                  onFocusCapture={(e) => e.stopPropagation()}
-                >
-                  <Share size={14} />
-                  Share query with team
-                </ContextMenuItem_Shadcn_>
-              )}
+              {onSelectShare !== undefined &&
+                !isSharedSnippet &&
+                canCreateSQLSnippet &&
+                IS_PLATFORM && (
+                  <ContextMenuItem_Shadcn_
+                    className="gap-x-2"
+                    onSelect={() => onSelectShare()}
+                    onFocusCapture={(e) => e.stopPropagation()}
+                  >
+                    <Share size={14} />
+                    Share query with team
+                  </ContextMenuItem_Shadcn_>
+                )}
               {onSelectUnshare !== undefined && isSharedSnippet && isOwner && (
                 <ContextMenuItem_Shadcn_
                   className="gap-x-2"
@@ -384,19 +387,21 @@ export const SQLEditorTreeViewItem = ({
                   Duplicate query
                 </ContextMenuItem_Shadcn_>
               )}
-              <ContextMenuItem_Shadcn_
-                className="gap-x-2"
-                onSelect={() => onToggleFavorite()}
-                onFocusCapture={(e) => e.stopPropagation()}
-              >
-                <Heart
-                  size={14}
-                  className={cn(
-                    isFavorite ? 'fill-brand stroke-none' : 'fill-none stroke-foreground-light'
-                  )}
-                />
-                {isFavorite ? 'Remove from' : 'Add to'} favorites
-              </ContextMenuItem_Shadcn_>
+              {IS_PLATFORM && (
+                <ContextMenuItem_Shadcn_
+                  className="gap-x-2"
+                  onSelect={() => onToggleFavorite()}
+                  onFocusCapture={(e) => e.stopPropagation()}
+                >
+                  <Heart
+                    size={14}
+                    className={cn(
+                      isFavorite ? 'fill-brand stroke-none' : 'fill-none stroke-foreground-light'
+                    )}
+                  />
+                  {isFavorite ? 'Remove from' : 'Add to'} favorites
+                </ContextMenuItem_Shadcn_>
+              )}
               {onSelectDownload !== undefined && IS_PLATFORM && (
                 <ContextMenuItem_Shadcn_
                   className="gap-x-2"
diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx
index 55deff04b1ab3..aad16c991539b 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx
@@ -103,7 +103,7 @@ export const AIAssistant = ({ className }: AIAssistantProps) => {
   const [messageRatings, setMessageRatings] = useState<Record<string, 'positive' | 'negative'>>({})
 
   const { data: check, isSuccess } = useCheckOpenAIKeyQuery()
-  const isApiKeySet = IS_PLATFORM || !!check?.hasKey
+  const isApiKeySet = !!check?.hasKey
 
   const { mutateAsync: rateMessage } = useRateMessageMutation()
 
diff --git a/apps/studio/data/ai/check-api-key-query.ts b/apps/studio/data/ai/check-api-key-query.ts
index 53a8816961a64..f1f74a5d4f06a 100644
--- a/apps/studio/data/ai/check-api-key-query.ts
+++ b/apps/studio/data/ai/check-api-key-query.ts
@@ -9,6 +9,10 @@ import { aiKeys } from './keys'
 // so we can disable the chat editor and add a warning about manually adding the key
 
 export async function checkOpenAIKey(signal?: AbortSignal) {
+  if (IS_PLATFORM) {
+    return { hasKey: true }
+  }
+
   const headers = await constructHeaders()
   const response = await fetchHandler(`${BASE_PATH}/api/ai/sql/check-api-key`, {
     headers,
@@ -37,6 +41,6 @@ export const useCheckOpenAIKeyQuery = <TData = ResourceData>({
   useQuery<ResourceData, ResourceError, TData>({
     queryKey: aiKeys.apiKey(),
     queryFn: ({ signal }) => checkOpenAIKey(signal),
-    enabled: !IS_PLATFORM && enabled,
+    enabled: enabled,
     ...options,
   })
diff --git a/apps/studio/data/content/content-upsert-mutation.ts b/apps/studio/data/content/content-upsert-mutation.ts
index ae00ca5607fc4..3455eb2ac40a9 100644
--- a/apps/studio/data/content/content-upsert-mutation.ts
+++ b/apps/studio/data/content/content-upsert-mutation.ts
@@ -6,6 +6,7 @@ import { handleError, put } from 'data/fetchers'
 import type { ResponseError, UseCustomMutationOptions } from 'types'
 import type { Content } from './content-query'
 import { contentKeys } from './keys'
+import type { Snippet } from './sql-folders-query'
 
 export type UpsertContentPayload = Omit<components['schemas']['UpsertContentBody'], 'content'> & {
   content: Partial<Content['content']>
@@ -29,7 +30,7 @@ export async function upsertContent(
   })
   if (error) handleError(error)
 
-  return data
+  return data as Snippet | null
 }
 
 export type UpsertContentData = Awaited<ReturnType<typeof upsertContent>>
diff --git a/apps/studio/data/database/keys.ts b/apps/studio/data/database/keys.ts
index 7aff4ecb5ecb7..29dc8b52da2df 100644
--- a/apps/studio/data/database/keys.ts
+++ b/apps/studio/data/database/keys.ts
@@ -41,4 +41,9 @@ export const databaseKeys = {
     projectRef: string | undefined,
     tables: { name: string; schema: string }[]
   ) => ['projects', projectRef, 'check-primary-keys', tables] as const,
+  tableIndexAdvisor: (
+    projectRef: string | undefined,
+    schema: string | undefined,
+    table: string | undefined
+  ) => ['projects', projectRef, 'table-index-advisor', schema, table] as const,
 }
diff --git a/apps/studio/data/database/table-index-advisor-query.ts b/apps/studio/data/database/table-index-advisor-query.ts
new file mode 100644
index 0000000000000..ddc80986cded6
--- /dev/null
+++ b/apps/studio/data/database/table-index-advisor-query.ts
@@ -0,0 +1,190 @@
+import { useQuery } from '@tanstack/react-query'
+
+import { executeSql } from 'data/sql/execute-sql-query'
+import type { ResponseError, UseCustomQueryOptions } from 'types'
+import { databaseKeys } from './keys'
+
+export type TableIndexAdvisorVariables = {
+  projectRef?: string
+  connectionString?: string | null
+  schema: string
+  table: string
+}
+
+export type IndexAdvisorSuggestion = {
+  query: string
+  calls: number
+  total_time: number
+  mean_time: number
+  index_statements: string[]
+  startup_cost_before: number
+  startup_cost_after: number
+  total_cost_before: number
+  total_cost_after: number
+  improvement_percentage: number
+}
+
+export type TableIndexAdvisorResponse = {
+  suggestions: IndexAdvisorSuggestion[]
+  columnsWithSuggestions: string[]
+}
+
+//Generates SQL to find top 5 SELECT queries involving a table and run them through index_advisor
+export function getTableIndexAdvisorSql(schema: string, table: string): string {
+  const escapedSchema = schema.replace(/'/g, "''")
+  const escapedTable = table.replace(/'/g, "''")
+
+  return /* SQL */ `
+-- Get top 5 SELECT queries involving this table and run through index_advisor
+set search_path to public, extensions;
+
+with top_queries as (
+  select
+    statements.query,
+    statements.calls,
+    statements.total_exec_time + statements.total_plan_time as total_time,
+    statements.mean_exec_time + statements.mean_plan_time as mean_time
+  from pg_stat_statements as statements
+    inner join pg_authid as auth on statements.userid = auth.oid
+  where 
+    -- Filter for SELECT queries only (index_advisor only works with SELECT)
+    (lower(statements.query) like 'select%' or lower(statements.query) like 'with pgrst%')
+    -- Filter for queries involving our table (handles schema.table and just table references)
+    and (
+      lower(statements.query) like '%${escapedSchema.toLowerCase()}.${escapedTable.toLowerCase()}%'
+      or lower(statements.query) like '%from ${escapedTable.toLowerCase()}%'
+      or lower(statements.query) like '%join ${escapedTable.toLowerCase()}%'
+    )
+    -- Exclude system queries
+    and statements.query not like '%pg_catalog%'
+    and statements.query not like '%information_schema%'
+  order by statements.calls desc
+  limit 5
+)
+select
+  tq.query,
+  tq.calls,
+  tq.total_time,
+  tq.mean_time,
+  coalesce(ia.index_statements, '{}') as index_statements,
+  coalesce((ia.startup_cost_before)::numeric, 0) as startup_cost_before,
+  coalesce((ia.startup_cost_after)::numeric, 0) as startup_cost_after,
+  coalesce((ia.total_cost_before)::numeric, 0) as total_cost_before,
+  coalesce((ia.total_cost_after)::numeric, 0) as total_cost_after
+from top_queries tq
+left join lateral (
+  select * from index_advisor(tq.query)
+) ia on true;
+`.trim()
+}
+
+//Extracts column names from index statements
+//e.g. "CREATE INDEX ON public.users USING btree (email)" -> "email"
+function extractColumnsFromIndexStatements(indexStatements: string[]): string[] {
+  const columns = new Set<string>()
+
+  for (const statement of indexStatements) {
+    // Match patterns like "USING btree (column_name)" or "USING btree (column1, column2)"
+    const match = statement.match(/USING\s+\w+\s*\(([^)]+)\)/i)
+    if (match) {
+      const columnPart = match[1]
+      // Split by comma and clean up each column name
+      columnPart.split(',').forEach((col) => {
+        const cleanedCol = col.trim().replace(/^"(.+)"$/, '$1') // Remove quotes if present
+        if (cleanedCol) {
+          columns.add(cleanedCol)
+        }
+      })
+    }
+  }
+
+  return Array.from(columns)
+}
+
+export async function getTableIndexAdvisorSuggestions({
+  projectRef,
+  connectionString,
+  schema,
+  table,
+}: TableIndexAdvisorVariables): Promise<TableIndexAdvisorResponse> {
+  if (!projectRef) throw new Error('Project ref is required')
+  if (!schema) throw new Error('Schema is required')
+  if (!table) throw new Error('Table is required')
+
+  const sql = getTableIndexAdvisorSql(schema, table)
+
+  const { result } = await executeSql<
+    Array<{
+      query: string
+      calls: number
+      total_time: number
+      mean_time: number
+      index_statements: string[]
+      startup_cost_before: number
+      startup_cost_after: number
+      total_cost_before: number
+      total_cost_after: number
+    }>
+  >({
+    projectRef,
+    connectionString,
+    sql,
+  })
+
+  const suggestions: IndexAdvisorSuggestion[] = (result || [])
+    .filter((row) => row.index_statements && row.index_statements.length > 0)
+    .map((row) => {
+      const improvement =
+        row.total_cost_before > 0
+          ? ((row.total_cost_before - row.total_cost_after) / row.total_cost_before) * 100
+          : 0
+
+      return {
+        query: row.query,
+        calls: row.calls,
+        total_time: row.total_time,
+        mean_time: row.mean_time,
+        index_statements: row.index_statements,
+        startup_cost_before: row.startup_cost_before,
+        startup_cost_after: row.startup_cost_after,
+        total_cost_before: row.total_cost_before,
+        total_cost_after: row.total_cost_after,
+        improvement_percentage: Math.round(improvement * 100) / 100,
+      }
+    })
+
+  // Extract all unique columns from suggestions
+  const allIndexStatements = suggestions.flatMap((s) => s.index_statements)
+  const columnsWithSuggestions = extractColumnsFromIndexStatements(allIndexStatements)
+
+  return {
+    suggestions,
+    columnsWithSuggestions,
+  }
+}
+
+export type TableIndexAdvisorData = Awaited<ReturnType<typeof getTableIndexAdvisorSuggestions>>
+export type TableIndexAdvisorError = ResponseError
+
+export function useTableIndexAdvisorQuery<TData = TableIndexAdvisorData>(
+  { projectRef, connectionString, schema, table }: TableIndexAdvisorVariables,
+  {
+    enabled = true,
+    ...options
+  }: UseCustomQueryOptions<TableIndexAdvisorData, TableIndexAdvisorError, TData> = {}
+) {
+  return useQuery<TableIndexAdvisorData, TableIndexAdvisorError, TData>({
+    queryKey: databaseKeys.tableIndexAdvisor(projectRef, schema, table),
+    queryFn: () =>
+      getTableIndexAdvisorSuggestions({
+        projectRef,
+        connectionString,
+        schema,
+        table,
+      }),
+    enabled: enabled && typeof projectRef !== 'undefined' && !!schema && !!table,
+    retry: false,
+    staleTime: 5 * 60 * 1000,
+    ...options,
+  })
+}
diff --git a/apps/studio/hooks/misc/useReportDateRange.ts b/apps/studio/hooks/misc/useReportDateRange.ts
index 41913a3f6c1f5..1f035362f9861 100644
--- a/apps/studio/hooks/misc/useReportDateRange.ts
+++ b/apps/studio/hooks/misc/useReportDateRange.ts
@@ -46,7 +46,8 @@ export const useReportDateRange = (
   defaultHelper:
     | REPORT_DATERANGE_HELPER_LABELS
     | string
-    | ReportsDatetimeHelper = REPORT_DATERANGE_HELPER_LABELS.LAST_60_MINUTES
+    | ReportsDatetimeHelper = REPORT_DATERANGE_HELPER_LABELS.LAST_60_MINUTES,
+  useV2Granularity = false
 ) => {
   const { plan: orgPlan, isLoading: isOrgPlanLoading } = useCurrentOrgPlan()
   const [showUpgradePrompt, setShowUpgradePrompt] = useState(false)
@@ -175,9 +176,15 @@ export const useReportDateRange = (
     return getDefaultHelper().helper.text
   }, [timestampStartValue, timestampEndValue, helperTextValue, getDefaultHelper])
 
-  const handleIntervalGranularity = useCallback((from: string, to: string) => {
+  const handleIntervalGranularity = (from: string, to: string) => {
     const diffInDays = dayjs(to).diff(from, 'day', true)
     const diffInHours = dayjs(to).diff(from, 'hour', true)
+
+    if (useV2Granularity) {
+      if (diffInHours <= 24) return '1m'
+      if (diffInDays <= 7) return '10m'
+    }
+
     const conditions = {
       '1m': diffInHours < 1.1, // less than 1.1 hours
       '5m': diffInHours < 3.1, // less than 3.1 hours
@@ -199,7 +206,7 @@ export const useReportDateRange = (
       default:
         return '1h'
     }
-  }, [])
+  }
 
   // Derive selectedDateRange from current values
   const selectedDateRange: ReportDateRange = useMemo(
@@ -208,7 +215,7 @@ export const useReportDateRange = (
       period_end: { date: timestampEnd, time_period: 'today' },
       interval: handleIntervalGranularity(timestampStart, timestampEnd),
     }),
-    [timestampStart, timestampEnd, handleIntervalGranularity]
+    [timestampStart, timestampEnd, useV2Granularity]
   )
 
   const updateDateRange = useCallback(
diff --git a/apps/studio/pages/project/[ref]/observability/database.tsx b/apps/studio/pages/project/[ref]/observability/database.tsx
index dbec6f5350d1f..b764af9067042 100644
--- a/apps/studio/pages/project/[ref]/observability/database.tsx
+++ b/apps/studio/pages/project/[ref]/observability/database.tsx
@@ -6,7 +6,7 @@ import Link from 'next/link'
 import { useEffect, useRef, useState } from 'react'
 import { toast } from 'sonner'
 
-import { useParams } from 'common'
+import { useFlag, useParams } from 'common'
 import ReportHeader from 'components/interfaces/Reports/ReportHeader'
 import ReportPadding from 'components/interfaces/Reports/ReportPadding'
 import { REPORT_DATERANGE_HELPER_LABELS } from 'components/interfaces/Reports/Reports.constants'
@@ -67,6 +67,7 @@ const DatabaseUsage = () => {
   const { db, chart, ref } = useParams()
   const { data: project } = useSelectedProjectQuery()
   const { data: org } = useSelectedOrganizationQuery()
+  const reportGranularityV2 = useFlag('reportGranularityV2')
 
   const {
     selectedDateRange,
@@ -78,7 +79,7 @@ const DatabaseUsage = () => {
     showUpgradePrompt,
     setShowUpgradePrompt,
     handleDatePickerChange,
-  } = useReportDateRange(REPORT_DATERANGE_HELPER_LABELS.LAST_60_MINUTES)
+  } = useReportDateRange(REPORT_DATERANGE_HELPER_LABELS.LAST_60_MINUTES, reportGranularityV2)
 
   const state = useDatabaseSelectorStateSnapshot()
   const queryClient = useQueryClient()
diff --git a/apps/studio/pages/project/[ref]/sql/index.tsx b/apps/studio/pages/project/[ref]/sql/index.tsx
index 79aff70fbf119..6a1062d86fd9f 100644
--- a/apps/studio/pages/project/[ref]/sql/index.tsx
+++ b/apps/studio/pages/project/[ref]/sql/index.tsx
@@ -22,12 +22,13 @@ const SQLEditorIndexPage: NextPageWithLayout = () => {
       // Handle redirect to last opened snippet tab, or last snippet tab
       const lastOpenedTab = history.sql
       const lastTabId = store.openTabs.find((id) => store.tabsMap[id]?.type === 'sql')
-
       if (lastOpenedTab !== undefined) {
         router.push(`/project/${projectRef}/sql/${history.sql}`)
       } else if (lastTabId) {
         const lastTab = store.tabsMap[lastTabId]
-        if (lastTab) router.push(`/project/${projectRef}/sql/${lastTab.id.replace('sql-', '')}`)
+        if (lastTab) {
+          router.push(`/project/${projectRef}/sql/${lastTab.id.replace('sql-', '')}`)
+        }
       } else {
         router.push(`/project/${projectRef}/sql/new`)
       }
diff --git a/apps/studio/state/table-editor-table.tsx b/apps/studio/state/table-editor-table.tsx
index 16634adcd7c43..160544614e465 100644
--- a/apps/studio/state/table-editor-table.tsx
+++ b/apps/studio/state/table-editor-table.tsx
@@ -3,11 +3,13 @@ import { CalculatedColumn } from 'react-data-grid'
 import { proxy, ref, subscribe, useSnapshot } from 'valtio'
 import { proxySet } from 'valtio/utils'
 
+import { useFlag } from 'common'
 import {
   loadTableEditorStateFromLocalStorage,
   parseSupaTable,
   saveTableEditorStateToLocalStorageDebounced,
 } from 'components/grid/SupabaseGrid.utils'
+import { TableIndexAdvisorProvider } from 'components/grid/context/TableIndexAdvisorContext'
 import { SupaRow } from 'components/grid/types'
 import { getInitialGridColumns } from 'components/grid/utils/column'
 import { getGridColumns } from 'components/grid/utils/gridColumns'
@@ -176,6 +178,7 @@ export const TableEditorTableStateContextProvider = ({
   table,
   ...props
 }: PropsWithChildren<TableEditorTableStateContextProviderProps>) => {
+  const showIndexAdvisor = useFlag('ShowIndexAdvisorOnTableEditor')
   const tableEditorSnap = useTableEditorStateSnapshot()
   const state = useRef(
     createTableEditorTableState({
@@ -226,7 +229,13 @@ export const TableEditorTableStateContextProvider = ({
 
   return (
     <TableEditorTableStateContext.Provider value={state}>
-      {children}
+      {showIndexAdvisor && state.table.schema ? (
+        <TableIndexAdvisorProvider schema={state.table.schema ?? 'public'} table={state.table.name}>
+          {children}
+        </TableIndexAdvisorProvider>
+      ) : (
+        children
+      )}
     </TableEditorTableStateContext.Provider>
   )
 }
diff --git a/apps/studio/state/tabs.tsx b/apps/studio/state/tabs.tsx
index 7b282f2128b69..3064047b4d722 100644
--- a/apps/studio/state/tabs.tsx
+++ b/apps/studio/state/tabs.tsx
@@ -169,6 +169,9 @@ function createTabsState(projectRef: string) {
     tabsMap,
     previewTabId,
 
+    hasTab: (id: string) => {
+      return !!store.tabsMap[id]
+    },
     addTab: (tab: Tab) => {
       // If tab exists and is active, don't do anything
       if (store.tabsMap[tab.id] && store.activeTab === tab.id) {
diff --git a/apps/www/app/blog/[slug]/BlogPostClient.tsx b/apps/www/app/blog/[slug]/BlogPostClient.tsx
index 8a70fad252e09..8da4126fae2e2 100644
--- a/apps/www/app/blog/[slug]/BlogPostClient.tsx
+++ b/apps/www/app/blog/[slug]/BlogPostClient.tsx
@@ -9,6 +9,7 @@ import { CMS_SITE_ORIGIN } from 'lib/constants'
 import { isNotNullOrUndefined } from 'lib/helpers'
 import { generateTocFromMarkdown } from 'lib/toc'
 import { convertRichTextToMarkdown } from '~/lib/cms/convertRichTextToMarkdown'
+import useActiveAnchors from 'hooks/useActiveAnchors'
 
 import type { Blog, BlogData, CMSAuthor, PostReturnType, ProcessedBlogData } from 'types/post'
 
@@ -27,6 +28,10 @@ type BlogPostPageProps = {
 export default function BlogPostClient(props: BlogPostPageProps) {
   const isDraftMode = props.isDraftMode
   const [previewData] = useState<ProcessedBlogData>(props.blog)
+
+  // Enable scroll-to-anchor functionality and TOC highlighting
+  useActiveAnchors()
+
   const [processedToc, setProcessedToc] = useState<{ content: string; json: any[] } | null>(null)
   const shouldUseLivePreview = isDraftMode && 'isCMS' in props.blog && props.blog.isCMS
 
diff --git a/apps/www/hooks/useActiveAnchors.tsx b/apps/www/hooks/useActiveAnchors.tsx
index dbea06b86112c..f851394abb095 100644
--- a/apps/www/hooks/useActiveAnchors.tsx
+++ b/apps/www/hooks/useActiveAnchors.tsx
@@ -1,33 +1,69 @@
 'use client'
 
-import { useRouter } from 'next/router'
 import { useEffect, useRef } from 'react'
 import { isBrowser, stripEmojis } from '~/lib/helpers'
 
-const useActiveAnchors = (
-  anchorsQuerySelector: string = 'h2',
-  tocQuerySelector: string = '.prose-toc a',
-  offset: number = 200
-) => {
-  const router = useRouter()
-  const anchors = useRef<NodeListOf<HTMLHeadingElement> | null>(null)
-  const toc = useRef<NodeListOf<HTMLHeadingElement> | null>(null)
-
-  const handleScroll = () => {
-    const pageYOffset = window.pageYOffset
-    let newActiveAnchor: string = ''
-
-    anchors.current?.forEach((anchor) => {
-      if (pageYOffset >= anchor.offsetTop - offset) {
+interface UseActiveAnchorsOptions {
+  /** CSS selector for heading elements to track */
+  anchorsSelector?: string
+  /** CSS selector for TOC anchor links */
+  tocSelector?: string
+  /** Pixel offset from top of viewport for activation threshold */
+  offset?: number
+}
+
+/**
+ * Hook to handle Table of Contents (TOC) functionality for blog posts.
+ *
+ * Provides two main features:
+ * 1. **TOC highlighting**: Highlights the active TOC link based on scroll position
+ *    by adding/removing the `toc-animate` CSS class.
+ * 2. **Hash scrolling**: Smoothly scrolls to the target heading when the page
+ *    loads with a URL hash (e.g., `/blog/post#section-name`).
+ *
+ * @param options - Configuration options for the hook
+ *
+ * @example
+ * ```tsx
+ * // Basic usage with defaults
+ * useActiveAnchors()
+ *
+ * // Custom selectors and offset
+ * useActiveAnchors({
+ *   anchorsSelector: 'h2, h3',
+ *   tocSelector: '.custom-toc a',
+ *   offset: 150
+ * })
+ * ```
+ */
+const useActiveAnchors = (options: UseActiveAnchorsOptions = {}): void => {
+  const { anchorsSelector = 'h2', tocSelector = '.prose-toc a', offset = 200 } = options
+
+  const anchorsRef = useRef<NodeListOf<HTMLHeadingElement> | null>(null)
+  const tocRef = useRef<NodeListOf<HTMLAnchorElement> | null>(null)
+
+  /**
+   * Scroll event handler that determines which heading is currently in view
+   * and updates the corresponding TOC link with the `toc-animate` class.
+   */
+  const handleScroll = (): void => {
+    const scrollY = window.scrollY
+    let newActiveAnchor = ''
+
+    // Find the heading that's currently scrolled past
+    anchorsRef.current?.forEach((anchor) => {
+      if (scrollY >= anchor.offsetTop - offset) {
         newActiveAnchor = anchor.id
       }
     })
 
-    toc.current?.forEach((link) => {
+    // Update TOC link styles based on active heading
+    tocRef.current?.forEach((link) => {
       link.classList.remove('toc-animate')
 
-      // Need to decodeURI the href to get emojis, then strip them off and remove "--""
-      // to make toc hrefs and content headings ids match
+      // Normalize both href and heading id for comparison:
+      // - Decode URI to handle emojis
+      // - Strip emojis and dashes to handle edge cases
       const sanitizedHref = stripEmojis(
         decodeURI(link.getAttribute('href') ?? '').replace('#', '')
       ).replaceAll('-', '')
@@ -39,19 +75,39 @@ const useActiveAnchors = (
     })
   }
 
+  /**
+   * Handles initial scroll to anchor when page loads with a URL hash.
+   * This is necessary because dynamically loaded content may not exist
+   * when the browser's native hash scrolling occurs.
+   */
+  const handleHashScroll = (): void => {
+    if (!window.location.hash) return
+
+    const targetId = window.location.hash.slice(1)
+    const targetElement = document.getElementById(targetId)
+
+    if (targetElement) {
+      targetElement.scrollIntoView({ behavior: 'smooth' })
+    }
+  }
+
   useEffect(() => {
-    if (!isBrowser || !router.isReady) return
-    anchors.current = document.querySelectorAll(anchorsQuerySelector)
-    toc.current = document.querySelectorAll(tocQuerySelector)
+    if (!isBrowser) return
 
+    // Query and cache heading elements and TOC links
+    anchorsRef.current = document.querySelectorAll(anchorsSelector)
+    tocRef.current = document.querySelectorAll(tocSelector)
+
+    // Scroll to hash target on initial load
+    handleHashScroll()
+
+    // Listen for scroll to update active TOC link
     window.addEventListener('scroll', handleScroll)
 
     return () => {
       window.removeEventListener('scroll', handleScroll)
     }
-  }, [router])
-
-  return null
+  }, [anchorsSelector, tocSelector, offset])
 }
 
 export default useActiveAnchors
diff --git a/docker/CHANGELOG.md b/docker/CHANGELOG.md
index b66438d1506a5..dfd45ac9b001e 100644
--- a/docker/CHANGELOG.md
+++ b/docker/CHANGELOG.md
@@ -7,13 +7,53 @@ for complete image version history and rollback information.
 
 Check updates for each service to learn more.
 
-**Note:** Configuration updates marked with "requires [...] update" are already included in the latest version of the repository. Pull the latest changes or refer to the linked PR for manual updates. After updating `docker-compose.yml`, pull latest images and recreate containers - use `docker compose down && docker compose pull && docker compose up -d`.
+**Note:** Configuration updates marked with "requires [...] update" are already included in the latest version of the repository. Pull the latest changes or refer to the linked PR for manual updates. After updating `docker-compose.yml`, pull latest images and recreate containers - use `docker compose pull && docker compose down && docker compose up -d`.
 
 ---
 
 ## Unreleased
 
-[...]
+- Updated self-hosting installation and configuration guide - PR [#40901](https://github.com/supabase/supabase/pull/40901)
+
+---
+
+## [2025-12-10]
+
+### Studio
+
+- Updated to `2025.12.09-sha-434634f`
+- ⚠️ Fixed potential issues related to [React2Shell](https://vercel.com/kb/bulletin/react2shell)
+- ⚠️ Changed MCP tool `get_anon_key` to `get_publishable_keys` - [MCP Server Releases](https://github.com/supabase-community/supabase-mcp/releases)
+
+### PostgREST
+
+- Updated to `v14.1` - [Changelog](https://github.com/PostgREST/postgrest/blob/main/CHANGELOG.md) | [Release](https://github.com/PostgREST/postgrest/releases/tag/v14.1)
+- ⚠️ **Major upgrade from v13.x to v14.x** - please report any unexpected behavior
+
+### Realtime
+
+- Updated to `v2.68.0` - [Releases](https://github.com/supabase/realtime/releases/tag/v2.68.0)
+
+### Storage
+
+- Updated to `v1.33.0` - [Release](https://github.com/supabase/storage/releases/tag/v1.33.0)
+
+### Edge Runtime
+
+- Updated to `v1.69.28` - [Release](https://github.com/supabase/edge-runtime/releases/tag/v1.69.28)
+
+### Logflare
+
+- Updated to `1.26.25` - [Release](https://github.com/Logflare/logflare/releases/tag/v1.26.25)
+
+---
+
+## [2025-12-08]
+
+### Realtime
+- No image update
+- Changed boolean values to strings in Docker Compose for better compatibility with Podman - PR [#40994](https://github.com/supabase/supabase/pull/40994), also PR [realtime#1614](https://github.com/supabase/realtime/pull/1614)
+- Changed healthcheck in Docker Compose for better compatibility with Podman - PR [#41159](https://github.com/supabase/supabase/pull/41159)
 
 ---
 
@@ -48,6 +88,7 @@ Check updates for each service to learn more.
 
 ### Realtime
 - Updated to `v2.65.2` - [Release](https://github.com/supabase/realtime/releases/tag/v2.65.2)
+- Fixed handling of boolean configurations options - PR [realtime#1614](https://github.com/supabase/realtime/pull/1614)
 
 ### Storage
 - Updated to `v1.32.0` - [Release](https://github.com/supabase/storage/releases/tag/v1.32.0)
diff --git a/docker/versions.md b/docker/versions.md
index 0c0b2e03861c6..6c44818674977 100644
--- a/docker/versions.md
+++ b/docker/versions.md
@@ -1,5 +1,13 @@
 # Docker Image Versions
 
+## 2025-12-10
+- supabase/studio:2025.12.09-sha-434634f (prev supabase/studio:2025.11.26-sha-8f096b5)
+- postgrest/postgrest:v14.1 (prev postgrest/postgrest:v13.0.7)
+- supabase/realtime:v2.68.0 (prev supabase/realtime:v2.65.3)
+- supabase/storage-api:v1.33.0 (prev supabase/storage-api:v1.32.0)
+- supabase/edge-runtime:v1.69.28 (prev supabase/edge-runtime:v1.69.25)
+- supabase/logflare:1.26.25 (prev supabase/logflare:1.26.13)
+
 ## 2025-11-26
 - supabase/studio:2025.11.26-sha-8f096b5 (prev supabase/studio:2025.11.24-sha-d990ae8)
 - supabase/realtime:v2.65.3 (prev supabase/realtime:v2.65.2)
diff --git a/e2e/studio/features/logs.spec.ts b/e2e/studio/features/logs.spec.ts
index dc33eed157325..5931bf4ac94d7 100644
--- a/e2e/studio/features/logs.spec.ts
+++ b/e2e/studio/features/logs.spec.ts
@@ -60,7 +60,7 @@ test.describe('Logs', () => {
 
       await expect(logsTable, {
         message: 'Logs table should be visible',
-      }).toBeVisible({ timeout: 20000 })
+      }).toBeVisible()
 
       /**
        * Shows the logs data without errors
@@ -73,10 +73,15 @@ test.describe('Logs', () => {
        * Can select and view log details
        */
       const gridcells = page.getByText('Random event message')
+      await expect(gridcells, {
+        message: 'Grid cell should be visible before clicking',
+      }).toBeVisible()
       await gridcells.click()
 
       const tabPanel = page.getByTestId('log-selection')
-      await expect(tabPanel).toBeVisible()
+      await expect(tabPanel, {
+        message: 'Log selection panel should be visible after clicking a log',
+      }).toBeVisible()
 
       // Assert known fixed values instead of extracting text
       await expect(tabPanel, {
diff --git a/e2e/studio/features/sql-editor.spec.ts b/e2e/studio/features/sql-editor.spec.ts
index a7e40af32eb06..db689ed1b5d83 100644
--- a/e2e/studio/features/sql-editor.spec.ts
+++ b/e2e/studio/features/sql-editor.spec.ts
@@ -1,12 +1,12 @@
 import { expect, Page } from '@playwright/test'
 import fs from 'fs'
+import { env } from '../env.config.js'
 import { isCLI } from '../utils/is-cli.js'
 import { resetLocalStorage } from '../utils/reset-local-storage.js'
 import { test } from '../utils/test.js'
 import { toUrl } from '../utils/to-url.js'
 import { waitForApiResponseWithTimeout } from '../utils/wait-for-response-with-timeout.js'
 import { waitForApiResponse } from '../utils/wait-for-response.js'
-import { env } from '../env.config.js'
 
 const sqlSnippetName = 'pw_sql_snippet'
 const sqlSnippetNameDuplicate = 'pw_sql_snippet (Duplicate)'
@@ -215,23 +215,23 @@ hello world`)
   })
 
   test('snippet favourite works as expected', async ({ ref }) => {
-    if (!isCLI()) {
-      // clean up private snippets and snippets shared with the team
-      await waitForApiResponseWithTimeout(
-        page,
-        (response) => response.url().includes('query?key=table-columns'),
-        3000
-      )
-      const privateSnippetSection = page.getByLabel('private-snippets')
-      if ((await privateSnippetSection.getByText(newSqlSnippetName, { exact: true }).count()) > 0) {
-        await deleteSqlSnippet(page, ref, newSqlSnippetName)
-      }
+    test.skip(isCLI(), 'This test does not work in self-hosted environments.')
 
-      if (
-        (await privateSnippetSection.getByText(sqlSnippetNameFavorite, { exact: true }).count()) > 0
-      ) {
-        await deleteSqlSnippet(page, ref, sqlSnippetNameFavorite)
-      }
+    // clean up private snippets and snippets shared with the team
+    await waitForApiResponseWithTimeout(
+      page,
+      (response) => response.url().includes('query?key=table-columns'),
+      3000
+    )
+    const privateSnippetSection = page.getByLabel('private-snippets')
+    if ((await privateSnippetSection.getByText(newSqlSnippetName, { exact: true }).count()) > 0) {
+      await deleteSqlSnippet(page, ref, newSqlSnippetName)
+    }
+
+    if (
+      (await privateSnippetSection.getByText(sqlSnippetNameFavorite, { exact: true }).count()) > 0
+    ) {
+      await deleteSqlSnippet(page, ref, sqlSnippetNameFavorite)
     }
 
     // create sql snippet
@@ -242,7 +242,6 @@ hello world`)
     await page.getByTestId('sql-run-button').click()
 
     // rename snippet
-    const privateSnippetSection = page.getByLabel('private-snippets')
     await privateSnippetSection.getByText(newSqlSnippetName).click({ button: 'right' })
     await page.getByRole('menuitem', { name: 'Rename query', exact: true }).click()
     await expect(page.getByRole('heading', { name: 'Rename' })).toBeVisible()
@@ -283,10 +282,7 @@ hello world`)
   })
 
   test('share with team works as expected', async ({ ref }) => {
-    if (!isCLI()) {
-      console.log('Sharing and unsharing SQL snippet has issues in staging')
-      return
-    }
+    test.skip(isCLI(), 'Sharing and unsharing SQL snippet has issues in staging')
 
     // clean up private snippets and snippets shared with the team
     await waitForApiResponseWithTimeout(
@@ -379,25 +375,21 @@ hello world`)
   })
 
   test('folders works as expected', async ({ ref }) => {
-    if (!isCLI()) {
-      // clean up folders and snippets
-      await waitForApiResponseWithTimeout(
-        page,
-        (response) => response.url().includes('query?key=table-columns'),
-        3000
-      )
-      const privateSnippetSection = page.getByLabel('private-snippets')
-      if ((await privateSnippetSection.getByText(sqlFolderName, { exact: true }).count()) > 0) {
-        await deleteFolder(page, ref, sqlFolderName)
-      }
-      if (
-        (await privateSnippetSection.getByText(sqlFolderNameUpdated, { exact: true }).count()) > 0
-      ) {
-        await deleteFolder(page, ref, sqlFolderNameUpdated)
-      }
-    } else {
-      console.log('This test does not work in self-hosted environments.')
-      return
+    test.skip(isCLI(), 'This test does not work in self-hosted environments.')
+    // clean up folders and snippets
+    await waitForApiResponseWithTimeout(
+      page,
+      (response) => response.url().includes('query?key=table-columns'),
+      3000
+    )
+    const privateSnippetSection = page.getByLabel('private-snippets')
+    if ((await privateSnippetSection.getByText(sqlFolderName, { exact: true }).count()) > 0) {
+      await deleteFolder(page, ref, sqlFolderName)
+    }
+    if (
+      (await privateSnippetSection.getByText(sqlFolderNameUpdated, { exact: true }).count()) > 0
+    ) {
+      await deleteFolder(page, ref, sqlFolderNameUpdated)
     }
 
     // create sql snippet
@@ -408,7 +400,6 @@ hello world`)
     await page.getByTestId('sql-run-button').click()
 
     // rename snippet
-    const privateSnippetSection = page.getByLabel('private-snippets')
     await privateSnippetSection.getByText(newSqlSnippetName).click({ button: 'right' })
     await page.getByRole('menuitem', { name: 'Rename query', exact: true }).click()
     await expect(page.getByRole('heading', { name: 'Rename' })).toBeVisible()
@@ -473,26 +464,22 @@ hello world`)
   })
 
   test('other SQL snippets actions work as expected', async ({ ref }) => {
-    if (!isCLI()) {
-      // clean up 'Untitled query', 'pw_sql_snippet' and 'pw_sql_snippet (Duplicate)' snippets if exists
-      await waitForApiResponseWithTimeout(
-        page,
-        (response) => response.url().includes('query?key=table-columns'),
-        3000
-      )
-      const privateSnippet = page.getByLabel('private-snippets')
-      if ((await privateSnippet.getByText(newSqlSnippetName).count()) > 0) {
-        deleteSqlSnippet(page, ref, newSqlSnippetName)
-      }
-      if ((await privateSnippet.getByText(sqlSnippetNameDuplicate, { exact: true }).count()) > 0) {
-        await deleteSqlSnippet(page, ref, sqlSnippetNameDuplicate)
-      }
-      if ((await privateSnippet.getByText(sqlSnippetName, { exact: true }).count()) > 0) {
-        await deleteSqlSnippet(page, ref, sqlSnippetName)
-      }
-    } else {
-      console.log('This test does not work in self-hosted environments.')
-      return
+    test.skip(isCLI(), 'This test does not work in self-hosted environments.')
+    // clean up 'Untitled query', 'pw_sql_snippet' and 'pw_sql_snippet (Duplicate)' snippets if exists
+    await waitForApiResponseWithTimeout(
+      page,
+      (response) => response.url().includes('query?key=table-columns'),
+      3000
+    )
+    const privateSnippet = page.getByLabel('private-snippets')
+    if ((await privateSnippet.getByText(newSqlSnippetName).count()) > 0) {
+      deleteSqlSnippet(page, ref, newSqlSnippetName)
+    }
+    if ((await privateSnippet.getByText(sqlSnippetNameDuplicate, { exact: true }).count()) > 0) {
+      await deleteSqlSnippet(page, ref, sqlSnippetNameDuplicate)
+    }
+    if ((await privateSnippet.getByText(sqlSnippetName, { exact: true }).count()) > 0) {
+      await deleteSqlSnippet(page, ref, sqlSnippetName)
     }
 
     // create sql snippet
diff --git a/e2e/studio/features/storage.spec.ts b/e2e/studio/features/storage.spec.ts
index 66933bd65d6b8..e625ef5b882fb 100644
--- a/e2e/studio/features/storage.spec.ts
+++ b/e2e/studio/features/storage.spec.ts
@@ -59,7 +59,7 @@ test.describe.serial('Storage', () => {
     await expect(
       bucketRow.getByText('Public', { exact: true }),
       'Bucket should be marked as Public'
-    ).toBeVisible({ timeout: 10000 })
+    ).toBeVisible()
   })
 
   test('can edit bucket settings', async ({ page, ref }) => {
@@ -91,7 +91,7 @@ test.describe.serial('Storage', () => {
     await expect(
       page.getByText('Public').first(),
       'Bucket should now be marked as Public'
-    ).toBeVisible({ timeout: 10_000 })
+    ).toBeVisible()
   })
 
   test('can delete a bucket', async ({ page, ref }) => {
diff --git a/e2e/studio/features/table-editor.spec.ts b/e2e/studio/features/table-editor.spec.ts
index 582e91000b07c..d4e3445ee92fd 100644
--- a/e2e/studio/features/table-editor.spec.ts
+++ b/e2e/studio/features/table-editor.spec.ts
@@ -8,6 +8,7 @@ import { test } from '../utils/test.js'
 import { toUrl } from '../utils/to-url.js'
 import { waitForApiResponseWithTimeout } from '../utils/wait-for-response-with-timeout.js'
 import {
+  createApiResponseWaiter,
   waitForApiResponse,
   waitForGridDataToLoad,
   waitForTableToLoad,
@@ -72,7 +73,7 @@ const createTable = async (page: Page, ref: string, tableName: string) => {
   await expect(
     page.getByRole('button', { name: `View ${tableName}`, exact: true }),
     'Table should be visible after creation'
-  ).toBeVisible({ timeout: 15_000 })
+  ).toBeVisible()
 }
 
 const deleteTable = async (page: Page, ref: string, tableName: string) => {
@@ -493,8 +494,14 @@ testRunner('table editor', () => {
     await page.getByRole('button', { name: 'id', exact: true }).click()
     await page.getByRole('menuitem', { name: colName }).click()
     await page.getByRole('textbox', { name: 'Enter a value' }).fill('789')
+    const waitForFilterApply = createApiResponseWaiter(
+      page,
+      'pg-meta',
+      ref,
+      'query?key=table-rows-'
+    )
     await page.getByRole('button', { name: 'Apply filter' }).click()
-    await waitForGridDataToLoad(page, ref)
+    await waitForFilterApply
     await page.waitForTimeout(500)
     await page.getByRole('button', { name: 'Filtered by 1 rule' }).click({ force: true })
     await expect(page.getByRole('gridcell', { name: '789' })).toBeVisible()
@@ -551,8 +558,14 @@ testRunner('table editor', () => {
     await page.getByRole('button', { name: 'Sort', exact: true }).click()
     await page.getByRole('button', { name: 'Pick a column to sort by' }).click()
     await page.getByRole('menuitem', { name: colName }).click()
+    const waitForSortingApply = createApiResponseWaiter(
+      page,
+      'pg-meta',
+      ref,
+      'query?key=table-rows-'
+    )
     await page.getByRole('button', { name: 'Apply sorting' }).click()
-    await waitForGridDataToLoad(page, ref)
+    await waitForSortingApply
     await page.getByRole('button', { name: 'Sorted by 1 rule' }).click()
 
     // Verify sorted row content asc lexicographically for strings
@@ -580,8 +593,11 @@ testRunner('table editor', () => {
     await page.getByRole('tab', { name: 'Upload CSV' }).click()
     await page.setInputFiles('input[type="file"]', csvFilePath)
     await expect(page.getByText('A total of 50 rows will be')).toBeVisible()
+    const waitForCsvInsert = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=', {
+      method: 'POST',
+    })
     await page.getByRole('button', { name: 'Import data' }).click()
-    await waitForApiResponse(page, 'pg-meta', ref, 'query?key=', { method: 'POST' }) // insert data
+    await waitForCsvInsert // insert data
     await waitForGridDataToLoad(page, ref) // retrieve updated data
     await expect(page.getByText('50 records')).toBeVisible()
 
@@ -593,23 +609,33 @@ testRunner('table editor', () => {
     await page.getByRole('tab', { name: 'Paste text' }).click()
     await page.getByRole('textbox').fill(fileContent)
     await expect(page.getByText('A total of 51 rows will be')).toBeVisible()
+    const waitForPasteInsert = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=', {
+      method: 'POST',
+    })
     await page.getByRole('button', { name: 'Import data' }).click()
-    await waitForApiResponse(page, 'pg-meta', ref, 'query?key=', { method: 'POST' }) // insert data
+    await waitForPasteInsert // insert data
     await waitForGridDataToLoad(page, ref) // retrieve updated data
     await expect(page.getByText('101 records')).toBeVisible()
 
     // test pagination (page 1 -> page 2)
     await expect(page.getByRole('gridcell', { name: 'value 7', exact: true })).toBeVisible()
     await expect(page.getByRole('gridcell', { name: 'value 101', exact: true })).not.toBeVisible()
+    const waitForPageChange = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=table-rows-')
     await page.getByLabel('Table grid footer').getByRole('button').nth(1).click()
-    await waitForGridDataToLoad(page, ref) // retrieve next page data
+    await waitForPageChange // retrieve next page data
     await expect(page.getByRole('gridcell', { name: 'value 7', exact: true })).not.toBeVisible()
     await expect(page.getByRole('gridcell', { name: 'value 101', exact: true })).toBeVisible()
 
     // change pagination size (100 -> 500)
     await page.getByRole('button', { name: 'rows' }).click()
+    const waitForPaginationChange = createApiResponseWaiter(
+      page,
+      'pg-meta',
+      ref,
+      'query?key=table-rows-'
+    )
     await page.getByRole('menuitem', { name: '500 rows' }).click()
-    await waitForGridDataToLoad(page, ref) // retrieve updated pagination size data
+    await waitForPaginationChange // retrieve updated pagination size data
     await expect(page.getByRole('gridcell', { name: 'value 7', exact: true })).toBeVisible()
     await page.getByRole('grid').evaluate((element) => {
       element.scrollTop = element.scrollHeight
@@ -625,8 +651,11 @@ testRunner('table editor', () => {
     await page.getByRole('row', { name: 'value 3 to delete' }).getByRole('checkbox').click()
     await page.getByRole('button', { name: 'Delete 3 rows' }).click()
     await expect(page.getByText('delete the selected 3 rows')).toBeVisible()
+    const waitForDeleteRows = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=', {
+      method: 'POST',
+    })
     await page.getByRole('button', { name: 'Delete' }).click()
-    await waitForApiResponse(page, 'pg-meta', ref, 'query?key=', { method: 'POST' }) // delete selected rows
+    await waitForDeleteRows // delete selected rows
     await waitForGridDataToLoad(page, ref) // retrieve row data
 
     // export selected rows when multiple rows action is selected
@@ -705,9 +734,12 @@ testRunner('table editor', () => {
     // select all actions works (delete action)
     await page.getByRole('checkbox', { name: 'Select All' }).click()
     await page.getByRole('button', { name: 'Delete 98 rows' }).click()
+    const waitForDeleteAllRows = createApiResponseWaiter(page, 'pg-meta', ref, 'query?key=', {
+      method: 'POST',
+    })
     await page.getByRole('button', { name: 'Delete' }).click()
     await expect(page.getByText('delete the selected 98 rows')).toBeVisible()
-    await waitForApiResponse(page, 'pg-meta', ref, 'query?key=', { method: 'POST' }) // delete all rows
+    await waitForDeleteAllRows // delete all rows
     await waitForGridDataToLoad(page, ref) // retrieve rows data
     await expect(page.getByRole('gridcell', { name: 'value 7' })).not.toBeVisible()
     await expect(page.getByRole('gridcell', { name: 'value 101' })).not.toBeVisible()
diff --git a/e2e/studio/playwright.config.ts b/e2e/studio/playwright.config.ts
index d8d2677353e87..68e1e42054785 100644
--- a/e2e/studio/playwright.config.ts
+++ b/e2e/studio/playwright.config.ts
@@ -39,6 +39,9 @@ export default defineConfig({
   forbidOnly: IS_CI,
   retries: IS_CI ? 5 : 0,
   maxFailures: 3,
+  expect: {
+    timeout: 20_000,
+  },
   // Due to rate API rate limits run tests in serial mode on platform.
   fullyParallel: !env.IS_PLATFORM,
   workers: env.IS_PLATFORM ? 1 : 3,
@@ -54,6 +57,69 @@ export default defineConfig({
         process.env.VERCEL_AUTOMATION_BYPASS_SELFHOSTED_STUDIO || 'false',
       'x-vercel-set-bypass-cookie': 'true',
     },
+    launchOptions: {
+      args: [
+        // Security/Sandbox settings (required for CI environments)
+        '--no-sandbox', // Disables Chrome's sandbox - required in Docker/CI where user namespaces aren't available
+        '--disable-setuid-sandbox', // Alternative sandbox method - disabled for CI compatibility
+        '--allow-insecure-localhost', // Allows tests against localhost with self-signed certificates
+
+        // Memory and resource management
+        '--disable-dev-shm-usage', // Use /tmp instead of /dev/shm to avoid shared memory issues in containers
+        '--js-flags=--max_old_space_size=4096', // Increase V8 heap size to 4GB to handle memory-intensive tests
+        '--memory-pressure-off', // Prevents Chrome from killing tabs due to memory pressure in CI
+        '--enable-low-end-device-mode', // Optimizes memory usage for resource-constrained environments
+
+        // GPU and rendering (disabled for headless/CI performance)
+        '--disable-gpu', // Disables hardware GPU - not needed in headless mode
+        '--disable-software-rasterizer', // Disables software-based rendering fallback
+
+        // Performance optimizations for testing
+        '--disable-background-timer-throttling', // Prevents Chrome from throttling timers in background tabs
+        '--disable-backgrounding-occluded-windows', // Keeps hidden windows running at full speed
+        '--disable-renderer-backgrounding', // Prevents renderer processes from being deprioritized
+        '--disable-ipc-flooding-protection', // Allows high-frequency IPC messages needed for automation
+
+        // Disable unnecessary features to reduce overhead
+        '--disable-extensions', // Disables all browser extensions
+        '--disable-sync', // Disables Chrome sync service
+        '--disable-default-apps', // Prevents loading of default Chrome apps
+        '--disable-component-update', // Disables automatic component updates during tests
+        '--disable-background-networking', // Disables background network requests
+        '--disable-features=TranslateUI', // Disables translation UI prompts
+        '--disable-features=MediaRouter,site-per-process', // Disables Cast and site isolation for performance
+        '--disable-features=HardwareMediaKeyHandling', // Disables hardware media key handling
+
+        // Disable monitoring and crash reporting
+        '--disable-breakpad', // Disables crash reporting system
+        '--disable-crash-reporter', // Disables crash reporter UI
+        '--disable-hang-monitor', // Disables hang detection monitoring
+        '--metrics-recording-only', // Disables metric uploads while still collecting them
+
+        // Disable security features not needed for testing
+        '--disable-client-side-phishing-detection', // Disables phishing detection checks
+        '--safebrowsing-disable-auto-update', // Disables safe browsing database updates
+        '--disable-domain-reliability', // Disables domain reliability monitoring
+
+        // Disable user prompts and UI elements
+        '--disable-popup-blocking', // Allows popups without user confirmation
+        '--disable-prompt-on-repost', // Skips form resubmission confirmation dialogs
+        '--no-first-run', // Skips first-run wizards and setup dialogs
+        '--no-default-browser-check', // Prevents "set as default browser" prompts
+
+        // Process management
+        '--no-zygote', // Disables zygote process for spawning renderers - reduces memory in single-use scenarios
+
+        // Headless mode configuration
+        '--headless=new', // Uses new headless mode (more stable than old headless)
+        '--window-size=1280,720', // Sets consistent viewport size for screenshot/visual consistency
+        '--hide-scrollbars', // Hides scrollbars for cleaner screenshots
+        '--mute-audio', // Prevents audio output during tests
+
+        // Network configuration
+        '--enable-features=NetworkService,NetworkServiceInProcess', // Uses modern network service in-process for better performance
+      ],
+    },
   },
   projects: [
     {
diff --git a/e2e/studio/utils/storage-helpers.ts b/e2e/studio/utils/storage-helpers.ts
index 2458af2ebf6f2..c535da8c23492 100644
--- a/e2e/studio/utils/storage-helpers.ts
+++ b/e2e/studio/utils/storage-helpers.ts
@@ -69,7 +69,7 @@ export const createBucket = async (
   await expect(
     page.getByRole('row').filter({ hasText: bucketName }),
     `Bucket ${bucketName} should be visible after creation`
-  ).toBeVisible({ timeout: 15_000 })
+  ).toBeVisible()
 }
 
 /**
@@ -147,7 +147,7 @@ export const navigateToBucket = async (page: Page, ref: string, bucketName: stri
   await expect(
     page.getByRole('button', { name: 'Edit bucket' }),
     `Should be in bucket ${bucketName}`
-  ).toBeVisible({ timeout: 10_000 })
+  ).toBeVisible()
 }
 
 /**
@@ -171,7 +171,7 @@ export const createFolder = async (page: Page, folderName: string) => {
   await expect(
     page.getByTitle(folderName),
     `Folder ${folderName} should be visible after creation`
-  ).toBeVisible({ timeout: 10_000 })
+  ).toBeVisible()
 }
 
 /**
@@ -217,7 +217,7 @@ export const deleteItem = async (page: Page, itemName: string) => {
   await expect(
     page.getByTitle(itemName),
     `Item ${itemName} should not be visible after deletion`
-  ).not.toBeVisible({ timeout: 10_000 })
+  ).not.toBeVisible()
 }
 
 /**
diff --git a/package.json b/package.json
index 39559ad051bad..ac42d0ed66b3c 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "test:studio": "turbo run test --filter=studio",
     "test:studio:watch": "turbo run test --filter=studio -- watch",
     "e2e:setup:cli": "supabase stop --all --no-backup ; supabase start --exclude studio && supabase db reset && supabase status --output json > keys.json && node scripts/generateLocalEnv.js",
-    "e2e:setup:selfhosted": "SKIP_ASSET_UPLOAD=1 pnpm e2e:setup:cli && NODE_ENV=test NODE_OPTIONS=\"--max-old-space-size=4096\" pnpm run build:studio && NODE_ENV=test pnpm --prefix ./apps/studio start --port 8082",
-    "e2e:setup:platform": "SKIP_ASSET_UPLOAD=1 NODE_OPTIONS=\"--max-old-space-size=4096\" pnpm run build:studio && pnpm --prefix ./apps/studio start --port 8082",
+    "e2e:setup:selfhosted": "SKIP_ASSET_UPLOAD=1 pnpm e2e:setup:cli && NODE_ENV=test NODE_OPTIONS=\"--max-old-space-size=4096\" pnpm run build:studio && NODE_ENV=test pnpm --prefix ./apps/studio start",
+    "e2e:setup:platform": "SKIP_ASSET_UPLOAD=1 NODE_OPTIONS=\"--max-old-space-size=4096\" pnpm run build:studio && pnpm --prefix ./apps/studio start",
     "e2e": "pnpm --prefix e2e/studio run e2e",
     "e2e:ui": "pnpm --prefix e2e/studio run e2e:ui",
     "perf:kong": "ab -t 5 -c 20 -T application/json http://localhost:8000/",
diff --git a/packages/common/feature-flags.tsx b/packages/common/feature-flags.tsx
index f9ea005889d4f..f16d739463473 100644
--- a/packages/common/feature-flags.tsx
+++ b/packages/common/feature-flags.tsx
@@ -164,12 +164,17 @@ const isObjectEmpty = (obj: Object) => {
 
 export function useFlag<T = boolean>(name: string) {
   const flagStore = useFeatureFlags()
-
   const store = flagStore.configcat
 
-  if (!isObjectEmpty(store) && store[name] === undefined) {
+  // Flag store is empty means config cat is not loaded yet, return false
+  if (isObjectEmpty(store)) {
+    return false
+  }
+
+  if (store[name] === undefined) {
     console.error(`Flag key "${name}" does not exist in ConfigCat flag store`)
     return false
   }
+
   return store[name] as T
 }