diff --git a/apps/docs/content/guides/getting-started/quickstarts/sveltekit.mdx b/apps/docs/content/guides/getting-started/quickstarts/sveltekit.mdx
index f22ecc0563408..5e475977a6bd5 100644
--- a/apps/docs/content/guides/getting-started/quickstarts/sveltekit.mdx
+++ b/apps/docs/content/guides/getting-started/quickstarts/sveltekit.mdx
@@ -67,8 +67,8 @@ hideToc: true
       <$CodeTabs>
 
         ```text name=.env
-        PUBLIC_VITE_SUPABASE_URL=<SUBSTITUTE_SUPABASE_URL>
-        PUBLIC_VITE_SUPABASE_PUBLISHABLE_KEY=<SUBSTITUTE_SUPABASE_PUBLISHABLE_KEY>
+        PUBLIC_SUPABASE_URL=<SUBSTITUTE_SUPABASE_URL>
+        PUBLIC_SUPABASE_PUBLISHABLE_KEY=<SUBSTITUTE_SUPABASE_PUBLISHABLE_KEY>
         ```
 
       </$CodeTabs>
@@ -89,17 +89,17 @@ hideToc: true
       <$CodeTabs>
 
         ```js name=src/lib/supabaseClient.js
-          import { createClient } from '@supabase/supabase-js';
-        import { PUBLIC_VITE_SUPABASE_URL, PUBLIC_VITE_SUPABASE_PUBLISHABLE_KEY } from '$env/static/public';
+        import { createClient } from '@supabase/supabase-js';
+        import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_PUBLISHABLE_KEY } from '$env/static/public';
 
-        export const supabase = createClient(PUBLIC_VITE_SUPABASE_URL, PUBLIC_VITE_SUPABASE_PUBLISHABLE_KEY)
+        export const supabase = createClient(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_PUBLISHABLE_KEY)
         ```
 
         ```ts name=src/lib/supabaseClient.ts
-          import { createClient } from '@supabase/supabase-js';
-        import { PUBLIC_VITE_SUPABASE_URL, PUBLIC_VITE_SUPABASE_PUBLISHABLE_KEY } from '$env/static/public';
+        import { createClient } from '@supabase/supabase-js';
+        import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_PUBLISHABLE_KEY } from '$env/static/public';
 
-        export const supabase = createClient(PUBLIC_VITE_SUPABASE_URL, PUBLIC_VITE_SUPABASE_PUBLISHABLE_KEY)
+        export const supabase = createClient(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_PUBLISHABLE_KEY)
         ```
 
       </$CodeTabs>
diff --git a/apps/studio/components/interfaces/Account/Preferences/AccountConnections.tsx b/apps/studio/components/interfaces/Account/Preferences/AccountConnections.tsx
index a8907fa8b35fc..5d7d40521254d 100644
--- a/apps/studio/components/interfaces/Account/Preferences/AccountConnections.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/AccountConnections.tsx
@@ -1,10 +1,24 @@
+import { ChevronDown, RefreshCw, Unlink } from 'lucide-react'
 import Image from 'next/image'
+import { useState } from 'react'
+import { toast } from 'sonner'
 
 import Panel from 'components/ui/Panel'
+import { useGitHubAuthorizationDeleteMutation } from 'data/integrations/github-authorization-delete-mutation'
 import { useGitHubAuthorizationQuery } from 'data/integrations/github-authorization-query'
 import { BASE_PATH } from 'lib/constants'
 import { openInstallGitHubIntegrationWindow } from 'lib/github'
-import { Badge, Button, cn } from 'ui'
+import {
+  Badge,
+  Button,
+  cn,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from 'ui'
+import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
 import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
 
 export const AccountConnections = () => {
@@ -16,12 +30,30 @@ export const AccountConnections = () => {
     error,
   } = useGitHubAuthorizationQuery()
 
+  const [isRemoveModalOpen, setIsRemoveModalOpen] = useState(false)
+
   const isConnected = gitHubAuthorization !== null
 
+  const { mutate: removeAuthorization, isLoading: isRemoving } =
+    useGitHubAuthorizationDeleteMutation({
+      onSuccess: () => {
+        toast.success('GitHub authorization removed successfully')
+        setIsRemoveModalOpen(false)
+      },
+    })
+
   const handleConnect = () => {
     openInstallGitHubIntegrationWindow('authorize')
   }
 
+  const handleReauthenticate = () => {
+    openInstallGitHubIntegrationWindow('authorize')
+  }
+
+  const handleRemove = () => {
+    removeAuthorization()
+  }
+
   return (
     <Panel
       className="mb-4 md:mb-8"
@@ -63,9 +95,37 @@ export const AccountConnections = () => {
               </p>
             </div>
           </div>
-          <div className="flex items-center gap-x-1">
+          <div className="flex items-center gap-x-2 ml-2">
             {isConnected ? (
-              <Badge variant="success">Connected</Badge>
+              <>
+                <Badge variant="success">Connected</Badge>
+                <DropdownMenu>
+                  <DropdownMenuTrigger asChild>
+                    <Button iconRight={<ChevronDown size={14} />} type="default">
+                      <span>Manage</span>
+                    </Button>
+                  </DropdownMenuTrigger>
+                  <DropdownMenuContent side="bottom" align="end">
+                    <DropdownMenuItem
+                      className="space-x-2"
+                      onSelect={(event) => {
+                        event.preventDefault()
+                        handleReauthenticate()
+                      }}
+                    >
+                      <RefreshCw size={14} />
+                      <p>Re-authenticate</p>
+                    </DropdownMenuItem>
+                    <DropdownMenuItem
+                      className="space-x-2"
+                      onSelect={() => setIsRemoveModalOpen(true)}
+                    >
+                      <Unlink size={14} />
+                      <p>Remove connection</p>
+                    </DropdownMenuItem>
+                  </DropdownMenuContent>
+                </DropdownMenu>
+              </>
             ) : (
               <Button type="primary" onClick={handleConnect}>
                 Connect
@@ -74,6 +134,21 @@ export const AccountConnections = () => {
           </div>
         </Panel.Content>
       )}
+      <ConfirmationModal
+        variant="destructive"
+        size="small"
+        visible={isRemoveModalOpen}
+        title="Confirm to remove GitHub authorization"
+        confirmLabel="Remove connection"
+        onCancel={() => setIsRemoveModalOpen(false)}
+        onConfirm={handleRemove}
+        loading={isRemoving}
+      >
+        <p className="text-sm text-foreground-light">
+          Removing this authorization will disconnect your GitHub account from Supabase. You can
+          reconnect at any time.
+        </p>
+      </ConfirmationModal>
     </Panel>
   )
 }
diff --git a/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx b/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
index e6bcaafa92e78..b9c930d20ed92 100644
--- a/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
+++ b/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
@@ -612,6 +612,7 @@ export function LogDrainDestinationSheetForm({
               <span>See full pricing breakdown</span>{' '}
               <Link
                 href={`${DOCS_URL}/guides/platform/manage-your-usage/log-drains`}
+                target="_blank"
                 className="text-foreground underline underline-offset-2 decoration-foreground-muted hover:decoration-foreground transition-all"
               >
                 here
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
index 252894e8bbec0..28b64e069304f 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { ChevronDown, Loader2, PlusIcon } from 'lucide-react'
+import { ChevronDown, Info, Loader2, PlusIcon, RefreshCw } from 'lucide-react'
 import { useEffect, useMemo, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { toast } from 'sonner'
@@ -33,6 +33,7 @@ import {
   CommandInput_Shadcn_,
   CommandItem_Shadcn_,
   CommandList_Shadcn_,
+  CommandSeparator_Shadcn_,
   Form_Shadcn_,
   FormControl_Shadcn_,
   FormField_Shadcn_,
@@ -141,7 +142,7 @@ const GitHubIntegrationConnectionForm = ({
 
   const githubRepos = useMemo(
     () =>
-      githubReposData?.map((repo) => ({
+      githubReposData?.repositories?.map((repo) => ({
         id: repo.id.toString(),
         name: repo.name,
         installation_id: repo.installation_id,
@@ -150,6 +151,8 @@ const GitHubIntegrationConnectionForm = ({
     [githubReposData]
   )
 
+  const hasPartialResponseDueToSSO = githubReposData?.partial_response_due_to_sso ?? false
+
   const prodBranch = existingBranches?.find((branch) => branch.is_default)
 
   // Combined GitHub Settings Form
@@ -474,30 +477,32 @@ const GitHubIntegrationConnectionForm = ({
                           <CommandInput_Shadcn_ placeholder="Search repositories..." />
                           <CommandList_Shadcn_ className="!max-h-[200px]">
                             <CommandEmpty_Shadcn_>No repositories found.</CommandEmpty_Shadcn_>
-                            <CommandGroup_Shadcn_>
-                              {githubRepos.map((repo, i) => (
-                                <CommandItem_Shadcn_
-                                  key={repo.id}
-                                  value={`${repo.name.replaceAll('"', '')}-${i}`}
-                                  className="flex gap-2 items-center"
-                                  onSelect={() => {
-                                    field.onChange(repo.id)
-                                    setRepoComboboxOpen(false)
-                                    githubSettingsForm.setValue(
-                                      'branchName',
-                                      repo.default_branch || 'main'
-                                    )
-                                  }}
-                                >
-                                  <div className="bg-black shadow rounded p-1 w-5 h-5 flex justify-center items-center">
-                                    {GITHUB_ICON}
-                                  </div>
-                                  <span className="truncate" title={repo.name}>
-                                    {repo.name}
-                                  </span>
-                                </CommandItem_Shadcn_>
-                              ))}
-                            </CommandGroup_Shadcn_>
+                            {githubRepos.length > 0 ? (
+                              <CommandGroup_Shadcn_>
+                                {githubRepos.map((repo, i) => (
+                                  <CommandItem_Shadcn_
+                                    key={repo.id}
+                                    value={`${repo.name.replaceAll('"', '')}-${i}`}
+                                    className="flex gap-2 items-center"
+                                    onSelect={() => {
+                                      field.onChange(repo.id)
+                                      setRepoComboboxOpen(false)
+                                      githubSettingsForm.setValue(
+                                        'branchName',
+                                        repo.default_branch || 'main'
+                                      )
+                                    }}
+                                  >
+                                    <div className="bg-black shadow rounded p-1 w-5 h-5 flex justify-center items-center">
+                                      {GITHUB_ICON}
+                                    </div>
+                                    <span className="truncate" title={repo.name}>
+                                      {repo.name}
+                                    </span>
+                                  </CommandItem_Shadcn_>
+                                ))}
+                              </CommandGroup_Shadcn_>
+                            ) : null}
                             <CommandGroup_Shadcn_>
                               <CommandItem_Shadcn_
                                 className="flex gap-2 items-center cursor-pointer"
@@ -512,6 +517,27 @@ const GitHubIntegrationConnectionForm = ({
                                 Add GitHub Repositories
                               </CommandItem_Shadcn_>
                             </CommandGroup_Shadcn_>
+                            {hasPartialResponseDueToSSO && (
+                              <>
+                                <CommandSeparator_Shadcn_ />
+                                <CommandGroup_Shadcn_>
+                                  <CommandItem_Shadcn_
+                                    className="flex gap-2 items-start cursor-pointer"
+                                    onSelect={() => {
+                                      openInstallGitHubIntegrationWindow(
+                                        'authorize',
+                                        refetchGitHubAuthorizationAndRepositories
+                                      )
+                                    }}
+                                  >
+                                    <RefreshCw size={16} className="mt-0.5 shrink-0" />
+                                    <div className="text-xs text-foreground-light">
+                                      Re-authorize GitHub with SSO to show all repositories
+                                    </div>
+                                  </CommandItem_Shadcn_>
+                                </CommandGroup_Shadcn_>
+                              </>
+                            )}
                           </CommandList_Shadcn_>
                         </Command_Shadcn_>
                       </PopoverContent_Shadcn_>
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
index 4d5083d4c8e6e..702e01e77e678 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
@@ -21,6 +21,7 @@ import {
 } from 'ui'
 import { LOGS_LARGE_DATE_RANGE_DAYS_THRESHOLD } from './Logs.constants'
 import type { DatetimeHelper } from './Logs.types'
+import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'
 
 export type DatePickerValue = {
   to: string
@@ -237,13 +238,16 @@ export const LogsDatePicker = ({
     Math.abs(dayjs(startDate).diff(dayjs(endDate), 'days')) >
     LOGS_LARGE_DATE_RANGE_DAYS_THRESHOLD - 1
 
-  const { plan: orgPlan, isLoading: isOrgPlanLoading } = useCurrentOrgPlan()
+  const { getEntitlementNumericValue } = useCheckEntitlements('log.retention_days')
+  const entitledToAuditLogDays = getEntitlementNumericValue()
+
   const showHelperBadge = (helper?: DatetimeHelper) => {
     if (!helper) return false
     if (!helper.availableIn?.length) return false
+    if (!entitledToAuditLogDays) return false
 
-    if (helper.availableIn.includes('free')) return false
-    if (helper.availableIn.includes(orgPlan?.id || 'free') && !isOrgPlanLoading) return false
+    const day = Math.abs(dayjs().diff(dayjs(helper.calcFrom()), 'day'))
+    if (day <= entitledToAuditLogDays) return false
     return true
   }
 
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts
index 279a148a57732..e21744f60f707 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts
@@ -291,6 +291,19 @@ export const maybeShowUpgradePrompt = (from: string | null | undefined, planId?:
   )
 }
 
+/**
+ * Determine if we should show the user an upgrade prompt while browsing logs
+ * This method should replace maybeShowUpgradePrompt once we have migrated all usage to the Entitlements API.
+ */
+export const maybeShowUpgradePromptIfNotEntitled = (
+  from: string | null | undefined,
+  entitledToDays: number | undefined
+) => {
+  if (!entitledToDays) return false
+  const day = Math.abs(dayjs().diff(dayjs(from), 'day'))
+  return day > entitledToDays
+}
+
 export const genCountQuery = (table: LogsTableName, filters: Filters): string => {
   let where = genWhereStatement(table, filters)
   // pg_cron logs are a subset of postgres logs
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogsPreviewer.tsx b/apps/studio/components/interfaces/Settings/Logs/LogsPreviewer.tsx
index 39dcd1c83d1c7..a35bf61a4f8b8 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogsPreviewer.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogsPreviewer.tsx
@@ -26,9 +26,10 @@ import {
   PREVIEWER_DATEPICKER_HELPERS,
 } from './Logs.constants'
 import type { Filters, LogSearchCallback, LogTemplate, QueryType } from './Logs.types'
-import { maybeShowUpgradePrompt } from './Logs.utils'
+import { maybeShowUpgradePromptIfNotEntitled } from './Logs.utils'
 import { PreviewFilterPanelWithUniversal } from './PreviewFilterPanelWithUniversal'
 import UpgradePrompt from './UpgradePrompt'
+import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'
 
 /**
  * Calculates the appropriate time range for bar click filtering based on the current time range duration.
@@ -206,6 +207,9 @@ export const LogsPreviewer = ({
     refresh()
   }
 
+  const { getEntitlementNumericValue } = useCheckEntitlements('log.retention_days')
+  const entitledToAuditLogDays = getEntitlementNumericValue()
+
   const handleSearch: LogSearchCallback = async (event, { query, to, from }) => {
     if (event === 'search-input-change') {
       setSearch(query || '')
@@ -213,8 +217,10 @@ export const LogsPreviewer = ({
     } else if (event === 'event-chart-bar-click') {
       setTimeRange(from || '', to || '')
     } else if (event === 'datepicker-change') {
-      const shouldShowUpgradePrompt = maybeShowUpgradePrompt(from || '', organization?.plan?.id)
-
+      const shouldShowUpgradePrompt = maybeShowUpgradePromptIfNotEntitled(
+        from || '',
+        entitledToAuditLogDays
+      )
       if (shouldShowUpgradePrompt) {
         setShowUpgradePrompt(!showUpgradePrompt)
       } else {
@@ -226,7 +232,10 @@ export const LogsPreviewer = ({
   // Show the prompt on page load based on query params
   useEffect(() => {
     if (timestampStart) {
-      const shouldShowUpgradePrompt = maybeShowUpgradePrompt(timestampStart, organization?.plan?.id)
+      const shouldShowUpgradePrompt = maybeShowUpgradePromptIfNotEntitled(
+        timestampStart,
+        entitledToAuditLogDays
+      )
       if (shouldShowUpgradePrompt) {
         setShowUpgradePrompt(!showUpgradePrompt)
       }
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx b/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
index 6106cf020814d..bb44df24c7402 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
@@ -206,7 +206,6 @@ const LogsQueryPanel = ({
             hideFooter
             triggerElement={
               <Button
-                asChild // ?: we don't want a button inside a button
                 type="text"
                 onClick={() => setShowReference(true)}
                 icon={<BookOpen />}
diff --git a/apps/studio/components/interfaces/Settings/Logs/PreviewFilterPanel.tsx b/apps/studio/components/interfaces/Settings/Logs/PreviewFilterPanel.tsx
index 292a316cd93fd..62f4d188bba60 100644
--- a/apps/studio/components/interfaces/Settings/Logs/PreviewFilterPanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/PreviewFilterPanel.tsx
@@ -94,12 +94,12 @@ const PreviewFilterPanel = ({
   return (
     <div
       className={cn(
-        'flex w-full items-center justify-between',
+        'flex w-full items-center justify-between overflow-x-scroll no-scrollbar',
         condensedLayout ? ' p-3' : '',
         className
       )}
     >
-      <div className="flex flex-row items-center gap-x-2">
+      <div className="flex flex-row items-center gap-x-2 mr-2">
         <form
           id="log-panel-search"
           onSubmit={(e) => {
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
index 896f97e8ed5a7..b19bada0766c9 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
@@ -70,7 +70,7 @@ export const generateColumnFieldFromPostgresColumn = (
     table: column.table,
     schema: column.schema,
     name: column.name,
-    comment: column?.comment ?? '',
+    comment: column?.comment,
     format: isArray ? column.format.slice(1) : column.format,
     defaultValue: column?.default_value as string | null,
     check: column.check,
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.types.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.types.ts
index 508e0be22f111..a497e2c3c751f 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.types.ts
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.types.ts
@@ -46,7 +46,7 @@ export interface ColumnField {
   table: string
   schema: string
   check: string | null
-  comment?: string
+  comment?: string | null
   format: string
   defaultValue: string | null
   foreignKey?: ExtendedPostgresRelationship
diff --git a/apps/studio/components/interfaces/UnifiedLogs/components/DownloadLogsButton.tsx b/apps/studio/components/interfaces/UnifiedLogs/components/DownloadLogsButton.tsx
index 84b8a1ed03e4d..db112a7241c02 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/components/DownloadLogsButton.tsx
+++ b/apps/studio/components/interfaces/UnifiedLogs/components/DownloadLogsButton.tsx
@@ -1,5 +1,6 @@
 import saveAs from 'file-saver'
 import { Download } from 'lucide-react'
+import Link from 'next/link'
 import Papa from 'papaparse'
 import { useEffect, useState } from 'react'
 import { toast } from 'sonner'
@@ -91,13 +92,18 @@ export const DownloadLogsButton = ({ searchParameters }: DownloadLogsButtonProps
       <DropdownMenu>
         <DropdownMenuTrigger>
           <ButtonTooltip
-            type="outline"
+            type="default"
             className="w-[26px]"
             icon={<Download className="text-foreground" />}
             tooltip={{ content: { side: 'bottom', text: 'Download logs' } }}
           />
         </DropdownMenuTrigger>
         <DropdownMenuContent align="end" className="w-36">
+          <DropdownMenuItem asChild className="gap-x-2">
+            <Link href={`/project/${ref}/settings/log-drains`}>
+              <p>Add a Log Drain</p>
+            </Link>
+          </DropdownMenuItem>
           <DropdownMenuItem onClick={() => setSelectedFormat('csv')}>
             <p>Download as CSV</p>
           </DropdownMenuItem>
diff --git a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
index 9ba27b4b8a320..7c7a149b5da26 100644
--- a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
+++ b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
@@ -1,7 +1,7 @@
 import { ChevronRight, CircleHelpIcon, Plus } from 'lucide-react'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
-import { useState } from 'react'
+import React, { useState } from 'react'
 
 import { IS_PLATFORM, useFlag, useParams } from 'common'
 import {
@@ -32,6 +32,7 @@ import {
 } from 'ui-patterns/InnerSideMenu'
 import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
 import { FeaturePreviewSidebarPanel } from '../../ui/FeaturePreviewSidebarPanel'
+import { LOG_DRAIN_TYPES } from 'components/interfaces/LogDrains/LogDrains.constants'
 
 const SupaIcon = ({ className }: { className?: string }) => {
   return (
@@ -230,7 +231,7 @@ export function LogsSidebarMenuV2() {
   })
 
   return (
-    <div className="pb-12 relative">
+    <div className="pb-4 relative">
       {IS_PLATFORM && !unifiedLogsFlagEnabled && (
         <FeaturePreviewSidebarPanel
           className="mx-4 mt-4"
@@ -316,14 +317,14 @@ export function LogsSidebarMenuV2() {
         <>
           <SidebarCollapsible title="Collections" defaultOpen={true}>
             {filteredLogs.map((collection) => {
-              const isItemActive = isActive(collection.url)
+              const isItemActive = isActive(collection?.url ?? '')
               return (
                 <LogsSidebarItem
-                  key={collection.key}
+                  key={collection?.key ?? ''}
                   isActive={isItemActive}
-                  href={collection.url}
+                  href={collection?.url ?? ''}
                   icon={<SupaIcon className="text-foreground-light" />}
-                  label={collection.name}
+                  label={collection?.name ?? ''}
                 />
               )
             })}
@@ -366,9 +367,29 @@ export function LogsSidebarMenuV2() {
           />
         )}
         {savedQueries.map((query) => (
-          <SavedQueriesItem item={query} key={query.id} />
+          <SavedQueriesItem item={query as any} key={query.id} /> // kemal: i know, i know, temp any fix.
         ))}
       </SidebarCollapsible>
+
+      <Separator className="my-4" />
+
+      <FeaturePreviewSidebarPanel
+        className="mx-4 mt-4"
+        title="Capture your logs"
+        description="Send logs to your preferred observability or storage platform."
+        illustration={
+          <div className="flex items-center gap-4">
+            {LOG_DRAIN_TYPES.map((type) =>
+              React.cloneElement(type.icon, { height: 20, width: 20 })
+            )}
+          </div>
+        }
+        actions={
+          <Button asChild type="default">
+            <Link href={`/project/${ref}/settings/log-drains`}>Go to Log Drains</Link>
+          </Button>
+        }
+      />
     </div>
   )
 }
diff --git a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterTimerange.tsx b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterTimerange.tsx
index 7656a5a1c9baf..5bd4bf95c2254 100644
--- a/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterTimerange.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterTimerange.tsx
@@ -6,12 +6,12 @@ import {
   DatePickerValue,
   LogsDatePicker,
 } from 'components/interfaces/Settings/Logs/Logs.DatePickers'
-import { maybeShowUpgradePrompt } from 'components/interfaces/Settings/Logs/Logs.utils'
+import { maybeShowUpgradePromptIfNotEntitled } from 'components/interfaces/Settings/Logs/Logs.utils'
 import UpgradePrompt from 'components/interfaces/Settings/Logs/UpgradePrompt'
-import { useCurrentOrgPlan } from 'hooks/misc/useCurrentOrgPlan'
 import type { DataTableTimerangeFilterField } from '../DataTable.types'
 import { isArrayOfDates } from '../DataTable.utils'
 import { useDataTable } from '../providers/DataTableProvider'
+import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'
 
 export function DataTableFilterTimerange<TData>({
   value: _value,
@@ -21,9 +21,11 @@ export function DataTableFilterTimerange<TData>({
   const column = table.getColumn(value)
   const filterValue = columnFilters.find((i) => i.id === value)?.value
 
-  const { plan: orgPlan } = useCurrentOrgPlan()
   const [showUpgradePrompt, setShowUpgradePrompt] = useState(false)
 
+  const { getEntitlementNumericValue } = useCheckEntitlements('log.retention_days')
+  const entitledToAuditLogDays = getEntitlementNumericValue()
+
   const date: DateRange | undefined = useMemo(
     () =>
       filterValue instanceof Date
@@ -36,7 +38,10 @@ export function DataTableFilterTimerange<TData>({
 
   const handleDatePickerChange = (vals: DatePickerValue) => {
     // Check if the selected date range exceeds the plan limits
-    const shouldShowUpgradePrompt = maybeShowUpgradePrompt(vals.from, orgPlan?.id)
+    const shouldShowUpgradePrompt = maybeShowUpgradePromptIfNotEntitled(
+      vals.from,
+      entitledToAuditLogDays
+    )
 
     if (shouldShowUpgradePrompt) {
       setShowUpgradePrompt(true)
diff --git a/apps/studio/components/ui/DataTable/DataTableToolbar.tsx b/apps/studio/components/ui/DataTable/DataTableToolbar.tsx
index 8f26410a532cd..b2e4bf7098a95 100644
--- a/apps/studio/components/ui/DataTable/DataTableToolbar.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableToolbar.tsx
@@ -37,7 +37,7 @@ export function DataTableToolbar({ renderActions }: DataTableToolbarProps) {
           <TooltipTrigger asChild>
             <Button
               size="tiny"
-              type="outline"
+              type="default"
               icon={open ? <PanelLeftClose /> : <PanelLeftOpen />}
               onClick={() => setOpen((prev) => !prev)}
               className="hidden sm:flex"
diff --git a/apps/studio/components/ui/DataTable/DataTableViewOptions.tsx b/apps/studio/components/ui/DataTable/DataTableViewOptions.tsx
index abbc1d1f93e05..3c04c19a30a2b 100644
--- a/apps/studio/components/ui/DataTable/DataTableViewOptions.tsx
+++ b/apps/studio/components/ui/DataTable/DataTableViewOptions.tsx
@@ -37,7 +37,7 @@ export function DataTableViewOptions() {
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
         <ButtonTooltip
-          type="outline"
+          type="default"
           size="tiny"
           role="combobox"
           aria-expanded={open}
diff --git a/apps/studio/components/ui/DataTable/FilterSideBar.tsx b/apps/studio/components/ui/DataTable/FilterSideBar.tsx
index d8cc32766ffbb..cceb6943e85b7 100644
--- a/apps/studio/components/ui/DataTable/FilterSideBar.tsx
+++ b/apps/studio/components/ui/DataTable/FilterSideBar.tsx
@@ -8,6 +8,9 @@ import { DateRangeDisabled } from './DataTable.types'
 import { DataTableFilterControls } from './DataTableFilters/DataTableFilterControls'
 import { DataTableResetButton } from './DataTableResetButton'
 import { useDataTable } from './providers/DataTableProvider'
+import Link from 'next/link'
+import { LOG_DRAIN_TYPES } from 'components/interfaces/LogDrains/LogDrains.constants'
+import React from 'react'
 
 interface FilterSideBarProps {
   dateRangeDisabled?: DateRangeDisabled
@@ -60,6 +63,23 @@ export function FilterSideBar({ dateRangeDisabled }: FilterSideBarProps) {
           />
         )}
         <DataTableFilterControls dateRangeDisabled={dateRangeDisabled} />
+        <FeaturePreviewSidebarPanel
+          className="mx-2 my-4"
+          title="Capture your logs"
+          description="Send logs to your preferred observability or storage platform."
+          illustration={
+            <div className="flex items-center gap-4">
+              {LOG_DRAIN_TYPES.map((type) =>
+                React.cloneElement(type.icon, { height: 20, width: 20 })
+              )}
+            </div>
+          }
+          actions={
+            <Button asChild type="default">
+              <Link href={`/project/${ref}/settings/log-drains`}>Go to Log Drains</Link>
+            </Button>
+          }
+        />
       </div>
     </ResizablePanel>
   )
diff --git a/apps/studio/components/ui/DataTable/RefreshButton.tsx b/apps/studio/components/ui/DataTable/RefreshButton.tsx
index 0f664e62586b7..a0e82436b1d1c 100644
--- a/apps/studio/components/ui/DataTable/RefreshButton.tsx
+++ b/apps/studio/components/ui/DataTable/RefreshButton.tsx
@@ -10,7 +10,7 @@ export const RefreshButton = ({ isLoading, onRefresh }: RefreshButtonProps) => {
   return (
     <ButtonTooltip
       size="tiny"
-      type="outline"
+      type="default"
       disabled={isLoading}
       onClick={onRefresh}
       className="w-[26px]"
diff --git a/apps/studio/components/ui/DownloadResultsButton.tsx b/apps/studio/components/ui/DownloadResultsButton.tsx
index 32665b0b482ac..e8c11390e6981 100644
--- a/apps/studio/components/ui/DownloadResultsButton.tsx
+++ b/apps/studio/components/ui/DownloadResultsButton.tsx
@@ -1,9 +1,11 @@
 import saveAs from 'file-saver'
-import { ChevronDown, Copy, Download } from 'lucide-react'
+import { ChevronDown, Copy, Download, Settings } from 'lucide-react'
 import { markdownTable } from 'markdown-table'
 import Papa from 'papaparse'
 import { useMemo } from 'react'
 import { toast } from 'sonner'
+import Link from 'next/link'
+import { useParams } from 'common'
 
 import {
   Button,
@@ -37,6 +39,7 @@ export const DownloadResultsButton = ({
   onCopyAsMarkdown,
   onCopyAsJSON,
 }: DownloadResultsButtonProps) => {
+  const { ref } = useParams()
   // [Joshen] Ensure JSON values are stringified for CSV and Markdown
   const formattedResults = results.map((row) => {
     const r = { ...row }
@@ -106,9 +109,11 @@ export const DownloadResultsButton = ({
         </Button>
       </DropdownMenuTrigger>
       <DropdownMenuContent align={align} className="w-44">
-        <DropdownMenuItem className="gap-x-2" onClick={() => downloadAsCSV()}>
-          <Download size={14} />
-          <p>Download CSV</p>
+        <DropdownMenuItem asChild className="gap-x-2">
+          <Link href={`/project/${ref}/settings/log-drains`}>
+            <Settings size={14} />
+            <p>Add a Log Drain</p>
+          </Link>
         </DropdownMenuItem>
         <DropdownMenuItem onClick={copyAsMarkdown} className="gap-x-2">
           <Copy size={14} />
@@ -118,6 +123,10 @@ export const DownloadResultsButton = ({
           <Copy size={14} />
           <p>Copy as JSON</p>
         </DropdownMenuItem>
+        <DropdownMenuItem className="gap-x-2" onClick={() => downloadAsCSV()}>
+          <Download size={14} />
+          <p>Download CSV</p>
+        </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
   )
diff --git a/apps/studio/components/ui/Logs/LogsExplorerHeader.tsx b/apps/studio/components/ui/Logs/LogsExplorerHeader.tsx
index ffc621a04b783..2af86431e4ef7 100644
--- a/apps/studio/components/ui/Logs/LogsExplorerHeader.tsx
+++ b/apps/studio/components/ui/Logs/LogsExplorerHeader.tsx
@@ -62,7 +62,7 @@ const LogsExplorerHeader = ({ subtitle }: LogsExplorerHeaderProps) => {
               onClick={() => setShowReference(true)}
               icon={<BookOpen strokeWidth={1.5} />}
             >
-              Field Reference
+              <span>Field Reference</span>
             </Button>
           }
         >
diff --git a/apps/studio/data/integrations/github-authorization-create-mutation.ts b/apps/studio/data/integrations/github-authorization-create-mutation.ts
index 3fd22101d1748..18b1efea59404 100644
--- a/apps/studio/data/integrations/github-authorization-create-mutation.ts
+++ b/apps/studio/data/integrations/github-authorization-create-mutation.ts
@@ -1,9 +1,10 @@
-import { useMutation } from '@tanstack/react-query'
+import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
 import { LOCAL_STORAGE_KEYS } from 'common'
 import { handleError, post } from 'data/fetchers'
 import type { ResponseError, UseCustomMutationOptions } from 'types'
+import { integrationKeys } from './keys'
 
 export type GitHubAuthorizationCreateVariables = {
   code: string
@@ -44,6 +45,7 @@ export const useGitHubAuthorizationCreateMutation = ({
   >,
   'mutationFn'
 > = {}) => {
+  const queryClient = useQueryClient()
   return useMutation<
     GitHubAuthorizationCreateData,
     ResponseError,
@@ -51,6 +53,14 @@ export const useGitHubAuthorizationCreateMutation = ({
   >({
     mutationFn: (vars) => createGitHubAuthorization(vars),
     async onSuccess(data, variables, context) {
+      await Promise.all([
+        queryClient.invalidateQueries({
+          queryKey: integrationKeys.githubAuthorization(),
+        }),
+        queryClient.invalidateQueries({
+          queryKey: integrationKeys.githubRepositoriesList(),
+        }),
+      ])
       await onSuccess?.(data, variables, context)
     },
     async onError(data, variables, context) {
diff --git a/apps/studio/data/integrations/github-authorization-delete-mutation.ts b/apps/studio/data/integrations/github-authorization-delete-mutation.ts
new file mode 100644
index 0000000000000..355ec5fc4f3af
--- /dev/null
+++ b/apps/studio/data/integrations/github-authorization-delete-mutation.ts
@@ -0,0 +1,48 @@
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { toast } from 'sonner'
+
+import { del, handleError } from 'data/fetchers'
+import type { ResponseError, UseCustomMutationOptions } from 'types'
+import { integrationKeys } from './keys'
+
+export async function deleteGitHubAuthorization(signal?: AbortSignal) {
+  const { data, error } = await del('/platform/integrations/github/authorization', { signal })
+
+  if (error) handleError(error)
+  return data
+}
+
+type GitHubAuthorizationDeleteData = Awaited<ReturnType<typeof deleteGitHubAuthorization>>
+
+export const useGitHubAuthorizationDeleteMutation = ({
+  onSuccess,
+  onError,
+  ...options
+}: Omit<
+  UseCustomMutationOptions<GitHubAuthorizationDeleteData, ResponseError, void>,
+  'mutationFn'
+> = {}) => {
+  const queryClient = useQueryClient()
+  return useMutation<GitHubAuthorizationDeleteData, ResponseError, void>({
+    mutationFn: () => deleteGitHubAuthorization(),
+    async onSuccess(data, variables, context) {
+      await Promise.all([
+        queryClient.invalidateQueries({
+          queryKey: integrationKeys.githubAuthorization(),
+        }),
+        queryClient.invalidateQueries({
+          queryKey: integrationKeys.githubRepositoriesList(),
+        }),
+      ])
+      await onSuccess?.(data, variables, context)
+    },
+    async onError(data, variables, context) {
+      if (onError === undefined) {
+        toast.error(`Failed to remove GitHub authorization: ${data.message}`)
+      } else {
+        onError(data, variables, context)
+      }
+    },
+    ...options,
+  })
+}
diff --git a/apps/studio/data/integrations/github-repositories-query.ts b/apps/studio/data/integrations/github-repositories-query.ts
index 9ac089e0a2b19..6d6739321ffe1 100644
--- a/apps/studio/data/integrations/github-repositories-query.ts
+++ b/apps/studio/data/integrations/github-repositories-query.ts
@@ -10,7 +10,7 @@ export async function getGitHubRepositories(signal?: AbortSignal) {
   })
 
   if (error) handleError(error)
-  return data.repositories
+  return data
 }
 
 export type GitHubRepositoriesData = Awaited<ReturnType<typeof getGitHubRepositories>>
diff --git a/apps/studio/hooks/misc/useUpgradePrompt.tsx b/apps/studio/hooks/misc/useUpgradePrompt.tsx
index eadf613ee0b3e..a6126f9a3ef4e 100644
--- a/apps/studio/hooks/misc/useUpgradePrompt.tsx
+++ b/apps/studio/hooks/misc/useUpgradePrompt.tsx
@@ -1,12 +1,13 @@
-import { maybeShowUpgradePrompt } from 'components/interfaces/Settings/Logs/Logs.utils'
+import { maybeShowUpgradePromptIfNotEntitled } from 'components/interfaces/Settings/Logs/Logs.utils'
 import { useEffect, useState } from 'react'
-import { useSelectedOrganizationQuery } from './useSelectedOrganization'
+import { useCheckEntitlements } from './useCheckEntitlements'
 
 export const useUpgradePrompt = (from: string) => {
-  const { data: organization } = useSelectedOrganizationQuery()
   const [showUpgradePrompt, setShowUpgradePrompt] = useState(false)
+  const { getEntitlementNumericValue } = useCheckEntitlements('log.retention_days')
+  const entitledToAuditLogDays = getEntitlementNumericValue()
 
-  const shouldShowUpgradePrompt = maybeShowUpgradePrompt(from, organization?.plan?.id)
+  const shouldShowUpgradePrompt = maybeShowUpgradePromptIfNotEntitled(from, entitledToAuditLogDays)
 
   useEffect(() => {
     if (shouldShowUpgradePrompt) {
diff --git a/apps/studio/lib/github.ts b/apps/studio/lib/github.ts
index b78986c52e31b..e961960cf0ea4 100644
--- a/apps/studio/lib/github.ts
+++ b/apps/studio/lib/github.ts
@@ -50,7 +50,7 @@ export function openInstallGitHubIntegrationWindow(
   } else {
     const state = makeRandomString(32)
     localStorage.setItem(LOCAL_STORAGE_KEYS.GITHUB_AUTHORIZATION_STATE, state)
-    windowUrl = `${GITHUB_INTEGRATION_AUTHORIZATION_URL}&state=${state}`
+    windowUrl = `${GITHUB_INTEGRATION_AUTHORIZATION_URL}&state=${state}&prompt=select_account`
   }
 
   const systemZoom = width / window.screen.availWidth
diff --git a/apps/studio/pages/project/[ref]/logs/explorer/index.tsx b/apps/studio/pages/project/[ref]/logs/explorer/index.tsx
index 8fe0c6e02e10b..37325967ef261 100644
--- a/apps/studio/pages/project/[ref]/logs/explorer/index.tsx
+++ b/apps/studio/pages/project/[ref]/logs/explorer/index.tsx
@@ -18,7 +18,7 @@ import {
   LogsWarning,
 } from 'components/interfaces/Settings/Logs/Logs.types'
 import {
-  maybeShowUpgradePrompt,
+  maybeShowUpgradePromptIfNotEntitled,
   useEditorHints,
 } from 'components/interfaces/Settings/Logs/Logs.utils'
 import LogsQueryPanel from 'components/interfaces/Settings/Logs/LogsQueryPanel'
@@ -52,6 +52,7 @@ import {
   ResizablePanel,
   ResizablePanelGroup,
 } from 'ui'
+import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'
 
 const LOCAL_PLACEHOLDER_QUERY =
   'select\n  timestamp, event_message, metadata\n  from edge_logs limit 5'
@@ -66,7 +67,6 @@ export const LogsExplorerPage: NextPageWithLayout = () => {
   const { profile } = useProfile()
   const { ref, q, queryId } = useParams()
   const projectRef = ref as string
-  const { data: organization } = useSelectedOrganizationQuery()
   const { logsShowMetadataIpTemplate } = useIsFeatureEnabled(['logs:show_metadata_ip_template'])
 
   const allTemplates = useMemo(() => {
@@ -93,6 +93,9 @@ export const LogsExplorerPage: NextPageWithLayout = () => {
     []
   )
 
+  const { getEntitlementNumericValue } = useCheckEntitlements('log.retention_days')
+  const entitledToAuditLogDays = getEntitlementNumericValue()
+
   const { data: content } = useContentQuery({
     projectRef: ref,
     type: 'log_sql',
@@ -253,7 +256,10 @@ export const LogsExplorerPage: NextPageWithLayout = () => {
   }
 
   const handleDateChange = ({ to, from }: DatePickerToFrom) => {
-    const shouldShowUpgradePrompt = maybeShowUpgradePrompt(from, organization?.plan?.id)
+    const shouldShowUpgradePrompt = maybeShowUpgradePromptIfNotEntitled(
+      from,
+      entitledToAuditLogDays
+    )
 
     if (shouldShowUpgradePrompt) {
       setShowUpgradePrompt(!showUpgradePrompt)
@@ -288,12 +294,15 @@ export const LogsExplorerPage: NextPageWithLayout = () => {
   // Show the prompt on page load based on query params
   useEffect(() => {
     if (timestampStart) {
-      const shouldShowUpgradePrompt = maybeShowUpgradePrompt(timestampStart, organization?.plan?.id)
+      const shouldShowUpgradePrompt = maybeShowUpgradePromptIfNotEntitled(
+        timestampStart,
+        entitledToAuditLogDays
+      )
       if (shouldShowUpgradePrompt) {
         setShowUpgradePrompt(!showUpgradePrompt)
       }
     }
-  }, [timestampStart, organization])
+  }, [timestampStart, entitledToAuditLogDays])
 
   return (
     <div className="w-full h-full mx-auto">
diff --git a/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx b/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx
index 8a8b741620908..433b8e73e2312 100644
--- a/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx
+++ b/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx
@@ -35,7 +35,7 @@ const BucketPage: NextPageWithLayout = () => {
   }
 
   // If the bucket is not found or the bucket type is ANALYTICS or VECTOR, show an error message
-  if (!bucket || bucket.type !== 'STANDARD') {
+  if (!bucket || ('type' in bucket && bucket.type !== 'STANDARD')) {
     return (
       <div className="flex h-full w-full items-center justify-center">
         <p className="text-sm text-foreground-light">Bucket "{bucketId}" cannot be found</p>
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 54884e5c1ec0a..4a7448920cf5d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -32,6 +32,9 @@ services:
       HOSTNAME: "::"
 
       STUDIO_PG_META_URL: http://meta:8080
+      POSTGRES_PORT: ${POSTGRES_PORT}
+      POSTGRES_HOST: ${POSTGRES_HOST}
+      POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       PG_META_CRYPTO_KEY: ${PG_META_CRYPTO_KEY}
 
diff --git a/docker/volumes/logs/vector.yml b/docker/volumes/logs/vector.yml
index 3493e9b3f8e55..f97f8e1e94687 100644
--- a/docker/volumes/logs/vector.yml
+++ b/docker/volumes/logs/vector.yml
@@ -33,7 +33,7 @@ transforms:
       kong: '.appname == "supabase-kong"'
       auth: '.appname == "supabase-auth"'
       rest: '.appname == "supabase-rest"'
-      realtime: '.appname == "supabase-realtime"'
+      realtime: '.appname == "realtime-dev.supabase-realtime"'
       storage: '.appname == "supabase-storage"'
       functions: '.appname == "supabase-edge-functions"'
       db: '.appname == "supabase-db"'
diff --git a/packages/api-types/types/platform.d.ts b/packages/api-types/types/platform.d.ts
index 2a9186388b709..91a27a413eb9e 100644
--- a/packages/api-types/types/platform.d.ts
+++ b/packages/api-types/types/platform.d.ts
@@ -544,9 +544,16 @@ export interface paths {
     /** Get GitHub authorization */
     get: operations['GitHubAuthorizationsController_getGitHubAuthorization']
     put?: never
-    /** Create GitHub authorization */
+    /**
+     * Upsert GitHub authorization
+     * @description Creates or updates a GitHub authorization for the current user
+     */
     post: operations['GitHubAuthorizationsController_createGitHubAuthorization']
-    delete?: never
+    /**
+     * Remove GitHub authorization
+     * @description Removes the GitHub authorization for the current user
+     */
+    delete: operations['GitHubAuthorizationsController_removeGitHubAuthorization']
     options?: never
     head?: never
     patch?: never
@@ -6992,6 +6999,8 @@ export interface components {
       }[]
     }
     ListGitHubRepositoriesResponse: {
+      /** @description The authorized user may not have access to all GitHub repositories in case they haven't gone through the authorization process with SSO yet. This field will be `true` if this is the case. The calling user must reauthorize their GitHub account with SSO to see all repositories. */
+      partial_response_due_to_sso: boolean
       repositories: {
         default_branch: string
         id: number
@@ -12130,6 +12139,37 @@ export interface operations {
       }
     }
   }
+  GitHubAuthorizationsController_removeGitHubAuthorization: {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    requestBody?: never
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+      /** @description There was no GitHub authorization attached to the user */
+      404: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+      /** @description Failed to remove GitHub authorization */
+      500: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+    }
+  }
   GitHubBranchesController_listConnectionBranches: {
     parameters: {
       query?: {
diff --git a/packages/ui/src/components/SidePanel/SidePanel.tsx b/packages/ui/src/components/SidePanel/SidePanel.tsx
index 88f711bf33af8..2ef745d1f1571 100644
--- a/packages/ui/src/components/SidePanel/SidePanel.tsx
+++ b/packages/ui/src/components/SidePanel/SidePanel.tsx
@@ -106,11 +106,7 @@ const SidePanel = ({
 
   return (
     <Dialog.Root open={open} onOpenChange={handleOpenChange} defaultOpen={defaultOpen}>
-      {triggerElement && (
-        <Dialog.Trigger asChild className={__styles.trigger}>
-          {triggerElement}
-        </Dialog.Trigger>
-      )}
+      {triggerElement && <Dialog.Trigger asChild>{triggerElement}</Dialog.Trigger>}
 
       <Dialog.Portal>
         <Dialog.Overlay className={__styles.overlay} />