diff --git a/src/services/temporal/configs/temporal.config.ts b/src/services/temporal/configs/temporal.config.ts
index 28e6fc0..12eebf8 100644
--- a/src/services/temporal/configs/temporal.config.ts
+++ b/src/services/temporal/configs/temporal.config.ts
@@ -1,6 +1,7 @@
 export const queues = {
-  typescriptLight: 'TEMPORAL_QUEUE_LIGHT',
-  typescriptHeavy: 'TEMPORAL_QUEUE_HEAVY',
-  pythonLight: 'TEMPORAL_QUEUE_PYTHON_LIGHT',
-  pythonHeavy: 'TEMPORAL_QUEUE_PYTHON_HEAVY',
+  TEMPORAL_QUEUE_LIGHT: 'TEMPORAL_QUEUE_LIGHT',
+  TEMPORAL_QUEUE_HEAVY: 'TEMPORAL_QUEUE_HEAVY',
+  TEMPORAL_QUEUE_PYTHON_LIGHT: 'TEMPORAL_QUEUE_PYTHON_LIGHT',
+  TEMPORAL_QUEUE_PYTHON_HEAVY: 'TEMPORAL_QUEUE_PYTHON_HEAVY',
+  HIVEMIND_AGENT_QUEUE: 'HIVEMIND_AGENT_QUEUE',
 };
diff --git a/src/services/temporal/discourse.service.ts b/src/services/temporal/discourse.service.ts
index 4a87bd7..5a45ebe 100644
--- a/src/services/temporal/discourse.service.ts
+++ b/src/services/temporal/discourse.service.ts
@@ -25,7 +25,7 @@ class TemporalDiscourseService extends TemporalCoreService {
           type: 'startWorkflow',
           workflowType: 'DiscourseExtractWorkflow',
           args: [{ endpoint, platformId }],
-          taskQueue: queues.typescriptHeavy,
+          taskQueue: queues.TEMPORAL_QUEUE_HEAVY,
         },
         scheduleId: `discourse/${encodeURIComponent(endpoint)}`,
         policies: {
diff --git a/src/services/temporal/hivemind.service.ts b/src/services/temporal/hivemind.service.ts
index f3fee86..470429f 100644
--- a/src/services/temporal/hivemind.service.ts
+++ b/src/services/temporal/hivemind.service.ts
@@ -1,6 +1,7 @@
 import { Client } from '@temporalio/client';
 
 import parentLogger from '../../config/logger';
+import { queues } from './configs/temporal.config';
 import { TemporalCoreService } from './core.service';
 
 const logger = parentLogger.child({ module: 'HivemindTemporalService' });
@@ -27,19 +28,16 @@ class HivemindTemporalService extends TemporalCoreService {
   public async triggerWorkflow(communityId: string, query: string, enableAnswerSkipping: boolean) {
     const client: Client = await this.getClient();
 
-    // // Construct the payload as specified
     const payload: HivemindPayload = {
       community_id: communityId,
       query: query,
       enable_answer_skipping: enableAnswerSkipping,
     };
     try {
-      const hivemindTaskQueue = 'HIVEMIND_AGENT_QUEUE';
-
       const workflowHandle = await client.workflow.execute('AgenticHivemindTemporalWorkflow', {
-        taskQueue: hivemindTaskQueue,
+        taskQueue: queues.HIVEMIND_AGENT_QUEUE,
         args: [payload],
-        workflowId: `hivemind-${communityId}-${Date.now()}`,
+        workflowId: `api:agnet-${communityId}`,
       });
       logger.info(`Started Hivemind workflow with ID: ${workflowHandle}`);
       return workflowHandle;
diff --git a/src/services/temporal/website.service.ts b/src/services/temporal/website.service.ts
index 579a8ef..b736054 100644
--- a/src/services/temporal/website.service.ts
+++ b/src/services/temporal/website.service.ts
@@ -36,7 +36,7 @@ class TemporalWebsiteService extends TemporalCoreService {
           type: 'startWorkflow',
           workflowType: 'WebsiteIngestionSchedulerWorkflow',
           args: [platformId.toString()],
-          taskQueue: queues.pythonHeavy,
+          taskQueue: queues.TEMPORAL_QUEUE_PYTHON_HEAVY,
         },
         policies: {
           catchupWindow: '1 day',