diff --git a/packages/backend/server/src/core/doc/event.ts b/packages/backend/server/src/core/doc/event.ts
index d148cf5ff1..5c780e943c 100644
--- a/packages/backend/server/src/core/doc/event.ts
+++ b/packages/backend/server/src/core/doc/event.ts
@@ -36,7 +36,7 @@ export class DocEventsListener {
           docId,
         },
         {
-          jobId: `${workspaceId}/${docId}`,
+          jobId: `indexDoc/${workspaceId}/${docId}`,
           priority: 100,
         }
       );
@@ -53,7 +53,7 @@ export class DocEventsListener {
           workspaceId,
         },
         {
-          jobId: workspaceId,
+          jobId: `indexWorkspace/${workspaceId}`,
           priority: 100,
         }
       );
@@ -70,7 +70,7 @@ export class DocEventsListener {
           workspaceId: workspace,
         },
         {
-          jobId: workspace,
+          jobId: `deleteWorkspace/${workspace}`,
           priority: 0,
         }
       );
diff --git a/packages/backend/server/src/plugins/indexer/job.ts b/packages/backend/server/src/plugins/indexer/job.ts
index ed8ad18531..85f7fcbc8b 100644
--- a/packages/backend/server/src/plugins/indexer/job.ts
+++ b/packages/backend/server/src/plugins/indexer/job.ts
@@ -42,14 +42,20 @@ export class IndexerJob {
   @OnJob('indexer.indexDoc')
   async indexDoc({ workspaceId, docId }: Jobs['indexer.indexDoc']) {
     // delete the 'indexer.deleteDoc' job from the queue
-    await this.queue.remove(`${workspaceId}/${docId}`, 'indexer.deleteDoc');
+    await this.queue.remove(
+      `deleteDoc/${workspaceId}/${docId}`,
+      'indexer.deleteDoc'
+    );
     await this.service.indexDoc(workspaceId, docId);
   }
 
   @OnJob('indexer.deleteDoc')
   async deleteDoc({ workspaceId, docId }: Jobs['indexer.deleteDoc']) {
     // delete the 'indexer.updateDoc' job from the queue
-    await this.queue.remove(`${workspaceId}/${docId}`, 'indexer.indexDoc');
+    await this.queue.remove(
+      `indexDoc/${workspaceId}/${docId}`,
+      'indexer.indexDoc'
+    );
     await this.service.deleteDoc(workspaceId, docId);
   }
 
@@ -91,8 +97,8 @@ export class IndexerJob {
           docId,
         },
         {
-          jobId: `${workspaceId}/${docId}`,
-          // the delete job should be higher priority than the update job
+          jobId: `deleteDoc/${workspaceId}/${docId}`,
+          // the deleteDoc job should be higher priority than the indexDoc job
           priority: 0,
         }
       );
@@ -105,7 +111,7 @@ export class IndexerJob {
           docId,
         },
         {
-          jobId: `${workspaceId}/${docId}`,
+          jobId: `indexDoc/${workspaceId}/${docId}`,
           priority: 100,
         }
       );
@@ -122,7 +128,10 @@ export class IndexerJob {
 
   @OnJob('indexer.deleteWorkspace')
   async deleteWorkspace({ workspaceId }: Jobs['indexer.deleteWorkspace']) {
-    await this.queue.remove(workspaceId, 'indexer.indexWorkspace');
+    await this.queue.remove(
+      `indexWorkspace/${workspaceId}`,
+      'indexer.indexWorkspace'
+    );
     await this.service.deleteWorkspace(workspaceId);
   }
 
@@ -159,7 +168,7 @@ export class IndexerJob {
       await this.queue.add(
         'indexer.indexWorkspace',
         { workspaceId: workspace.id },
-        { jobId: workspace.id }
+        { jobId: `indexWorkspace/${workspace.id}` }
       );
       addedCount++;
     }
@@ -184,7 +193,7 @@ export class IndexerJob {
       {
         // make sure only one job is running at a time
         delay: 30 * 1000,
-        jobId: 'indexer:auto-index-workspaces',
+        jobId: 'autoIndexWorkspaces',
       }
     );
   }