diff --git a/src/app/(app)/auto-triage/AutoTriagePageClient.tsx b/src/app/(app)/auto-triage/AutoTriagePageClient.tsx
deleted file mode 100644
index 2d3b9357a..000000000
--- a/src/app/(app)/auto-triage/AutoTriagePageClient.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-'use client';
-
-import { useEffect } from 'react';
-import { toast } from 'sonner';
-import { AutoTriageConfigForm } from '@/components/auto-triage/AutoTriageConfigForm';
-import { AutoTriageTicketsCard } from '@/components/auto-triage/AutoTriageTicketsCard';
-import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
-import { Badge } from '@/components/ui/badge';
-import { Button } from '@/components/ui/button';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
-import { Rocket, ExternalLink, Settings2, ListChecks } from 'lucide-react';
-import { useTRPC } from '@/lib/trpc/utils';
-import { useQuery } from '@tanstack/react-query';
-import Link from 'next/link';
-
-type AutoTriagePageClientProps = {
-  userId: string;
-  userName: string;
-  successMessage?: string;
-  errorMessage?: string;
-};
-
-export function AutoTriagePageClient({
-  userId: _userId,
-  userName: _userName,
-  successMessage,
-  errorMessage,
-}: AutoTriagePageClientProps) {
-  const trpc = useTRPC();
-
-  // Fetch GitHub App installation status
-  const { data: statusData, isLoading: isStatusLoading } = useQuery(
-    trpc.personalAutoTriage.getGitHubStatus.queryOptions()
-  );
-
-  const isGitHubAppInstalled = statusData?.connected && statusData?.integration?.isValid;
-
-  // Show toast messages from URL params
-  useEffect(() => {
-    if (successMessage === 'github_connected') {
-      toast.success('GitHub account connected successfully');
-    }
-    if (errorMessage) {
-      toast.error('An error occurred', {
-        description: errorMessage.replace(/_/g, ' '),
-      });
-    }
-  }, [successMessage, errorMessage]);
-
-  return (
-    <div className="container mx-auto space-y-6 px-4 py-8">
-      {/* Header */}
-      <div className="space-y-2">
-        <div className="flex items-center gap-2">
-          <h1 className="text-3xl font-bold">Auto Triage</h1>
-          <Badge variant="beta">beta</Badge>
-        </div>
-        <p className="text-muted-foreground">
-          Automatically triage GitHub issues with Al-powered analysis
-        </p>
-        <a
-          href="https://kilo.ai/docs/automate/auto-triage/overview"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="mt-2 inline-flex items-center gap-1 text-sm text-blue-400 hover:text-blue-300"
-        >
-          Learn how to use it
-          <ExternalLink className="size-4" />
-        </a>
-      </div>
-
-      {/* GitHub App Required Alert */}
-      {!isStatusLoading && !isGitHubAppInstalled && (
-        <Alert>
-          <Rocket className="h-4 w-4" />
-          <AlertTitle>GitHub App Required</AlertTitle>
-          <AlertDescription className="space-y-3">
-            <p>
-              The Kilo GitHub App must be installed to use Auto Triage. The app automatically
-              manages workflows and triggers triage on your issues.
-            </p>
-            <Link href="/integrations/github">
-              <Button variant="default" size="sm">
-                Install GitHub App
-                <ExternalLink className="ml-2 h-3 w-3" />
-              </Button>
-            </Link>
-          </AlertDescription>
-        </Alert>
-      )}
-
-      {/* Tabbed Content */}
-      <Tabs defaultValue="config" className="w-full">
-        <TabsList className="grid w-full max-w-2xl grid-cols-2">
-          <TabsTrigger value="config" className="flex items-center gap-2">
-            <Settings2 className="h-4 w-4" />
-            Config
-          </TabsTrigger>
-          <TabsTrigger
-            value="tickets"
-            className="flex items-center gap-2"
-            disabled={!isStatusLoading && !isGitHubAppInstalled}
-          >
-            <ListChecks className="h-4 w-4" />
-            Tickets
-          </TabsTrigger>
-        </TabsList>
-
-        {/* Configuration Tab */}
-        <TabsContent value="config" className="mt-6 space-y-4">
-          <AutoTriageConfigForm />
-        </TabsContent>
-
-        {/* Tickets Tab */}
-        <TabsContent value="tickets" className="mt-6 space-y-4">
-          {isStatusLoading || isGitHubAppInstalled ? (
-            <AutoTriageTicketsCard />
-          ) : (
-            <Alert>
-              <ListChecks className="h-4 w-4" />
-              <AlertTitle>No Tickets Yet</AlertTitle>
-              <AlertDescription>
-                Install the GitHub App and configure your auto-triage settings to see triage tickets
-                here.
-              </AlertDescription>
-            </Alert>
-          )}
-        </TabsContent>
-      </Tabs>
-    </div>
-  );
-}
diff --git a/src/app/(app)/auto-triage/page.tsx b/src/app/(app)/auto-triage/page.tsx
index d2daf867e..1356b5dfe 100644
--- a/src/app/(app)/auto-triage/page.tsx
+++ b/src/app/(app)/auto-triage/page.tsx
@@ -1,5 +1,5 @@
 import { getUserFromAuthOrRedirect } from '@/lib/user.server';
-import { AutoTriagePageClient } from './AutoTriagePageClient';
+import { AutoTriagePageClient } from '@/components/auto-triage/AutoTriagePageClient';
 
 type AutoTriagePageProps = {
   searchParams: Promise<{ success?: string; error?: string }>;
@@ -7,14 +7,7 @@ type AutoTriagePageProps = {
 
 export default async function PersonalAutoTriagePage({ searchParams }: AutoTriagePageProps) {
   const search = await searchParams;
-  const user = await getUserFromAuthOrRedirect('/users/sign_in?callbackPath=/auto-triage');
+  await getUserFromAuthOrRedirect('/users/sign_in?callbackPath=/auto-triage');
 
-  return (
-    <AutoTriagePageClient
-      userId={user.id}
-      userName={user.google_user_name}
-      successMessage={search.success}
-      errorMessage={search.error}
-    />
-  );
+  return <AutoTriagePageClient successMessage={search.success} errorMessage={search.error} />;
 }
diff --git a/src/app/(app)/organizations/[id]/auto-triage/page.tsx b/src/app/(app)/organizations/[id]/auto-triage/page.tsx
index f2f3b1372..12eb54f56 100644
--- a/src/app/(app)/organizations/[id]/auto-triage/page.tsx
+++ b/src/app/(app)/organizations/[id]/auto-triage/page.tsx
@@ -1,5 +1,5 @@
 import { OrganizationByPageLayout } from '@/components/organizations/OrganizationByPageLayout';
-import { AutoTriagePageClient } from './AutoTriagePageClient';
+import { AutoTriagePageClient } from '@/components/auto-triage/AutoTriagePageClient';
 
 type AutoTriagePageProps = {
   params: Promise<{ id: string }>;
diff --git a/src/app/(app)/organizations/[id]/auto-triage/AutoTriagePageClient.tsx b/src/components/auto-triage/AutoTriagePageClient.tsx
similarity index 84%
rename from src/app/(app)/organizations/[id]/auto-triage/AutoTriagePageClient.tsx
rename to src/components/auto-triage/AutoTriagePageClient.tsx
index 2fedb4863..f494a7389 100644
--- a/src/app/(app)/organizations/[id]/auto-triage/AutoTriagePageClient.tsx
+++ b/src/components/auto-triage/AutoTriagePageClient.tsx
@@ -14,8 +14,8 @@ import { useQuery } from '@tanstack/react-query';
 import Link from 'next/link';
 
 type AutoTriagePageClientProps = {
-  organizationId: string;
-  organizationName: string;
+  organizationId?: string;
+  organizationName?: string;
   successMessage?: string;
   errorMessage?: string;
 };
@@ -30,13 +30,21 @@ export function AutoTriagePageClient({
 
   // Fetch GitHub App installation status
   const { data: statusData, isLoading: isStatusLoading } = useQuery(
-    trpc.organizations.autoTriage.getGitHubStatus.queryOptions({
-      organizationId,
-    })
+    organizationId
+      ? trpc.organizations.autoTriage.getGitHubStatus.queryOptions({ organizationId })
+      : trpc.personalAutoTriage.getGitHubStatus.queryOptions()
   );
 
   const isGitHubAppInstalled = statusData?.connected && statusData?.integration?.isValid;
 
+  const githubIntegrationsHref = organizationId
+    ? `/organizations/${organizationId}/integrations/github`
+    : '/integrations/github';
+
+  const subtitle = organizationName
+    ? `Automatically triage GitHub issues with AI-powered analysis for ${organizationName}`
+    : 'Automatically triage GitHub issues with AI-powered analysis';
+
   // Show toast messages from URL params
   useEffect(() => {
     if (successMessage === 'github_connected') {
@@ -55,13 +63,11 @@ export function AutoTriagePageClient({
       <div className="space-y-2">
         <div className="flex items-center gap-2">
           <h1 className="text-3xl font-bold">Auto Triage</h1>
-          <Badge variant="new">new</Badge>
+          <Badge variant="beta">beta</Badge>
         </div>
-        <p className="text-muted-foreground">
-          Automatically triage GitHub issues with AI-powered analysis for {organizationName}
-        </p>
+        <p className="text-muted-foreground">{subtitle}</p>
         <a
-          href="https://kilo.ai/docs/advanced-usage/auto-triage"
+          href="https://kilo.ai/docs/automate/auto-triage/overview"
           target="_blank"
           rel="noopener noreferrer"
           className="mt-2 inline-flex items-center gap-1 text-sm text-blue-400 hover:text-blue-300"
@@ -81,7 +87,7 @@ export function AutoTriagePageClient({
               The Kilo GitHub App must be installed to use Auto Triage. The app automatically
               manages workflows and triggers triage on your issues.
             </p>
-            <Link href={`/organizations/${organizationId}/integrations/github`}>
+            <Link href={githubIntegrationsHref}>
               <Button variant="default" size="sm">
                 Install GitHub App
                 <ExternalLink className="ml-2 h-3 w-3" />