diff --git a/apps/studio/components/interfaces/Account/Preferences/AnalyticsSettings.tsx b/apps/studio/components/interfaces/Account/Preferences/AnalyticsSettings.tsx
index f9928a5b2788c..35267f776f675 100644
--- a/apps/studio/components/interfaces/Account/Preferences/AnalyticsSettings.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/AnalyticsSettings.tsx
@@ -1,8 +1,17 @@
-import { Toggle } from 'ui'
+import { zodResolver } from '@hookform/resolvers/zod'
+import { useForm } from 'react-hook-form'
 import { toast } from 'sonner'
+import * as z from 'zod'
+
 import { useConsentState } from 'common'
 import Panel from 'components/ui/Panel'
 import { useSendResetMutation } from 'data/telemetry/send-reset-mutation'
+import { FormControl_Shadcn_, FormField_Shadcn_, Form_Shadcn_, Switch } from 'ui'
+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+
+const AnalyticsSchema = z.object({
+  telemetryEnabled: z.boolean(),
+})
 
 export const AnalyticsSettings = () => {
   const { hasAccepted, acceptAll, denyAll, categories } = useConsentState()
@@ -10,31 +19,54 @@ export const AnalyticsSettings = () => {
 
   const { mutate: sendReset } = useSendResetMutation()
 
-  const onToggleOptIn = () => {
+  const form = useForm<z.infer<typeof AnalyticsSchema>>({
+    resolver: zodResolver(AnalyticsSchema),
+    values: { telemetryEnabled: hasAccepted },
+  })
+
+  const handleToggle = (value: boolean) => {
     if (!hasLoaded) {
-      toast.error(
+      return toast.error(
         "We couldn't load the privacy settings due to an ad blocker or network error. Please disable any ad blockers and try again. If the problem persists, please contact support."
       )
-      return
     }
 
-    if (hasAccepted) {
+    if (value) {
+      acceptAll()
+    } else {
       denyAll()
       sendReset()
-    } else {
-      acceptAll()
     }
+
+    form.setValue('telemetryEnabled', value)
   }
 
   return (
     <Panel title={<h5 key="panel-title">Analytics and Marketing</h5>}>
       <Panel.Content>
-        <Toggle
-          checked={hasAccepted}
-          onChange={onToggleOptIn}
-          label="Send telemetry data from Supabase services"
-          descriptionText="By opting in to sharing telemetry data, Supabase can analyze usage patterns to enhance user experience and use it for marketing and advertising purposes"
-        />
+        <Form_Shadcn_ {...form}>
+          <FormField_Shadcn_
+            control={form.control}
+            name="telemetryEnabled"
+            render={({ field }) => (
+              <FormItemLayout
+                layout="flex-row-reverse"
+                label="Send telemetry data from Supabase services"
+                description="By opting in to sharing telemetry data, Supabase can analyze usage patterns to enhance user experience and use it for marketing and advertising purposes"
+              >
+                <FormControl_Shadcn_>
+                  <Switch
+                    checked={field.value}
+                    onCheckedChange={(value) => {
+                      field.onChange(value)
+                      handleToggle(value)
+                    }}
+                  />
+                </FormControl_Shadcn_>
+              </FormItemLayout>
+            )}
+          />
+        </Form_Shadcn_>
       </Panel.Content>
     </Panel>
   )
diff --git a/apps/studio/components/interfaces/Account/Preferences/HotkeySettings.tsx b/apps/studio/components/interfaces/Account/Preferences/HotkeySettings.tsx
index cf89c8a4d1d78..b97f3d0a19c0d 100644
--- a/apps/studio/components/interfaces/Account/Preferences/HotkeySettings.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/HotkeySettings.tsx
@@ -1,8 +1,19 @@
+import { zodResolver } from '@hookform/resolvers/zod'
+import { useForm } from 'react-hook-form'
+import * as z from 'zod'
+
 import { LOCAL_STORAGE_KEYS } from 'common'
 import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import Panel from 'components/ui/Panel'
 import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
-import { KeyboardShortcut, Toggle } from 'ui'
+import { FormControl_Shadcn_, FormField_Shadcn_, Form_Shadcn_, KeyboardShortcut, Switch } from 'ui'
+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+
+const HotkeySchema = z.object({
+  commandMenuEnabled: z.boolean(),
+  aiAssistantEnabled: z.boolean(),
+  inlineEditorEnabled: z.boolean(),
+})
 
 export const HotkeySettings = () => {
   const [inlineEditorEnabled, setInlineEditorEnabled] = useLocalStorageQuery(
@@ -18,6 +29,15 @@ export const HotkeySettings = () => {
     true
   )
 
+  const form = useForm<z.infer<typeof HotkeySchema>>({
+    resolver: zodResolver(HotkeySchema),
+    values: {
+      commandMenuEnabled: commandMenuEnabled ?? true,
+      aiAssistantEnabled: aiAssistantEnabled ?? true,
+      inlineEditorEnabled: inlineEditorEnabled ?? true,
+    },
+  })
+
   return (
     <Panel
       title={
@@ -29,38 +49,89 @@ export const HotkeySettings = () => {
         </div>
       }
     >
-      <Panel.Content className="space-y-2">
-        <Toggle
-          checked={commandMenuEnabled}
-          onChange={() => setCommandMenuEnabled(!commandMenuEnabled)}
-          label={
-            <div className="flex items-center gap-x-3">
-              <KeyboardShortcut keys={['Meta', 'k']} />
-              <span>Command menu</span>
-            </div>
-          }
-        />
-        <Toggle
-          checked={aiAssistantEnabled}
-          onChange={() => setAiAssistantEnabled(!aiAssistantEnabled)}
-          label={
-            <div className="flex items-center gap-x-3">
-              <KeyboardShortcut keys={['Meta', 'i']} />
-              <span>AI Assistant Panel</span>
-            </div>
-          }
-        />
-        <Toggle
-          checked={inlineEditorEnabled}
-          onChange={() => setInlineEditorEnabled(!inlineEditorEnabled)}
-          label={
-            <div className="flex items-center gap-x-3">
-              <KeyboardShortcut keys={['Meta', 'e']} />
-              <span>Inline SQL Editor Panel</span>
-            </div>
-          }
-        />
-      </Panel.Content>
+      <Form_Shadcn_ {...form}>
+        <Panel.Content className="border-b">
+          <FormField_Shadcn_
+            control={form.control}
+            name="commandMenuEnabled"
+            render={({ field }) => (
+              <FormItemLayout
+                layout="flex-row-reverse"
+                label={
+                  <div className="flex items-center gap-x-3">
+                    <KeyboardShortcut keys={['Meta', 'k']} />
+                    <span>Command menu</span>
+                  </div>
+                }
+              >
+                <FormControl_Shadcn_>
+                  <Switch
+                    checked={field.value}
+                    onCheckedChange={(value) => {
+                      field.onChange(value)
+                      setCommandMenuEnabled(value)
+                    }}
+                  />
+                </FormControl_Shadcn_>
+              </FormItemLayout>
+            )}
+          />
+        </Panel.Content>
+        <Panel.Content className="border-b">
+          <FormField_Shadcn_
+            control={form.control}
+            name="aiAssistantEnabled"
+            render={({ field }) => (
+              <FormItemLayout
+                layout="flex-row-reverse"
+                label={
+                  <div className="flex items-center gap-x-3">
+                    <KeyboardShortcut keys={['Meta', 'i']} />
+                    <span>AI Assistant Panel</span>
+                  </div>
+                }
+              >
+                <FormControl_Shadcn_>
+                  <Switch
+                    checked={field.value}
+                    onCheckedChange={(value) => {
+                      field.onChange(value)
+                      setAiAssistantEnabled(value)
+                    }}
+                  />
+                </FormControl_Shadcn_>
+              </FormItemLayout>
+            )}
+          />
+        </Panel.Content>
+        <Panel.Content>
+          <FormField_Shadcn_
+            control={form.control}
+            name="inlineEditorEnabled"
+            render={({ field }) => (
+              <FormItemLayout
+                layout="flex-row-reverse"
+                label={
+                  <div className="flex items-center gap-x-3">
+                    <KeyboardShortcut keys={['Meta', 'e']} />
+                    <span>Inline SQL Editor Panel</span>
+                  </div>
+                }
+              >
+                <FormControl_Shadcn_>
+                  <Switch
+                    checked={field.value}
+                    onCheckedChange={(value) => {
+                      field.onChange(value)
+                      setInlineEditorEnabled(value)
+                    }}
+                  />
+                </FormControl_Shadcn_>
+              </FormItemLayout>
+            )}
+          />
+        </Panel.Content>
+      </Form_Shadcn_>
     </Panel>
   )
 }
diff --git a/apps/studio/components/interfaces/Account/Preferences/InlineEditorSettings.tsx b/apps/studio/components/interfaces/Account/Preferences/InlineEditorSettings.tsx
new file mode 100644
index 0000000000000..c28bcaa39e6c7
--- /dev/null
+++ b/apps/studio/components/interfaces/Account/Preferences/InlineEditorSettings.tsx
@@ -0,0 +1,86 @@
+import { zodResolver } from '@hookform/resolvers/zod'
+import { useForm } from 'react-hook-form'
+import * as z from 'zod'
+
+import { LOCAL_STORAGE_KEYS } from 'common'
+import Panel from 'components/ui/Panel'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
+import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
+import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
+import { FormControl_Shadcn_, FormField_Shadcn_, Form_Shadcn_, Switch } from 'ui'
+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+
+const InlineEditorSchema = z.object({
+  inlineEditorEnabled: z.boolean(),
+})
+
+export const useIsInlineEditorEnabled = () => {
+  const [inlineEditorEnabled] = useLocalStorageQuery(
+    LOCAL_STORAGE_KEYS.UI_PREVIEW_INLINE_EDITOR,
+    false
+  )
+
+  return inlineEditorEnabled ?? false
+}
+
+export const InlineEditorSettings = () => {
+  const [inlineEditorEnabled, setInlineEditorEnabled] = useLocalStorageQuery(
+    LOCAL_STORAGE_KEYS.UI_PREVIEW_INLINE_EDITOR,
+    false
+  )
+  const { data: org } = useSelectedOrganizationQuery()
+
+  const { mutate: sendEvent } = useSendEventMutation()
+
+  const form = useForm<z.infer<typeof InlineEditorSchema>>({
+    resolver: zodResolver(InlineEditorSchema),
+    values: {
+      inlineEditorEnabled: inlineEditorEnabled ?? false,
+    },
+  })
+
+  const handleToggle = (value: boolean) => {
+    setInlineEditorEnabled(value)
+    form.setValue('inlineEditorEnabled', value)
+
+    sendEvent({
+      action: 'inline_editor_setting_clicked',
+      properties: {
+        enabled: value,
+      },
+      groups: {
+        organization: org?.slug,
+      },
+    })
+  }
+
+  return (
+    <Panel title={<h5 id="inline-editor">Dashboard</h5>}>
+      <Panel.Content>
+        <Form_Shadcn_ {...form}>
+          <FormField_Shadcn_
+            control={form.control}
+            name="inlineEditorEnabled"
+            render={({ field }) => (
+              <FormItemLayout
+                layout="flex-row-reverse"
+                label="Edit entities in SQL"
+                description="When enabled, view and edit policies, triggers, and functions directly in the SQL editor instead of a more beginner-friendly UI panel. Ideal for those comfortable with SQL."
+              >
+                <FormControl_Shadcn_>
+                  <Switch
+                    checked={field.value}
+                    onCheckedChange={(value) => {
+                      field.onChange(value)
+                      handleToggle(value)
+                    }}
+                  />
+                </FormControl_Shadcn_>
+              </FormItemLayout>
+            )}
+          />
+        </Form_Shadcn_>
+      </Panel.Content>
+    </Panel>
+  )
+}
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreview.constants.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreview.constants.tsx
index ce8d859e7852c..89c110dd04d69 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreview.constants.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreview.constants.tsx
@@ -29,13 +29,6 @@ export const FEATURE_PREVIEWS = [
     isNew: true,
     isPlatformOnly: true,
   },
-  {
-    key: LOCAL_STORAGE_KEYS.UI_PREVIEW_INLINE_EDITOR,
-    name: 'Directly edit database entities',
-    discussionsUrl: 'https://github.com/orgs/supabase/discussions/33690',
-    isNew: false,
-    isPlatformOnly: false,
-  },
   {
     key: LOCAL_STORAGE_KEYS.UI_PREVIEW_API_SIDE_PANEL,
     name: 'Project API documentation',
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
index 248d731e5a705..79351481b7ff4 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
@@ -84,11 +84,6 @@ export const useIsColumnLevelPrivilegesEnabled = () => {
   return flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_CLS]
 }
 
-export const useIsInlineEditorEnabled = () => {
-  const { flags } = useFeaturePreviewContext()
-  return flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_INLINE_EDITOR]
-}
-
 export const useUnifiedLogsPreview = () => {
   const { flags, onUpdateFlag } = useFeaturePreviewContext()
 
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
index 524e7cd28e5af..18b5755d2b26e 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
@@ -13,7 +13,6 @@ import { Branching2Preview } from './Branching2Preview'
 import { CLSPreview } from './CLSPreview'
 import { FEATURE_PREVIEWS } from './FeaturePreview.constants'
 import { useFeaturePreviewContext, useFeaturePreviewModal } from './FeaturePreviewContext'
-import { InlineEditorPreview } from './InlineEditorPreview'
 import { SecurityNotificationsPreview } from './SecurityNotificationsPreview'
 import { UnifiedLogsPreview } from './UnifiedLogsPreview'
 
@@ -22,7 +21,6 @@ const FEATURE_PREVIEW_KEY_TO_CONTENT: {
 } = {
   [LOCAL_STORAGE_KEYS.UI_PREVIEW_BRANCHING_2_0]: <Branching2Preview />,
   [LOCAL_STORAGE_KEYS.UI_PREVIEW_ADVISOR_RULES]: <AdvisorRulesPreview />,
-  [LOCAL_STORAGE_KEYS.UI_PREVIEW_INLINE_EDITOR]: <InlineEditorPreview />,
   [LOCAL_STORAGE_KEYS.UI_PREVIEW_API_SIDE_PANEL]: <APISidePanelPreview />,
   [LOCAL_STORAGE_KEYS.UI_PREVIEW_CLS]: <CLSPreview />,
   [LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS]: <UnifiedLogsPreview />,
diff --git a/apps/studio/components/interfaces/Auth/AuditLogsForm.tsx b/apps/studio/components/interfaces/Auth/AuditLogsForm.tsx
index dab27c252cedc..7eace1cfe1d9a 100644
--- a/apps/studio/components/interfaces/Auth/AuditLogsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/AuditLogsForm.tsx
@@ -139,8 +139,9 @@ export const AuditLogsForm = () => {
                           <InlineLink
                             href={`/project/${projectRef}/logs/explorer?q=select%0A++cast(timestamp+as+datetime)+as+timestamp%2C%0A++event_message%2C+metadata+%0Afrom+auth_audit_logs+%0Alimit+10%0A`}
                           >
-                            Auth logs.
+                            Auth logs
                           </InlineLink>
+                          .
                         </p>
                       }
                     >
diff --git a/apps/studio/components/interfaces/Database/Replication/ComingSoon.tsx b/apps/studio/components/interfaces/Database/ETL/ComingSoon.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/ComingSoon.tsx
rename to apps/studio/components/interfaces/Database/ETL/ComingSoon.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/DeleteDestination.tsx b/apps/studio/components/interfaces/Database/ETL/DeleteDestination.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/DeleteDestination.tsx
rename to apps/studio/components/interfaces/Database/ETL/DeleteDestination.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/AdvancedSettings.tsx b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/AdvancedSettings.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/DestinationPanel/AdvancedSettings.tsx
rename to apps/studio/components/interfaces/Database/ETL/DestinationPanel/AdvancedSettings.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationNameInput.tsx b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationNameInput.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationNameInput.tsx
rename to apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationNameInput.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationPanel.constants.ts b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationPanel.constants.ts
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationPanel.constants.ts
rename to apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationPanel.constants.ts
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationPanel.schema.ts b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationPanel.schema.ts
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationPanel.schema.ts
rename to apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationPanel.schema.ts
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationPanel.tsx b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationPanel.tsx
similarity index 97%
rename from apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationPanel.tsx
rename to apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationPanel.tsx
index 1699b811e592d..344861e48084b 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationPanel.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationPanel.tsx
@@ -10,12 +10,12 @@ import { getCatalogURI } from 'components/interfaces/Storage/StorageSettings/Sto
 import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'
 import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'
 import { useCheckPrimaryKeysExists } from 'data/database/primary-keys-exists-query'
-import { useCreateDestinationPipelineMutation } from 'data/replication/create-destination-pipeline-mutation'
-import { useReplicationDestinationByIdQuery } from 'data/replication/destination-by-id-query'
-import { useReplicationPipelineByIdQuery } from 'data/replication/pipeline-by-id-query'
-import { useReplicationPublicationsQuery } from 'data/replication/publications-query'
-import { useStartPipelineMutation } from 'data/replication/start-pipeline-mutation'
-import { useUpdateDestinationPipelineMutation } from 'data/replication/update-destination-pipeline-mutation'
+import { useCreateDestinationPipelineMutation } from 'data/etl/create-destination-pipeline-mutation'
+import { useReplicationDestinationByIdQuery } from 'data/etl/destination-by-id-query'
+import { useReplicationPipelineByIdQuery } from 'data/etl/pipeline-by-id-query'
+import { useReplicationPublicationsQuery } from 'data/etl/publications-query'
+import { useStartPipelineMutation } from 'data/etl/start-pipeline-mutation'
+import { useUpdateDestinationPipelineMutation } from 'data/etl/update-destination-pipeline-mutation'
 import { useIcebergNamespaceCreateMutation } from 'data/storage/iceberg-namespace-create-mutation'
 import { useS3AccessKeyCreateMutation } from 'data/storage/s3-access-key-create-mutation'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationPanelFields.tsx b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationPanelFields.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationPanelFields.tsx
rename to apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationPanelFields.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.tsx b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationTypeSelection.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.tsx
rename to apps/studio/components/interfaces/Database/ETL/DestinationPanel/DestinationTypeSelection.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/NoDestinationsAvailable.tsx b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/NoDestinationsAvailable.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/DestinationPanel/NoDestinationsAvailable.tsx
rename to apps/studio/components/interfaces/Database/ETL/DestinationPanel/NoDestinationsAvailable.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/PublicationSelection.tsx b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/PublicationSelection.tsx
similarity index 98%
rename from apps/studio/components/interfaces/Database/Replication/DestinationPanel/PublicationSelection.tsx
rename to apps/studio/components/interfaces/Database/ETL/DestinationPanel/PublicationSelection.tsx
index ad2a00a53b161..7c23c1ded6427 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/PublicationSelection.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/DestinationPanel/PublicationSelection.tsx
@@ -4,7 +4,7 @@ import type { UseFormReturn } from 'react-hook-form'
 import { useParams } from 'common'
 import { InlineLink } from 'components/ui/InlineLink'
 import { useCheckPrimaryKeysExists } from 'data/database/primary-keys-exists-query'
-import { useReplicationPublicationsQuery } from 'data/replication/publications-query'
+import { useReplicationPublicationsQuery } from 'data/etl/publications-query'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { FormControl_Shadcn_, FormField_Shadcn_ } from 'ui'
 import { Admonition } from 'ui-patterns'
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx b/apps/studio/components/interfaces/Database/ETL/DestinationRow.tsx
similarity index 93%
rename from apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx
rename to apps/studio/components/interfaces/Database/ETL/DestinationRow.tsx
index 0fbb5df2f9178..dda49fe9ef9f5 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/DestinationRow.tsx
@@ -6,12 +6,12 @@ import { toast } from 'sonner'
 import { useParams } from 'common'
 import Table from 'components/to-be-cleaned/Table'
 import AlertError from 'components/ui/AlertError'
-import { useDeleteDestinationPipelineMutation } from 'data/replication/delete-destination-pipeline-mutation'
-import { useReplicationPipelineReplicationStatusQuery } from 'data/replication/pipeline-replication-status-query'
-import { useReplicationPipelineStatusQuery } from 'data/replication/pipeline-status-query'
-import { useReplicationPipelineVersionQuery } from 'data/replication/pipeline-version-query'
-import { Pipeline } from 'data/replication/pipelines-query'
-import { useStopPipelineMutation } from 'data/replication/stop-pipeline-mutation'
+import { useDeleteDestinationPipelineMutation } from 'data/etl/delete-destination-pipeline-mutation'
+import { useReplicationPipelineReplicationStatusQuery } from 'data/etl/pipeline-replication-status-query'
+import { useReplicationPipelineStatusQuery } from 'data/etl/pipeline-status-query'
+import { useReplicationPipelineVersionQuery } from 'data/etl/pipeline-version-query'
+import { Pipeline } from 'data/etl/pipelines-query'
+import { useStopPipelineMutation } from 'data/etl/stop-pipeline-mutation'
 import {
   PipelineStatusRequestStatus,
   usePipelineRequestStatus,
@@ -176,7 +176,7 @@ export const DestinationRow = ({
           <Table.td>
             <div className="flex items-center justify-end gap-x-2">
               <Button asChild type="default" className="relative">
-                <Link href={`/project/${projectRef}/database/replication/${pipeline?.id}`}>
+                <Link href={`/project/${projectRef}/database/etl/${pipeline?.id}`}>
                   <span className="inline-flex items-center gap-2">
                     <span>View status</span>
                     {hasTableErrors && (
diff --git a/apps/studio/components/interfaces/Database/Replication/Destinations.tsx b/apps/studio/components/interfaces/Database/ETL/Destinations.tsx
similarity index 95%
rename from apps/studio/components/interfaces/Database/Replication/Destinations.tsx
rename to apps/studio/components/interfaces/Database/ETL/Destinations.tsx
index 5cf36ba143027..7432e6cd173fc 100644
--- a/apps/studio/components/interfaces/Database/Replication/Destinations.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/Destinations.tsx
@@ -6,11 +6,11 @@ import { useParams } from 'common'
 import Table from 'components/to-be-cleaned/Table'
 import { AlertError } from 'components/ui/AlertError'
 import { DocsButton } from 'components/ui/DocsButton'
-import { useReplicationDestinationsQuery } from 'data/replication/destinations-query'
-import { replicationKeys } from 'data/replication/keys'
-import { fetchReplicationPipelineVersion } from 'data/replication/pipeline-version-query'
-import { useReplicationPipelinesQuery } from 'data/replication/pipelines-query'
-import { useReplicationSourcesQuery } from 'data/replication/sources-query'
+import { useReplicationDestinationsQuery } from 'data/etl/destinations-query'
+import { replicationKeys } from 'data/etl/keys'
+import { fetchReplicationPipelineVersion } from 'data/etl/pipeline-version-query'
+import { useReplicationPipelinesQuery } from 'data/etl/pipelines-query'
+import { useReplicationSourcesQuery } from 'data/etl/sources-query'
 import { DOCS_URL } from 'lib/constants'
 import { Button, cn, Input_Shadcn_ } from 'ui'
 import { GenericSkeletonLoader } from 'ui-patterns'
diff --git a/apps/studio/components/interfaces/Database/Replication/EnableReplicationModal.tsx b/apps/studio/components/interfaces/Database/ETL/EnableReplicationModal.tsx
similarity index 96%
rename from apps/studio/components/interfaces/Database/Replication/EnableReplicationModal.tsx
rename to apps/studio/components/interfaces/Database/ETL/EnableReplicationModal.tsx
index c84b826ab4ba6..3dbb98700a61f 100644
--- a/apps/studio/components/interfaces/Database/Replication/EnableReplicationModal.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/EnableReplicationModal.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react'
 import { toast } from 'sonner'
 
 import { useParams } from 'common'
-import { useCreateTenantSourceMutation } from 'data/replication/create-tenant-source-mutation'
+import { useCreateTenantSourceMutation } from 'data/etl/create-tenant-source-mutation'
 import {
   Button,
   Dialog,
diff --git a/apps/studio/components/interfaces/Database/Replication/ErroredTableDetails.tsx b/apps/studio/components/interfaces/Database/ETL/ErroredTableDetails.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/ErroredTableDetails.tsx
rename to apps/studio/components/interfaces/Database/ETL/ErroredTableDetails.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/NewPublicationPanel.tsx b/apps/studio/components/interfaces/Database/ETL/NewPublicationPanel.tsx
similarity index 97%
rename from apps/studio/components/interfaces/Database/Replication/NewPublicationPanel.tsx
rename to apps/studio/components/interfaces/Database/ETL/NewPublicationPanel.tsx
index c8347316355ad..a83ce63f42d00 100644
--- a/apps/studio/components/interfaces/Database/Replication/NewPublicationPanel.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/NewPublicationPanel.tsx
@@ -5,8 +5,8 @@ import { toast } from 'sonner'
 import { z } from 'zod'
 
 import { useParams } from 'common'
-import { useCreatePublicationMutation } from 'data/replication/create-publication-mutation'
-import { useReplicationTablesQuery } from 'data/replication/tables-query'
+import { useCreatePublicationMutation } from 'data/etl/create-publication-mutation'
+import { useReplicationTablesQuery } from 'data/etl/tables-query'
 import {
   Button,
   cn,
diff --git a/apps/studio/components/interfaces/Database/Replication/Pipeline.utils.ts b/apps/studio/components/interfaces/Database/ETL/Pipeline.utils.ts
similarity index 97%
rename from apps/studio/components/interfaces/Database/Replication/Pipeline.utils.ts
rename to apps/studio/components/interfaces/Database/ETL/Pipeline.utils.ts
index 1dcefc55ca656..551243632f172 100644
--- a/apps/studio/components/interfaces/Database/Replication/Pipeline.utils.ts
+++ b/apps/studio/components/interfaces/Database/ETL/Pipeline.utils.ts
@@ -1,4 +1,4 @@
-import { ReplicationPipelineStatusData } from 'data/replication/pipeline-status-query'
+import { ReplicationPipelineStatusData } from 'data/etl/pipeline-status-query'
 import { PipelineStatusRequestStatus } from 'state/replication-pipeline-request-status'
 import { PipelineStatusName } from './Replication.constants'
 
diff --git a/apps/studio/components/interfaces/Database/Replication/PipelineStatus.tsx b/apps/studio/components/interfaces/Database/ETL/PipelineStatus.tsx
similarity index 98%
rename from apps/studio/components/interfaces/Database/Replication/PipelineStatus.tsx
rename to apps/studio/components/interfaces/Database/ETL/PipelineStatus.tsx
index c84b130bdd756..420f4142e9d96 100644
--- a/apps/studio/components/interfaces/Database/Replication/PipelineStatus.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/PipelineStatus.tsx
@@ -2,7 +2,7 @@ import { AlertTriangle, Loader2 } from 'lucide-react'
 
 import { useParams } from 'common'
 import { InlineLink } from 'components/ui/InlineLink'
-import { ReplicationPipelineStatusData } from 'data/replication/pipeline-status-query'
+import { ReplicationPipelineStatusData } from 'data/etl/pipeline-status-query'
 import { PipelineStatusRequestStatus } from 'state/replication-pipeline-request-status'
 import type { ResponseError } from 'types'
 import { cn, Tooltip, TooltipContent, TooltipTrigger, WarningIcon } from 'ui'
diff --git a/apps/studio/components/interfaces/Database/Replication/PublicationsComboBox.tsx b/apps/studio/components/interfaces/Database/ETL/PublicationsComboBox.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/PublicationsComboBox.tsx
rename to apps/studio/components/interfaces/Database/ETL/PublicationsComboBox.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts b/apps/studio/components/interfaces/Database/ETL/Replication.constants.ts
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/Replication.constants.ts
rename to apps/studio/components/interfaces/Database/ETL/Replication.constants.ts
diff --git a/apps/studio/components/interfaces/Database/Replication/ReplicationDisclaimerDialog.tsx b/apps/studio/components/interfaces/Database/ETL/ReplicationDisclaimerDialog.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/ReplicationDisclaimerDialog.tsx
rename to apps/studio/components/interfaces/Database/ETL/ReplicationDisclaimerDialog.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus.tsx b/apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/ReplicationPipelineStatus.tsx
similarity index 97%
rename from apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus.tsx
rename to apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/ReplicationPipelineStatus.tsx
index 1095fd08a770e..ffaddc47aa893 100644
--- a/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/ReplicationPipelineStatus.tsx
@@ -20,12 +20,12 @@ import { useParams } from 'common'
 import Table from 'components/to-be-cleaned/Table'
 import AlertError from 'components/ui/AlertError'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
-import { useReplicationPipelineByIdQuery } from 'data/replication/pipeline-by-id-query'
-import { useReplicationPipelineReplicationStatusQuery } from 'data/replication/pipeline-replication-status-query'
-import { useReplicationPipelineStatusQuery } from 'data/replication/pipeline-status-query'
-import { useReplicationPipelineVersionQuery } from 'data/replication/pipeline-version-query'
-import { useStartPipelineMutation } from 'data/replication/start-pipeline-mutation'
-import { useStopPipelineMutation } from 'data/replication/stop-pipeline-mutation'
+import { useReplicationPipelineByIdQuery } from 'data/etl/pipeline-by-id-query'
+import { useReplicationPipelineReplicationStatusQuery } from 'data/etl/pipeline-replication-status-query'
+import { useReplicationPipelineStatusQuery } from 'data/etl/pipeline-status-query'
+import { useReplicationPipelineVersionQuery } from 'data/etl/pipeline-version-query'
+import { useStartPipelineMutation } from 'data/etl/start-pipeline-mutation'
+import { useStopPipelineMutation } from 'data/etl/stop-pipeline-mutation'
 import {
   PipelineStatusRequestStatus,
   usePipelineRequestStatus,
@@ -184,7 +184,7 @@ export const ReplicationPipelineStatus = () => {
         <div className="flex items-center justify-between">
           <div className="flex items-center gap-x-3">
             <Button asChild type="outline" icon={<ChevronLeft />} style={{ padding: '5px' }}>
-              <Link href={`/project/${projectRef}/database/replication`} />
+              <Link href={`/project/${projectRef}/database/etl`} />
             </Button>
             <div className="flex items-center gap-x-3">
               <h3 className="text-xl font-semibold">{destinationName || 'Pipeline'}</h3>
diff --git a/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus.types.ts b/apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/ReplicationPipelineStatus.types.ts
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus.types.ts
rename to apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/ReplicationPipelineStatus.types.ts
diff --git a/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus.utils.tsx b/apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/ReplicationPipelineStatus.utils.tsx
similarity index 98%
rename from apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus.utils.tsx
rename to apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/ReplicationPipelineStatus.utils.tsx
index 76552b4d1df98..6270223b61540 100644
--- a/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus.utils.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/ReplicationPipelineStatus.utils.tsx
@@ -1,7 +1,7 @@
 import dayjs from 'dayjs'
 import { Activity, Clock, HelpCircle, Loader2, XCircle } from 'lucide-react'
 
-import { ReplicationPipelineStatusData } from 'data/replication/pipeline-status-query'
+import { ReplicationPipelineStatusData } from 'data/etl/pipeline-status-query'
 import { formatBytes } from 'lib/helpers'
 import { PipelineStatusRequestStatus } from 'state/replication-pipeline-request-status'
 import { Badge } from 'ui'
diff --git a/apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/SlotLagMetrics.tsx b/apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/SlotLagMetrics.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/SlotLagMetrics.tsx
rename to apps/studio/components/interfaces/Database/ETL/ReplicationPipelineStatus/SlotLagMetrics.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/RetryCountdown.tsx b/apps/studio/components/interfaces/Database/ETL/RetryCountdown.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Database/Replication/RetryCountdown.tsx
rename to apps/studio/components/interfaces/Database/ETL/RetryCountdown.tsx
diff --git a/apps/studio/components/interfaces/Database/Replication/RetryOptionsDropdown.tsx b/apps/studio/components/interfaces/Database/ETL/RetryOptionsDropdown.tsx
similarity index 95%
rename from apps/studio/components/interfaces/Database/Replication/RetryOptionsDropdown.tsx
rename to apps/studio/components/interfaces/Database/ETL/RetryOptionsDropdown.tsx
index 147f8cc5befb3..aba8f87b58843 100644
--- a/apps/studio/components/interfaces/Database/Replication/RetryOptionsDropdown.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/RetryOptionsDropdown.tsx
@@ -3,8 +3,8 @@ import { useState } from 'react'
 import { toast } from 'sonner'
 
 import { useParams } from 'common'
-import { RollbackType, useRollbackTableMutation } from 'data/replication/rollback-table-mutation'
-import { useStartPipelineMutation } from 'data/replication/start-pipeline-mutation'
+import { RollbackType, useRollbackTableMutation } from 'data/etl/rollback-table-mutation'
+import { useStartPipelineMutation } from 'data/etl/start-pipeline-mutation'
 import {
   Button,
   DropdownMenu,
diff --git a/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx b/apps/studio/components/interfaces/Database/ETL/RowMenu.tsx
similarity index 95%
rename from apps/studio/components/interfaces/Database/Replication/RowMenu.tsx
rename to apps/studio/components/interfaces/Database/ETL/RowMenu.tsx
index d20934b379a1e..9a02bb49c425d 100644
--- a/apps/studio/components/interfaces/Database/Replication/RowMenu.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/RowMenu.tsx
@@ -3,10 +3,10 @@ import { toast } from 'sonner'
 
 import { useParams } from 'common'
 import AlertError from 'components/ui/AlertError'
-import { ReplicationPipelineStatusData } from 'data/replication/pipeline-status-query'
-import { Pipeline } from 'data/replication/pipelines-query'
-import { useStartPipelineMutation } from 'data/replication/start-pipeline-mutation'
-import { useStopPipelineMutation } from 'data/replication/stop-pipeline-mutation'
+import { ReplicationPipelineStatusData } from 'data/etl/pipeline-status-query'
+import { Pipeline } from 'data/etl/pipelines-query'
+import { useStartPipelineMutation } from 'data/etl/start-pipeline-mutation'
+import { useStopPipelineMutation } from 'data/etl/stop-pipeline-mutation'
 import {
   PipelineStatusRequestStatus,
   usePipelineRequestStatus,
diff --git a/apps/studio/components/interfaces/Database/Replication/UpdateVersionModal.tsx b/apps/studio/components/interfaces/Database/ETL/UpdateVersionModal.tsx
similarity index 90%
rename from apps/studio/components/interfaces/Database/Replication/UpdateVersionModal.tsx
rename to apps/studio/components/interfaces/Database/ETL/UpdateVersionModal.tsx
index bcf0a86e7896e..585241a7adbf7 100644
--- a/apps/studio/components/interfaces/Database/Replication/UpdateVersionModal.tsx
+++ b/apps/studio/components/interfaces/Database/ETL/UpdateVersionModal.tsx
@@ -1,11 +1,11 @@
 import { toast } from 'sonner'
 
 import { useParams } from 'common'
-import { useReplicationPipelineStatusQuery } from 'data/replication/pipeline-status-query'
-import { useReplicationPipelineVersionQuery } from 'data/replication/pipeline-version-query'
-import { Pipeline } from 'data/replication/pipelines-query'
-import { useStartPipelineMutation } from 'data/replication/start-pipeline-mutation'
-import { useUpdatePipelineVersionMutation } from 'data/replication/update-pipeline-version-mutation'
+import { useReplicationPipelineStatusQuery } from 'data/etl/pipeline-status-query'
+import { useReplicationPipelineVersionQuery } from 'data/etl/pipeline-version-query'
+import { Pipeline } from 'data/etl/pipelines-query'
+import { useStartPipelineMutation } from 'data/etl/start-pipeline-mutation'
+import { useUpdatePipelineVersionMutation } from 'data/etl/update-pipeline-version-mutation'
 import {
   PipelineStatusRequestStatus,
   usePipelineRequestStatus,
diff --git a/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx b/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx
index e95efa48267d4..9bbbe0fd53f02 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx
@@ -172,7 +172,7 @@ const supabaseIntegrations: IntegrationDefinition[] = [
     requiredExtensions: ['supabase_vault'],
     missingExtensionsAlert: <UpgradeDatabaseAlert />,
     name: `Vault`,
-    status: 'alpha',
+    status: 'beta',
     icon: ({ className, ...props } = {}) => (
       <Vault className={cn('inset-0 p-2 text-black w-full h-full', className)} {...props} />
     ),
diff --git a/apps/studio/components/interfaces/SignIn/ResetPasswordForm.tsx b/apps/studio/components/interfaces/SignIn/ResetPasswordForm.tsx
index 48e513fe0e82a..2d2955982c7eb 100644
--- a/apps/studio/components/interfaces/SignIn/ResetPasswordForm.tsx
+++ b/apps/studio/components/interfaces/SignIn/ResetPasswordForm.tsx
@@ -1,5 +1,4 @@
 import { zodResolver } from '@hookform/resolvers/zod'
-import * as Sentry from '@sentry/nextjs'
 import { Eye, EyeOff } from 'lucide-react'
 import { useRouter } from 'next/router'
 import { useState } from 'react'
@@ -7,6 +6,7 @@ import { useForm } from 'react-hook-form'
 import { toast } from 'sonner'
 import { z } from 'zod'
 
+import { captureCriticalError } from 'lib/error-reporting'
 import { auth, getReturnToPath } from 'lib/gotrue'
 import {
   Button,
@@ -20,11 +20,6 @@ import {
 
 import PasswordConditionsHelper from './PasswordConditionsHelper'
 
-const WHITELIST_ERRORS = [
-  'New password should be different from the old password',
-  'Password is known to be weak and easy to guess, please choose a different one',
-]
-
 // Convert the existing yup passwordSchema to Zod
 const passwordSchema = z.object({
   password: z
@@ -70,9 +65,7 @@ const ResetPasswordForm = () => {
       await router.push(getReturnToPath('/organizations'))
     } else {
       toast.error(`Failed to save password: ${error.message}`, { id: toastId })
-      if (!WHITELIST_ERRORS.some((e) => error.message.includes(e))) {
-        Sentry.captureMessage('[CRITICAL] Failed to reset password: ' + error.message)
-      }
+      captureCriticalError(error, 'reset password')
     }
   }
 
diff --git a/apps/studio/components/interfaces/SignIn/SignInForm.tsx b/apps/studio/components/interfaces/SignIn/SignInForm.tsx
index 80ebf5f4923e2..e753bd354033c 100644
--- a/apps/studio/components/interfaces/SignIn/SignInForm.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignInForm.tsx
@@ -1,6 +1,5 @@
 import HCaptcha from '@hcaptcha/react-hcaptcha'
 import { zodResolver } from '@hookform/resolvers/zod'
-import * as Sentry from '@sentry/nextjs'
 import type { AuthError } from '@supabase/supabase-js'
 import { useQueryClient } from '@tanstack/react-query'
 import Link from 'next/link'
@@ -14,6 +13,7 @@ import { useAddLoginEvent } from 'data/misc/audit-login-mutation'
 import { getMfaAuthenticatorAssuranceLevel } from 'data/profile/mfa-authenticator-assurance-level-query'
 import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useLastSignIn } from 'hooks/misc/useLastSignIn'
+import { captureCriticalError } from 'lib/error-reporting'
 import { auth, buildPathWithParams, getReturnToPath } from 'lib/gotrue'
 import { Button, Form_Shadcn_, FormControl_Shadcn_, FormField_Shadcn_, Input_Shadcn_ } from 'ui'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
@@ -101,7 +101,7 @@ export const SignInForm = () => {
         router.push(redirectPath)
       } catch (error: any) {
         toast.error(`Failed to sign in: ${(error as AuthError).message}`, { id: toastId })
-        Sentry.captureMessage('[CRITICAL] Failed to sign in via EP: ' + error.message)
+        captureCriticalError(error, 'sign in via EP')
       }
     } else {
       setCaptchaToken(null)
diff --git a/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx b/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx
index e013886331799..854fcae40f58a 100644
--- a/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx
@@ -1,6 +1,5 @@
 import HCaptcha from '@hcaptcha/react-hcaptcha'
 import { zodResolver } from '@hookform/resolvers/zod'
-import * as Sentry from '@sentry/nextjs'
 import { useQueryClient } from '@tanstack/react-query'
 import { useRef, useState } from 'react'
 import { type SubmitHandler, useForm } from 'react-hook-form'
@@ -9,12 +8,11 @@ import z from 'zod'
 
 import { useLastSignIn } from 'hooks/misc/useLastSignIn'
 import { BASE_PATH } from 'lib/constants'
+import { captureCriticalError } from 'lib/error-reporting'
 import { auth, buildPathWithParams } from 'lib/gotrue'
 import { Button, Form_Shadcn_, FormControl_Shadcn_, FormField_Shadcn_, Input_Shadcn_ } from 'ui'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
 
-const WHITELIST_ERRORS = ['No SSO provider assigned for this domain']
-
 const schema = z.object({
   email: z.string().min(1, 'Email is required').email('Must be a valid email'),
 })
@@ -69,10 +67,7 @@ export const SignInSSOForm = () => {
       setCaptchaToken(null)
       captchaRef.current?.resetCaptcha()
       toast.error(`Failed to sign in: ${error.message}`, { id: toastId })
-
-      if (!WHITELIST_ERRORS.includes(error.message)) {
-        Sentry.captureMessage('[CRITICAL] Failed to sign in via SSO: ' + error.message)
-      }
+      captureCriticalError(error, 'sign in via SSO')
     }
   }
 
diff --git a/apps/studio/components/interfaces/SignIn/SignInWithCustom.tsx b/apps/studio/components/interfaces/SignIn/SignInWithCustom.tsx
index 03730971fce64..f5959dd23ceed 100644
--- a/apps/studio/components/interfaces/SignIn/SignInWithCustom.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignInWithCustom.tsx
@@ -1,8 +1,8 @@
-import * as Sentry from '@sentry/nextjs'
 import { useState } from 'react'
 import { toast } from 'sonner'
 
 import { BASE_PATH } from 'lib/constants'
+import { captureCriticalError } from 'lib/error-reporting'
 import { auth, buildPathWithParams } from 'lib/gotrue'
 import { Button } from 'ui'
 
@@ -35,7 +35,7 @@ export const SignInWithCustom = ({ providerName }: SignInWithCustomProps) => {
       if (error) throw error
     } catch (error: any) {
       toast.error(`Failed to sign in via ${providerName}: ${error.message}`)
-      Sentry.captureMessage('[CRITICAL] Failed to sign in via GH: ' + error.message)
+      captureCriticalError(error, `sign in via ${providerName}`)
       setLoading(false)
     }
   }
diff --git a/apps/studio/components/interfaces/SignIn/SignInWithGitHub.tsx b/apps/studio/components/interfaces/SignIn/SignInWithGitHub.tsx
index 715b945721a5d..3431b56c89ef2 100644
--- a/apps/studio/components/interfaces/SignIn/SignInWithGitHub.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignInWithGitHub.tsx
@@ -1,4 +1,3 @@
-import * as Sentry from '@sentry/nextjs'
 import { Github } from 'lucide-react'
 import { useState } from 'react'
 import { toast } from 'sonner'
@@ -6,6 +5,7 @@ import { toast } from 'sonner'
 import { BASE_PATH } from 'lib/constants'
 
 import { useLastSignIn } from 'hooks/misc/useLastSignIn'
+import { captureCriticalError } from 'lib/error-reporting'
 import { auth, buildPathWithParams } from 'lib/gotrue'
 import { Button } from 'ui'
 import { LastSignInWrapper } from './LastSignInWrapper'
@@ -36,7 +36,7 @@ export const SignInWithGitHub = () => {
       else setLastSignInUsed('github')
     } catch (error: any) {
       toast.error(`Failed to sign in via GitHub: ${error.message}`)
-      Sentry.captureMessage('[CRITICAL] Failed to sign in via GH: ' + error.message)
+      captureCriticalError(error, 'sign in via GitHub')
       setLoading(false)
     }
   }
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/ConnectTablesDialog.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/ConnectTablesDialog.tsx
index 536f577160a44..95ef50311d939 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/ConnectTablesDialog.tsx
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/ConnectTablesDialog.tsx
@@ -12,10 +12,10 @@ import { getCatalogURI } from 'components/interfaces/Storage/StorageSettings/Sto
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'
 import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'
-import { useCreateDestinationPipelineMutation } from 'data/replication/create-destination-pipeline-mutation'
-import { useCreatePublicationMutation } from 'data/replication/create-publication-mutation'
-import { useReplicationSourcesQuery } from 'data/replication/sources-query'
-import { useStartPipelineMutation } from 'data/replication/start-pipeline-mutation'
+import { useCreateDestinationPipelineMutation } from 'data/etl/create-destination-pipeline-mutation'
+import { useCreatePublicationMutation } from 'data/etl/create-publication-mutation'
+import { useReplicationSourcesQuery } from 'data/etl/sources-query'
+import { useStartPipelineMutation } from 'data/etl/start-pipeline-mutation'
 import { useIcebergNamespaceCreateMutation } from 'data/storage/iceberg-namespace-create-mutation'
 import { useTablesQuery } from 'data/tables/tables-query'
 import { getDecryptedValues } from 'data/vault/vault-secret-decrypted-value-query'
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/NamespaceWithTables.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/NamespaceWithTables.tsx
index 7c85ce811bf5a..0d7e433b598bd 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/NamespaceWithTables.tsx
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/NamespaceWithTables.tsx
@@ -125,7 +125,7 @@ const TableRowComponent = ({
                   <p>Query in SQL Editor</p>
                 </DropdownMenuItem>
                 <DropdownMenuItem asChild className="flex items-center gap-x-2">
-                  <Link href={`/project/${project?.ref}/database/replication/${tableName}`}>
+                  <Link href={`/project/${project?.ref}/database/etl/${tableName}`}>
                     <Replace size={12} className="text-foreground-lighter" />
                     <p>View replication status</p>
                   </Link>
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities.tsx
index 539aa0a836f14..c869502e2b095 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities.tsx
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities.tsx
@@ -6,8 +6,8 @@ import { FDW } from 'data/fdw/fdws-query'
 import {
   ReplicationPublication,
   useReplicationPublicationsQuery,
-} from 'data/replication/publications-query'
-import { useReplicationSourcesQuery } from 'data/replication/sources-query'
+} from 'data/etl/publications-query'
+import { useReplicationSourcesQuery } from 'data/etl/sources-query'
 import { useS3AccessKeyDeleteMutation } from 'data/storage/s3-access-key-delete-mutation'
 import { S3AccessKey, useStorageCredentialsQuery } from 'data/storage/s3-access-key-query'
 import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
diff --git a/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.ts b/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.ts
index 95a2ea263a889..f220bda36d339 100644
--- a/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.ts
+++ b/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.ts
@@ -164,7 +164,6 @@ export const generateAuthMenu = (
                 key: 'audit-logs',
                 url: `/project/${ref}/auth/audit-logs`,
                 items: [],
-                label: 'BETA',
               },
               ...(authenticationAdvanced
                 ? [
diff --git a/apps/studio/components/layouts/DatabaseLayout/Database.Commands.tsx b/apps/studio/components/layouts/DatabaseLayout/Database.Commands.tsx
index 1ccb9a81ad2ef..4ce4ab5e08368 100644
--- a/apps/studio/components/layouts/DatabaseLayout/Database.Commands.tsx
+++ b/apps/studio/components/layouts/DatabaseLayout/Database.Commands.tsx
@@ -81,10 +81,10 @@ export function useDatabaseGotoCommands(options?: CommandOptions) {
       ...(databaseReplication
         ? [
             {
-              id: 'nav-database-replication',
-              name: 'Replication',
-              value: 'Database: Replication',
-              route: `/project/${ref}/database/replication`,
+              id: 'nav-database-etl',
+              name: 'ETL Replication',
+              value: 'Database: ETL Replication',
+              route: `/project/${ref}/database/etl`,
               defaultHidden: true,
             } as IRouteCommand,
           ]
diff --git a/apps/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.tsx b/apps/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.tsx
index e6e76113a188b..9d3640e2dbce8 100644
--- a/apps/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.tsx
+++ b/apps/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.tsx
@@ -78,10 +78,9 @@ export const generateDatabaseMenu = (
         ...(showPgReplicate
           ? [
               {
-                name: 'Replication',
-                key: 'replication',
-                url: `/project/${ref}/database/replication`,
-                label: !enablePgReplicate ? 'Coming soon' : undefined,
+                name: 'ETL Replication',
+                key: 'etl',
+                url: `/project/${ref}/database/etl`,
                 items: [],
               },
             ]
@@ -101,7 +100,6 @@ export const generateDatabaseMenu = (
                 key: 'column-privileges',
                 url: `/project/${ref}/database/column-privileges`,
                 items: [],
-                label: 'ALPHA',
               },
             ]
           : []),
diff --git a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
index 7c7a149b5da26..a615a9562c2d7 100644
--- a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
+++ b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
@@ -12,7 +12,7 @@ import SavedQueriesItem from 'components/interfaces/Settings/Logs/Logs.SavedQuer
 import { LogsSidebarItem } from 'components/interfaces/Settings/Logs/SidebarV2/SidebarItem'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import { useContentQuery } from 'data/content/content-query'
-import { useReplicationSourcesQuery } from 'data/replication/sources-query'
+import { useReplicationSourcesQuery } from 'data/etl/sources-query'
 import { useCurrentOrgPlan } from 'hooks/misc/useCurrentOrgPlan'
 import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
 import {
diff --git a/apps/studio/components/layouts/ProjectSettingsLayout/SettingsMenu.utils.tsx b/apps/studio/components/layouts/ProjectSettingsLayout/SettingsMenu.utils.tsx
index dc87caee7d66d..046adda409b1f 100644
--- a/apps/studio/components/layouts/ProjectSettingsLayout/SettingsMenu.utils.tsx
+++ b/apps/studio/components/layouts/ProjectSettingsLayout/SettingsMenu.utils.tsx
@@ -86,7 +86,6 @@ export const generateSettingsMenu = (
           key: 'api-keys',
           url: `/project/${ref}/settings/api-keys`,
           items: [],
-          label: 'NEW',
         },
         {
           name: 'JWT Keys',
@@ -95,7 +94,6 @@ export const generateSettingsMenu = (
             ? `/project/${ref}/settings/jwt`
             : `/project/${ref}/settings/jwt/signing-keys`,
           items: [],
-          label: 'NEW',
         },
 
         {
@@ -116,7 +114,7 @@ export const generateSettingsMenu = (
           url: isProjectBuilding ? buildingUrl : `/project/${ref}/integrations/vault/overview`,
           items: [],
           rightIcon: <ArrowUpRight strokeWidth={1} className="h-4 w-4" />,
-          label: 'ALPHA',
+          label: 'BETA',
         },
       ],
     },
diff --git a/apps/studio/components/ui/ProductMenu/ProductMenuItem.tsx b/apps/studio/components/ui/ProductMenu/ProductMenuItem.tsx
index e6d439aa03d41..debb227544661 100644
--- a/apps/studio/components/ui/ProductMenu/ProductMenuItem.tsx
+++ b/apps/studio/components/ui/ProductMenu/ProductMenuItem.tsx
@@ -34,11 +34,11 @@ const ProductMenuItem = ({
       <div className="flex w-full items-center justify-between gap-1">
         <div
           title={hoverText ? hoverText : typeof name === 'string' ? name : ''}
-          className={'flex items-center gap-2 truncate w-full ' + textClassName}
+          className={'flex space-between items-center gap-2 truncate w-full ' + textClassName}
         >
-          <span className="truncate">{name} </span>
+          <span className="truncate flex-1">{name}</span>
           {label !== undefined && (
-            <Badge variant="warning" className="py-0 px-1.5 capitalize">
+            <Badge variant="warning" className="py-0 px-1.5 uppercase">
               {label}
             </Badge>
           )}
diff --git a/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx b/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx
index 3637ef1edf7c6..5e514a60979a6 100644
--- a/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx
+++ b/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx
@@ -1,15 +1,16 @@
 import { Edit } from 'lucide-react'
+import Link from 'next/link'
 import { useRouter } from 'next/router'
+import { ComponentProps } from 'react'
 
 import { useParams } from 'common'
-import { useIsInlineEditorEnabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
+import { useIsInlineEditorEnabled } from 'components/interfaces/Account/Preferences/InlineEditorSettings'
 import { DiffType } from 'components/interfaces/SQLEditor/SQLEditor.types'
 import useNewQuery from 'components/interfaces/SQLEditor/hooks'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
-import Link from 'next/link'
-import { ComponentProps } from 'react'
-import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import { useSqlEditorV2StateSnapshot } from 'state/sql-editor-v2'
 import {
   cn,
@@ -20,8 +21,6 @@ import {
   TooltipContent,
 } from 'ui'
 import { ButtonTooltip } from '../ButtonTooltip'
-import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
-import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 interface EditQueryButtonProps {
   id?: string
diff --git a/apps/studio/data/replication/create-destination-pipeline-mutation.ts b/apps/studio/data/etl/create-destination-pipeline-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/create-destination-pipeline-mutation.ts
rename to apps/studio/data/etl/create-destination-pipeline-mutation.ts
diff --git a/apps/studio/data/replication/create-publication-mutation.ts b/apps/studio/data/etl/create-publication-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/create-publication-mutation.ts
rename to apps/studio/data/etl/create-publication-mutation.ts
diff --git a/apps/studio/data/replication/create-tenant-source-mutation.ts b/apps/studio/data/etl/create-tenant-source-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/create-tenant-source-mutation.ts
rename to apps/studio/data/etl/create-tenant-source-mutation.ts
diff --git a/apps/studio/data/replication/delete-destination-pipeline-mutation.ts b/apps/studio/data/etl/delete-destination-pipeline-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/delete-destination-pipeline-mutation.ts
rename to apps/studio/data/etl/delete-destination-pipeline-mutation.ts
diff --git a/apps/studio/data/replication/destination-by-id-query.ts b/apps/studio/data/etl/destination-by-id-query.ts
similarity index 100%
rename from apps/studio/data/replication/destination-by-id-query.ts
rename to apps/studio/data/etl/destination-by-id-query.ts
diff --git a/apps/studio/data/replication/destinations-query.ts b/apps/studio/data/etl/destinations-query.ts
similarity index 100%
rename from apps/studio/data/replication/destinations-query.ts
rename to apps/studio/data/etl/destinations-query.ts
diff --git a/apps/studio/data/replication/keys.ts b/apps/studio/data/etl/keys.ts
similarity index 100%
rename from apps/studio/data/replication/keys.ts
rename to apps/studio/data/etl/keys.ts
diff --git a/apps/studio/data/replication/pipeline-by-id-query.ts b/apps/studio/data/etl/pipeline-by-id-query.ts
similarity index 100%
rename from apps/studio/data/replication/pipeline-by-id-query.ts
rename to apps/studio/data/etl/pipeline-by-id-query.ts
diff --git a/apps/studio/data/replication/pipeline-replication-status-query.ts b/apps/studio/data/etl/pipeline-replication-status-query.ts
similarity index 100%
rename from apps/studio/data/replication/pipeline-replication-status-query.ts
rename to apps/studio/data/etl/pipeline-replication-status-query.ts
diff --git a/apps/studio/data/replication/pipeline-status-query.ts b/apps/studio/data/etl/pipeline-status-query.ts
similarity index 100%
rename from apps/studio/data/replication/pipeline-status-query.ts
rename to apps/studio/data/etl/pipeline-status-query.ts
diff --git a/apps/studio/data/replication/pipeline-version-query.ts b/apps/studio/data/etl/pipeline-version-query.ts
similarity index 100%
rename from apps/studio/data/replication/pipeline-version-query.ts
rename to apps/studio/data/etl/pipeline-version-query.ts
diff --git a/apps/studio/data/replication/pipelines-query.ts b/apps/studio/data/etl/pipelines-query.ts
similarity index 100%
rename from apps/studio/data/replication/pipelines-query.ts
rename to apps/studio/data/etl/pipelines-query.ts
diff --git a/apps/studio/data/replication/publication-delete-mutation.ts b/apps/studio/data/etl/publication-delete-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/publication-delete-mutation.ts
rename to apps/studio/data/etl/publication-delete-mutation.ts
diff --git a/apps/studio/data/replication/publications-query.ts b/apps/studio/data/etl/publications-query.ts
similarity index 100%
rename from apps/studio/data/replication/publications-query.ts
rename to apps/studio/data/etl/publications-query.ts
diff --git a/apps/studio/data/replication/rollback-table-mutation.ts b/apps/studio/data/etl/rollback-table-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/rollback-table-mutation.ts
rename to apps/studio/data/etl/rollback-table-mutation.ts
diff --git a/apps/studio/data/replication/sources-query.ts b/apps/studio/data/etl/sources-query.ts
similarity index 100%
rename from apps/studio/data/replication/sources-query.ts
rename to apps/studio/data/etl/sources-query.ts
diff --git a/apps/studio/data/replication/start-pipeline-mutation.ts b/apps/studio/data/etl/start-pipeline-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/start-pipeline-mutation.ts
rename to apps/studio/data/etl/start-pipeline-mutation.ts
diff --git a/apps/studio/data/replication/stop-pipeline-mutation.ts b/apps/studio/data/etl/stop-pipeline-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/stop-pipeline-mutation.ts
rename to apps/studio/data/etl/stop-pipeline-mutation.ts
diff --git a/apps/studio/data/replication/tables-query.ts b/apps/studio/data/etl/tables-query.ts
similarity index 100%
rename from apps/studio/data/replication/tables-query.ts
rename to apps/studio/data/etl/tables-query.ts
diff --git a/apps/studio/data/replication/update-destination-pipeline-mutation.ts b/apps/studio/data/etl/update-destination-pipeline-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/update-destination-pipeline-mutation.ts
rename to apps/studio/data/etl/update-destination-pipeline-mutation.ts
diff --git a/apps/studio/data/replication/update-pipeline-version-mutation.ts b/apps/studio/data/etl/update-pipeline-version-mutation.ts
similarity index 100%
rename from apps/studio/data/replication/update-pipeline-version-mutation.ts
rename to apps/studio/data/etl/update-pipeline-version-mutation.ts
diff --git a/apps/studio/data/misc/reset-password-mutation.ts b/apps/studio/data/misc/reset-password-mutation.ts
index 1b302852661b4..3fc03ce8fef8b 100644
--- a/apps/studio/data/misc/reset-password-mutation.ts
+++ b/apps/studio/data/misc/reset-password-mutation.ts
@@ -1,12 +1,10 @@
-import * as Sentry from '@sentry/nextjs'
 import { useMutation } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
 import { handleError, post } from 'data/fetchers'
+import { captureCriticalError } from 'lib/error-reporting'
 import type { ResponseError, UseCustomMutationOptions } from 'types'
 
-const WHITELIST_ERRORS = ['email must be an email']
-
 export type ResetPasswordVariables = {
   email: string
   hcaptchaToken: string | null
@@ -44,9 +42,7 @@ export const useResetPasswordMutation = ({
       } else {
         onError(data, variables, context)
       }
-      if (!WHITELIST_ERRORS.some((error) => data.message.includes(error))) {
-        Sentry.captureMessage('[CRITICAL] Failed to send reset password email: ' + data.message)
-      }
+      captureCriticalError(data, 'send reset password email')
     },
     ...options,
   })
diff --git a/apps/studio/data/misc/signup-mutation.ts b/apps/studio/data/misc/signup-mutation.ts
index 73530e341fa23..bb06a6a82d7b6 100644
--- a/apps/studio/data/misc/signup-mutation.ts
+++ b/apps/studio/data/misc/signup-mutation.ts
@@ -1,18 +1,10 @@
-import * as Sentry from '@sentry/nextjs'
 import { useMutation } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
 import { handleError, post } from 'data/fetchers'
+import { captureCriticalError } from 'lib/error-reporting'
 import type { ResponseError, UseCustomMutationOptions } from 'types'
 
-const WHITELIST_ERRORS = [
-  'A user with this email already exists',
-  'Password should contain at least one character of each',
-  'You attempted to send email to an inactive recipient',
-  'email must be an email',
-  'Password is known to be weak and easy to guess, please choose a different one',
-]
-
 export type SignUpVariables = {
   email: string
   password: string
@@ -51,9 +43,7 @@ export const useSignUpMutation = ({
       } else {
         onError(data, variables, context)
       }
-      if (!WHITELIST_ERRORS.some((error) => data.message.includes(error))) {
-        Sentry.captureMessage('[CRITICAL] Failed to sign up: ' + data.message)
-      }
+      captureCriticalError(data, 'sign up')
     },
     ...options,
   })
diff --git a/apps/studio/data/profile/mfa-challenge-and-verify-mutation.ts b/apps/studio/data/profile/mfa-challenge-and-verify-mutation.ts
index 6cb56b6a441ca..ad89d2332e93b 100644
--- a/apps/studio/data/profile/mfa-challenge-and-verify-mutation.ts
+++ b/apps/studio/data/profile/mfa-challenge-and-verify-mutation.ts
@@ -1,14 +1,12 @@
-import * as Sentry from '@sentry/nextjs'
 import type { AuthMFAVerifyResponse, MFAChallengeAndVerifyParams } from '@supabase/supabase-js'
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
+import { captureCriticalError } from 'lib/error-reporting'
 import { auth } from 'lib/gotrue'
 import { profileKeys } from './keys'
 import { UseCustomMutationOptions } from 'types'
 
-const WHITELIST_ERRORS = ['Invalid TOTP code entered']
-
 interface MFAChallengeAndVerifyVariables extends MFAChallengeAndVerifyParams {
   refreshFactors?: boolean
 }
@@ -60,9 +58,7 @@ export const useMfaChallengeAndVerifyMutation = ({
       } else {
         onError(data, variables, context)
       }
-      if (!WHITELIST_ERRORS.some((error) => data.message.includes(error))) {
-        Sentry.captureMessage('[CRITICAL] Failed to sign in via MFA: ' + data.message)
-      }
+      captureCriticalError(data, 'sign in via MFA')
     },
     ...options,
   })
diff --git a/apps/studio/data/projects/project-create-mutation.ts b/apps/studio/data/projects/project-create-mutation.ts
index 77fa75b68f066..aedbed0152531 100644
--- a/apps/studio/data/projects/project-create-mutation.ts
+++ b/apps/studio/data/projects/project-create-mutation.ts
@@ -1,24 +1,14 @@
-import * as Sentry from '@sentry/nextjs'
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
 import type { components } from 'data/api'
 import { handleError, post } from 'data/fetchers'
+import { captureCriticalError } from 'lib/error-reporting'
 import { PROVIDERS } from 'lib/constants'
 import type { ResponseError, UseCustomMutationOptions } from 'types'
 import { projectKeys } from './keys'
 import { DesiredInstanceSize, PostgresEngine, ReleaseChannel } from './new-project.constants'
 
-const WHITELIST_ERRORS = [
-  'The following organization members have reached their maximum limits for the number of active free projects',
-  'db_pass must be longer than or equal to 4 characters',
-  'There are overdue invoices in the organization(s)',
-  'name should not contain a . string',
-  'Project creation in the Supabase dashboard is disabled for this Vercel-managed organization.',
-  'Your account, which is handled by the Fly Supabase extension, cannot access this endpoint.',
-  'already exists in your organization.',
-]
-
 type CreateProjectBody = components['schemas']['CreateProjectBody']
 type CloudProvider = CreateProjectBody['cloud_provider']
 
@@ -112,9 +102,7 @@ export const useProjectCreateMutation = ({
       } else {
         onError(data, variables, context)
       }
-      if (!WHITELIST_ERRORS.some((error) => data.message.includes(error))) {
-        Sentry.captureMessage('[CRITICAL] Failed to create project: ' + data.message)
-      }
+      captureCriticalError(data, 'create project')
     },
     ...options,
   })
diff --git a/apps/studio/lib/auth.tsx b/apps/studio/lib/auth.tsx
index fc40622efa61a..7ac8442b23a0e 100644
--- a/apps/studio/lib/auth.tsx
+++ b/apps/studio/lib/auth.tsx
@@ -6,6 +6,7 @@ import {
   AuthProvider as AuthProviderInternal,
   clearLocalStorage,
   gotrueClient,
+  posthogClient,
   useAuthError,
 } from 'common'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
@@ -45,6 +46,7 @@ export function useSignOut() {
 
   return useCallback(async () => {
     const result = await gotrueClient.signOut()
+    posthogClient.reset()
     clearLocalStorage()
     // Clear Assistant IndexedDB
     await clearAssistantStorage()
diff --git a/apps/studio/lib/error-reporting.ts b/apps/studio/lib/error-reporting.ts
new file mode 100644
index 0000000000000..d6b0e6d904916
--- /dev/null
+++ b/apps/studio/lib/error-reporting.ts
@@ -0,0 +1,117 @@
+import * as Sentry from '@sentry/nextjs'
+
+import { ResponseError } from 'types'
+
+type CaptureMessageOptions = {
+  context: string
+  message: string
+}
+
+const WHITELIST_ERRORS = [
+  // Common validation errors
+  'email must be an email',
+  'Password is known to be weak and easy to guess, please choose a different one',
+  // Authentication errors
+  'A user with this email already exists',
+  'Password should contain at least one character of each',
+  'You attempted to send email to an inactive recipient',
+  'New password should be different from the old password',
+  'Invalid TOTP code entered',
+  'No SSO provider assigned for this domain',
+  // Project creation errors
+  'The following organization members have reached their maximum limits for the number of active free projects',
+  'db_pass must be longer than or equal to 4 characters',
+  'There are overdue invoices in the organization(s)',
+  'name should not contain a . string',
+  'Project creation in the Supabase dashboard is disabled for this Vercel-managed organization.',
+  'Your account, which is handled by the Fly Supabase extension, cannot access this endpoint.',
+  'already exists in your organization.',
+]
+
+/**
+ * Captures a critical error message to Sentry, filtering out whitelisted errors.
+ *
+ * @param error - The error object (ResponseError, Error, or any object with a message property)
+ * @param context - The context/action that failed (e.g., 'reset password', 'sign up', 'create project')
+ *
+ * @example
+ * captureCriticalError(error, 'reset password')
+ * // Captures: '[CRITICAL][reset password] Failed: <error.message>'
+ *
+ * @example
+ * captureCriticalError(error, 'sign up')
+ * // Captures: '[CRITICAL][sign up] Failed: <error.message>'
+ */
+export function captureCriticalError(
+  error: ResponseError | Error | { message: string },
+  context: string
+): void {
+  const errorMessage = error instanceof Error ? error.message : error.message
+  if (!errorMessage) {
+    return
+  }
+
+  if (error instanceof ResponseError) {
+    handleResponseError(error, context)
+    return
+  }
+  if (error instanceof Error) {
+    handleError(error, context)
+    return
+  }
+
+  handleUnknownError(error, context)
+}
+
+function handleResponseError(error: ResponseError, context: string) {
+  const { code, message, requestPathname } = error
+  if (!requestPathname || !code) {
+    captureMessage({
+      message: `Response Error (no code or requestPathname) w/ message: ${error.message}`,
+      context,
+    })
+    return
+  }
+
+  if (code >= 500) {
+    // Only capture 5XX errors as critical errors
+    captureMessage({
+      context,
+      message: `requestPathname ${requestPathname} w/ message: ${message}`,
+    })
+    return
+  }
+}
+
+function handleError(error: Error, context: string) {
+  const message = error.message
+  if (!message) {
+    return
+  }
+
+  captureMessage({
+    message,
+    context,
+  })
+}
+
+function handleUnknownError(error: unknown, context: string) {
+  if (
+    error &&
+    typeof error === 'object' &&
+    'message' in error &&
+    typeof error.message === 'string'
+  ) {
+    captureMessage({
+      message: error.message,
+      context,
+    })
+  }
+}
+
+function captureMessage({ message, context }: CaptureMessageOptions) {
+  if (WHITELIST_ERRORS.some((whitelisted) => message.includes(whitelisted))) {
+    return
+  }
+  Sentry.captureMessage(`[CRITICAL][${context}] Failed: ${message}`)
+}
diff --git a/apps/studio/pages/account/me.tsx b/apps/studio/pages/account/me.tsx
index d41b1b1b1e7eb..c805527453f00 100644
--- a/apps/studio/pages/account/me.tsx
+++ b/apps/studio/pages/account/me.tsx
@@ -3,6 +3,7 @@ import { AccountDeletion } from 'components/interfaces/Account/Preferences/Accou
 import { AccountIdentities } from 'components/interfaces/Account/Preferences/AccountIdentities'
 import { AnalyticsSettings } from 'components/interfaces/Account/Preferences/AnalyticsSettings'
 import { HotkeySettings } from 'components/interfaces/Account/Preferences/HotkeySettings'
+import { InlineEditorSettings } from 'components/interfaces/Account/Preferences/InlineEditorSettings'
 import { ProfileInformation } from 'components/interfaces/Account/Preferences/ProfileInformation'
 import { ThemeSettings } from 'components/interfaces/Account/Preferences/ThemeSettings'
 import AccountLayout from 'components/layouts/AccountLayout/AccountLayout'
@@ -88,6 +89,10 @@ const ProfileCard = () => {
             <HotkeySettings />
           </section>
 
+          <section>
+            <InlineEditorSettings />
+          </section>
+
           {profileShowAnalyticsAndMarketing && (
             <section>
               <AnalyticsSettings />
diff --git a/apps/studio/pages/project/[ref]/auth/policies.tsx b/apps/studio/pages/project/[ref]/auth/policies.tsx
index e5c05ebbb4412..d5a939e214374 100644
--- a/apps/studio/pages/project/[ref]/auth/policies.tsx
+++ b/apps/studio/pages/project/[ref]/auth/policies.tsx
@@ -1,9 +1,10 @@
 import type { PostgresPolicy, PostgresTable } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { Search } from 'lucide-react'
+import { parseAsString, useQueryState } from 'nuqs'
 import { useCallback, useDeferredValue, useMemo, useState } from 'react'
 
-import { useIsInlineEditorEnabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
+import { useIsInlineEditorEnabled } from 'components/interfaces/Account/Preferences/InlineEditorSettings'
 import { Policies } from 'components/interfaces/Auth/Policies/Policies'
 import { PoliciesDataProvider } from 'components/interfaces/Auth/Policies/PoliciesDataContext'
 import { getGeneralPolicyTemplates } from 'components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModal.constants'
@@ -26,7 +27,6 @@ import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { useIsProtectedSchema } from 'hooks/useProtectedSchemas'
 import { DOCS_URL } from 'lib/constants'
-import { parseAsString, useQueryState } from 'nuqs'
 import { useEditorPanelStateSnapshot } from 'state/editor-panel-state'
 import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import type { NextPageWithLayout } from 'types'
diff --git a/apps/studio/pages/project/[ref]/database/replication/[pipelineId].tsx b/apps/studio/pages/project/[ref]/database/etl/[pipelineId].tsx
similarity index 85%
rename from apps/studio/pages/project/[ref]/database/replication/[pipelineId].tsx
rename to apps/studio/pages/project/[ref]/database/etl/[pipelineId].tsx
index 03ffa0ba6f0b4..81846f1fe9ce0 100644
--- a/apps/studio/pages/project/[ref]/database/replication/[pipelineId].tsx
+++ b/apps/studio/pages/project/[ref]/database/etl/[pipelineId].tsx
@@ -2,7 +2,7 @@ import { useRouter } from 'next/router'
 import { useContext, useEffect } from 'react'
 
 import { FeatureFlagContext, useFlag, useParams } from 'common'
-import { ReplicationPipelineStatus } from 'components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus'
+import { ReplicationPipelineStatus } from 'components/interfaces/Database/ETL/ReplicationPipelineStatus/ReplicationPipelineStatus'
 import DatabaseLayout from 'components/layouts/DatabaseLayout/DatabaseLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import { ScaffoldContainer, ScaffoldSection } from 'components/layouts/Scaffold'
@@ -18,7 +18,7 @@ const DatabaseReplicationPage: NextPageWithLayout = () => {
 
   useEffect(() => {
     if (hasLoaded && !enablePgReplicate) {
-      router.replace(`/project/${ref}/database/replication}`)
+      router.replace(`/project/${ref}/database/etl}`)
     }
   }, [router, hasLoaded, ref, enablePgReplicate])
 
@@ -29,7 +29,7 @@ const DatabaseReplicationPage: NextPageWithLayout = () => {
           <ScaffoldContainer>
             <ScaffoldSection>
               <div className="col-span-12">
-                <FormHeader title="Replication" />
+                <FormHeader title="ETL Replication" />
                 <ReplicationPipelineStatus />
               </div>
             </ScaffoldSection>
@@ -42,7 +42,7 @@ const DatabaseReplicationPage: NextPageWithLayout = () => {
 
 DatabaseReplicationPage.getLayout = (page) => (
   <DefaultLayout>
-    <DatabaseLayout title="Database Replication">{page}</DatabaseLayout>
+    <DatabaseLayout title="Database ETL Replication">{page}</DatabaseLayout>
   </DefaultLayout>
 )
 
diff --git a/apps/studio/pages/project/[ref]/database/replication/index.tsx b/apps/studio/pages/project/[ref]/database/etl/index.tsx
similarity index 86%
rename from apps/studio/pages/project/[ref]/database/replication/index.tsx
rename to apps/studio/pages/project/[ref]/database/etl/index.tsx
index b47f8257ff428..33c232dd83bac 100644
--- a/apps/studio/pages/project/[ref]/database/replication/index.tsx
+++ b/apps/studio/pages/project/[ref]/database/etl/index.tsx
@@ -1,6 +1,6 @@
 import { useFlag, useParams } from 'common'
-import { ReplicationComingSoon } from 'components/interfaces/Database/Replication/ComingSoon'
-import { Destinations } from 'components/interfaces/Database/Replication/Destinations'
+import { ReplicationComingSoon } from 'components/interfaces/Database/ETL/ComingSoon'
+import { Destinations } from 'components/interfaces/Database/ETL/Destinations'
 import DatabaseLayout from 'components/layouts/DatabaseLayout/DatabaseLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import { ScaffoldContainer, ScaffoldSection } from 'components/layouts/Scaffold'
@@ -28,7 +28,7 @@ const DatabaseReplicationPage: NextPageWithLayout = () => {
               <div className="col-span-12">
                 <FormHeader
                   className="[&>div>p]:max-w-full"
-                  title="Replication"
+                  title="ETL Replication"
                   description="Automatically replicate your database changes to external data warehouses and analytics platforms in real-time"
                 />
                 <Destinations />
@@ -41,7 +41,7 @@ const DatabaseReplicationPage: NextPageWithLayout = () => {
           <ScaffoldContainer>
             <ScaffoldSection>
               <div className="col-span-12">
-                <FormHeader title="Replication" description="Send data to other destinations" />
+                <FormHeader title="ETL Replication" description="Send data to other destinations" />
               </div>
             </ScaffoldSection>
           </ScaffoldContainer>
@@ -54,7 +54,7 @@ const DatabaseReplicationPage: NextPageWithLayout = () => {
 
 DatabaseReplicationPage.getLayout = (page) => (
   <DefaultLayout>
-    <DatabaseLayout title="Database Replication">{page}</DatabaseLayout>
+    <DatabaseLayout title="Database ETL Replication">{page}</DatabaseLayout>
   </DefaultLayout>
 )
 
diff --git a/apps/studio/pages/project/[ref]/database/functions.tsx b/apps/studio/pages/project/[ref]/database/functions.tsx
index 02e68b6ee1489..d1446917a0ebb 100644
--- a/apps/studio/pages/project/[ref]/database/functions.tsx
+++ b/apps/studio/pages/project/[ref]/database/functions.tsx
@@ -1,7 +1,7 @@
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { useState } from 'react'
 
-import { useIsInlineEditorEnabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
+import { useIsInlineEditorEnabled } from 'components/interfaces/Account/Preferences/InlineEditorSettings'
 import { CreateFunction } from 'components/interfaces/Database/Functions/CreateFunction'
 import { DeleteFunction } from 'components/interfaces/Database/Functions/DeleteFunction'
 import FunctionsList from 'components/interfaces/Database/Functions/FunctionsList/FunctionsList'
@@ -19,10 +19,6 @@ import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import type { NextPageWithLayout } from 'types'
 
 const DatabaseFunctionsPage: NextPageWithLayout = () => {
-  const [selectedFunction, setSelectedFunction] = useState<DatabaseFunction | undefined>()
-  const [showCreateFunctionForm, setShowCreateFunctionForm] = useState(false)
-  const [showDeleteFunctionForm, setShowDeleteFunctionForm] = useState(false)
-  const [isDuplicating, setIsDuplicating] = useState(false)
   const isInlineEditorEnabled = useIsInlineEditorEnabled()
   const { openSidebar } = useSidebarManagerSnapshot()
   const {
@@ -36,6 +32,11 @@ const DatabaseFunctionsPage: NextPageWithLayout = () => {
     'functions'
   )
 
+  const [isDuplicating, setIsDuplicating] = useState(false)
+  const [selectedFunction, setSelectedFunction] = useState<DatabaseFunction | undefined>()
+  const [showCreateFunctionForm, setShowCreateFunctionForm] = useState(false)
+  const [showDeleteFunctionForm, setShowDeleteFunctionForm] = useState(false)
+
   const createFunction = () => {
     setIsDuplicating(false)
     if (isInlineEditorEnabled) {
diff --git a/apps/studio/pages/project/[ref]/database/triggers.tsx b/apps/studio/pages/project/[ref]/database/triggers.tsx
index 90e0ef8065902..3b1c35ed6583f 100644
--- a/apps/studio/pages/project/[ref]/database/triggers.tsx
+++ b/apps/studio/pages/project/[ref]/database/triggers.tsx
@@ -2,7 +2,7 @@ import { PostgresTrigger } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { useState } from 'react'
 
-import { useIsInlineEditorEnabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
+import { useIsInlineEditorEnabled } from 'components/interfaces/Account/Preferences/InlineEditorSettings'
 import { DeleteTrigger } from 'components/interfaces/Database/Triggers/DeleteTrigger'
 import { TriggerSheet } from 'components/interfaces/Database/Triggers/TriggerSheet'
 import { generateTriggerCreateSQL } from 'components/interfaces/Database/Triggers/TriggersList/TriggerList.utils'
diff --git a/apps/www/data/features.tsx b/apps/www/data/features.tsx
index 7ddd5894727fb..8cdf5850ce873 100644
--- a/apps/www/data/features.tsx
+++ b/apps/www/data/features.tsx
@@ -578,7 +578,7 @@ This feature is particularly useful for teams looking to enhance their security
     docsUrl: 'https://supabase.com/docs/guides/database/vault',
     slug: 'vault',
     status: {
-      stage: PRODUCT_STAGES.PUBLIC_ALPHA,
+      stage: PRODUCT_STAGES.PUBLIC_BETA,
       availableOnSelfHosted: true,
     },
   },
diff --git a/packages/common/posthog-client.ts b/packages/common/posthog-client.ts
index b27e104efa316..1ce1a8f5ad97b 100644
--- a/packages/common/posthog-client.ts
+++ b/packages/common/posthog-client.ts
@@ -142,6 +142,20 @@ class PostHogClient {
       console.error('PostHog identify failed:', error)
     }
   }
+
+  reset() {
+    this.pendingIdentification = null
+    this.pendingGroups = {}
+    this.pendingEvents = []
+
+    if (!this.initialized) return
+
+    try {
+      posthog.reset()
+    } catch (error) {
+      console.error('PostHog reset failed:', error)
+    }
+  }
 }
 
 export const posthogClient = new PostHogClient()
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index b5a0869c31654..03e4b5989021e 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -2181,6 +2181,24 @@ export interface TableQuickstartAssistantOpenedEvent {
   groups: TelemetryGroups
 }
 
+/**
+ * User toggled the inline editor setting in account preferences.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/account/preferences
+ */
+export interface InlineEditorSettingClickedEvent {
+  action: 'inline_editor_setting_clicked'
+  properties: {
+    /**
+     * Whether the inline editor was enabled or disabled
+     */
+    enabled: boolean
+  }
+  groups: Partial<TelemetryGroups>
+}
+
 /**
  * User clicked the save destination button in add log drains sheet.
  *
@@ -2340,6 +2358,7 @@ export type TelemetryEvent =
   | CommandMenuOpenedEvent
   | CommandMenuSearchSubmittedEvent
   | CommandMenuCommandClickedEvent
+  | InlineEditorSettingClickedEvent
   | SidebarOpenedEvent
   | LogDrainSaveButtonClickedEvent
   | LogDrainConfirmButtonSubmittedEvent
diff --git a/packages/common/telemetry.tsx b/packages/common/telemetry.tsx
index 2a316aca01053..64f77f1d503da 100644
--- a/packages/common/telemetry.tsx
+++ b/packages/common/telemetry.tsx
@@ -17,6 +17,8 @@ import { TelemetryEvent } from './telemetry-constants'
 import { getSharedTelemetryData } from './telemetry-utils'
 import { posthogClient } from './posthog-client'
 
+export { posthogClient }
+
 const { TELEMETRY_DATA } = LOCAL_STORAGE_KEYS
 
 // Reexports GoogleTagManager with the right API key set