diff --git a/packages/twenty-server/src/integrations/message-queue/drivers/bullmq.driver.ts b/packages/twenty-server/src/integrations/message-queue/drivers/bullmq.driver.ts
index aecc2802e..56313e6e9 100644
--- a/packages/twenty-server/src/integrations/message-queue/drivers/bullmq.driver.ts
+++ b/packages/twenty-server/src/integrations/message-queue/drivers/bullmq.driver.ts
@@ -38,9 +38,13 @@ export class BullMQDriver implements MessageQueueDriver {
     queueName: MessageQueue,
     handler: ({ data, id }: { data: T; id: string }) => Promise<void>,
   ) {
-    const worker = new Worker(queueName, async (job) => {
-      await handler(job as { data: T; id: string });
-    });
+    const worker = new Worker(
+      queueName,
+      async (job) => {
+        await handler(job as { data: T; id: string });
+      },
+      this.options,
+    );
 
     this.workerMap[queueName] = worker;
   }
diff --git a/packages/twenty-server/src/integrations/message-queue/drivers/pg-boss.driver.ts b/packages/twenty-server/src/integrations/message-queue/drivers/pg-boss.driver.ts
index 63bd312bb..f74649bf0 100644
--- a/packages/twenty-server/src/integrations/message-queue/drivers/pg-boss.driver.ts
+++ b/packages/twenty-server/src/integrations/message-queue/drivers/pg-boss.driver.ts
@@ -39,7 +39,12 @@ export class PgBossDriver implements MessageQueueDriver {
     await this.pgBoss.send(
       `${queueName}.${jobName}`,
       data as object,
-      options ?? {},
+      options
+        ? {
+            ...options,
+            singletonKey: options?.id,
+          }
+        : {},
     );
   }
 }
diff --git a/packages/twenty-server/src/integrations/message-queue/message-queue.module.ts b/packages/twenty-server/src/integrations/message-queue/message-queue.module.ts
index 80afdea7e..a187d94cb 100644
--- a/packages/twenty-server/src/integrations/message-queue/message-queue.module.ts
+++ b/packages/twenty-server/src/integrations/message-queue/message-queue.module.ts
@@ -13,10 +13,7 @@ import {
 import { PgBossDriver } from 'src/integrations/message-queue/drivers/pg-boss.driver';
 import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
 import { BullMQDriver } from 'src/integrations/message-queue/drivers/bullmq.driver';
-import { FetchMessagesJob } from 'src/workspace/messaging/jobs/fetch-messages.job';
 import { SyncDriver } from 'src/integrations/message-queue/drivers/sync.driver';
-import { ModuleRef } from '@nestjs/core';
-import { AppModule } from 'src/app.module';
 import { JobsModule } from 'src/integrations/message-queue/jobs.module';
 
 @Global()
@@ -38,7 +35,9 @@ export class MessageQueueModule {
           switch (config.type) {
             case MessageQueueDriverType.PgBoss:
               const boss = new PgBossDriver(config.options);
+
               await boss.init();
+
               return boss;
 
             case MessageQueueDriverType.BullMQ:
diff --git a/packages/twenty-server/src/metadata/data-source/data-source.entity.ts b/packages/twenty-server/src/metadata/data-source/data-source.entity.ts
index fea74455a..0b5c07c5a 100644
--- a/packages/twenty-server/src/metadata/data-source/data-source.entity.ts
+++ b/packages/twenty-server/src/metadata/data-source/data-source.entity.ts
@@ -37,7 +37,7 @@ export class DataSourceEntity {
   })
   objects: ObjectMetadataEntity[];
 
-  @Column({ nullable: false })
+  @Column({ nullable: false, type: 'uuid' })
   workspaceId: string;
 
   @CreateDateColumn()
diff --git a/packages/twenty-server/src/metadata/field-metadata/field-metadata.entity.ts b/packages/twenty-server/src/metadata/field-metadata/field-metadata.entity.ts
index fbf0ea16b..6def6bad7 100644
--- a/packages/twenty-server/src/metadata/field-metadata/field-metadata.entity.ts
+++ b/packages/twenty-server/src/metadata/field-metadata/field-metadata.entity.ts
@@ -95,7 +95,7 @@ export class FieldMetadataEntity<
   @Column({ nullable: true, default: true })
   isNullable: boolean;
 
-  @Column({ nullable: false })
+  @Column({ nullable: false, type: 'uuid' })
   workspaceId: string;
 
   @OneToOne(
diff --git a/packages/twenty-server/src/metadata/object-metadata/object-metadata.entity.ts b/packages/twenty-server/src/metadata/object-metadata/object-metadata.entity.ts
index 85cb92d5e..709235ce6 100644
--- a/packages/twenty-server/src/metadata/object-metadata/object-metadata.entity.ts
+++ b/packages/twenty-server/src/metadata/object-metadata/object-metadata.entity.ts
@@ -64,7 +64,7 @@ export class ObjectMetadataEntity implements ObjectMetadataInterface {
   @Column({ nullable: true })
   imageIdentifierFieldMetadataId?: string;
 
-  @Column({ nullable: false })
+  @Column({ nullable: false, type: 'uuid' })
   workspaceId: string;
 
   @OneToMany(() => FieldMetadataEntity, (field) => field.object, {
diff --git a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.entity.ts b/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.entity.ts
index d34098245..629fa2954 100644
--- a/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.entity.ts
+++ b/packages/twenty-server/src/metadata/relation-metadata/relation-metadata.entity.ts
@@ -40,7 +40,7 @@ export class RelationMetadataEntity implements RelationMetadataInterface {
   @Column({ nullable: false, type: 'uuid' })
   toFieldMetadataId: string;
 
-  @Column({ nullable: false })
+  @Column({ nullable: false, type: 'uuid' })
   workspaceId: string;
 
   @ManyToOne(
diff --git a/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.entity.ts b/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.entity.ts
index 682df8e90..892244630 100644
--- a/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.entity.ts
+++ b/packages/twenty-server/src/metadata/workspace-cache-version/workspace-cache-version.entity.ts
@@ -11,7 +11,7 @@ export class WorkspaceCacheVersionEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;
 
-  @Column({ unique: true })
+  @Column({ unique: true, nullable: false, type: 'uuid' })
   workspaceId: string;
 
   @Column()
diff --git a/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.entity.ts b/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.entity.ts
index 705f1f9bf..42ccb3130 100644
--- a/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.entity.ts
+++ b/packages/twenty-server/src/metadata/workspace-migration/workspace-migration.entity.ts
@@ -79,7 +79,7 @@ export class WorkspaceMigrationEntity {
   @Column({ nullable: true })
   appliedAt?: Date;
 
-  @Column()
+  @Column({ nullable: false, type: 'uuid' })
   workspaceId: string;
 
   @CreateDateColumn()
diff --git a/packages/twenty-server/src/queue-worker.ts b/packages/twenty-server/src/queue-worker.ts
index 4d327c29b..5da66f682 100644
--- a/packages/twenty-server/src/queue-worker.ts
+++ b/packages/twenty-server/src/queue-worker.ts
@@ -4,8 +4,8 @@ import {
   MessageQueueJob,
   MessageQueueJobData,
 } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
-import { JobsModule } from 'src/integrations/message-queue/jobs.module';
 
+import { JobsModule } from 'src/integrations/message-queue/jobs.module';
 import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
 import { getJobClassName } from 'src/integrations/message-queue/utils/get-job-class-name.util';
@@ -28,4 +28,3 @@ async function bootstrap() {
   }
 }
 bootstrap();
-