diff --git a/apps/roomote/src/app/api/webhooks/github/handlers/utils.ts b/apps/roomote/src/app/api/webhooks/github/handlers/utils.ts
index 91070a0f37..4700fee3bc 100644
--- a/apps/roomote/src/app/api/webhooks/github/handlers/utils.ts
+++ b/apps/roomote/src/app/api/webhooks/github/handlers/utils.ts
@@ -36,7 +36,9 @@ export async function createAndEnqueueJob<T extends JobType>(
       await db
         .select({ id: orgs.id })
         .from(orgs)
-        .where(or(eq(orgs.name, 'Roo Code'), eq(orgs.name, 'Roo Code / Dev')))
+        .where(
+          or(eq(orgs.name, 'Roo Code, Inc.'), eq(orgs.name, 'Roo Code / Dev')),
+        )
         .limit(1)
     )[0]?.id;
 
diff --git a/apps/roomote/src/lib/job.ts b/apps/roomote/src/lib/job.ts
index d3dbeb05f7..383d8806af 100644
--- a/apps/roomote/src/lib/job.ts
+++ b/apps/roomote/src/lib/job.ts
@@ -92,7 +92,7 @@ export async function processJob<T extends JobType>({
 
       case 'general.task': {
         const jobPayload = payload as JobPayload<'general.task'>;
-        result = await processGeneralTask(jobPayload, { onTaskStarted });
+        result = await processGeneralTask(jobPayload, jobId, { onTaskStarted });
         break;
       }
 
diff --git a/apps/roomote/src/lib/jobs/processGeneralTask.ts b/apps/roomote/src/lib/jobs/processGeneralTask.ts
index 7e422df448..3fcc141efb 100644
--- a/apps/roomote/src/lib/jobs/processGeneralTask.ts
+++ b/apps/roomote/src/lib/jobs/processGeneralTask.ts
@@ -4,6 +4,7 @@ import { runTask, type RunTaskCallbacks } from '../runTask';
 
 export async function processGeneralTask(
   jobPayload: JobPayload<'general.task'>,
+  jobId: number,
   callbacks?: RunTaskCallbacks,
   mode?: string,
 ) {
@@ -22,6 +23,7 @@ Please complete this task and create a pull request with your changes when finis
   const result = await runTask({
     jobType: 'general.task',
     jobPayload,
+    jobId,
     prompt,
     callbacks,
     notify: false,