diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500012000-migrate-messaging-infrastructure-to-metadata.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500012000-migrate-messaging-infrastructure-to-metadata.command.ts
index 0161f2b139..4c5a845ae8 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500012000-migrate-messaging-infrastructure-to-metadata.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500012000-migrate-messaging-infrastructure-to-metadata.command.ts
@@ -6,8 +6,8 @@ import { type FeatureFlagKey } from 'twenty-shared/types';
 import { type DeepPartial, Repository } from 'typeorm';
 
 import { ActiveOrSuspendedWorkspaceCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspace.command-runner';
-import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
 import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
@@ -16,7 +16,6 @@ import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-ac
 import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
 import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
-import { type MessageFolderWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-folder.workspace-entity';
 import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 
 type LegacyConnectedAccountWorkspaceEntity = {
@@ -99,7 +98,7 @@ export class MigrateMessagingInfrastructureToMetadataCommand extends ActiveOrSus
       );
 
     const messageFolderWorkspaceRepository =
-      await this.twentyORMGlobalManager.getRepository<MessageFolderWorkspaceEntity>(
+      await this.twentyORMGlobalManager.getRepository<MessageFolderEntity>(
         workspaceId,
         'messageFolder',
       );
diff --git a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity.ts b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity.ts
deleted file mode 100644
index 46e6d16cfc..0000000000
--- a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { registerEnumType } from '@nestjs/graphql';
-
-import {
-  CalendarChannelContactAutoCreationPolicy,
-  CalendarChannelSyncStage,
-  CalendarChannelSyncStatus,
-  CalendarChannelVisibility,
-} from 'twenty-shared/types';
-
-import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
-import { type EntityRelation } from 'src/engine/workspace-manager/workspace-migration/types/entity-relation.interface';
-import { type CalendarChannelEventAssociationWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity';
-
-export {
-  CalendarChannelContactAutoCreationPolicy,
-  CalendarChannelSyncStage,
-  CalendarChannelSyncStatus,
-  CalendarChannelVisibility,
-};
-
-registerEnumType(CalendarChannelVisibility, {
-  name: 'CalendarChannelVisibility',
-});
-
-registerEnumType(CalendarChannelSyncStatus, {
-  name: 'CalendarChannelSyncStatus',
-});
-
-registerEnumType(CalendarChannelSyncStage, {
-  name: 'CalendarChannelSyncStage',
-});
-
-registerEnumType(CalendarChannelContactAutoCreationPolicy, {
-  name: 'CalendarChannelContactAutoCreationPolicy',
-});
-
-export class CalendarChannelWorkspaceEntity extends BaseWorkspaceEntity {
-  handle: string | null;
-  syncStatus: CalendarChannelSyncStatus | null;
-  syncStage: CalendarChannelSyncStage;
-  visibility: string;
-  isContactAutoCreationEnabled: boolean;
-  contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy;
-  isSyncEnabled: boolean;
-  syncCursor: string | null;
-  syncedAt: string | null;
-  syncStageStartedAt: string | null;
-  throttleFailureCount: number;
-  connectedAccountId: string;
-  calendarChannelEventAssociations: EntityRelation<
-    CalendarChannelEventAssociationWorkspaceEntity[]
-  >;
-}
diff --git a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association-message-folder.workspace-entity.ts b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association-message-folder.workspace-entity.ts
index 74de2bd52b..eba3742612 100644
--- a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association-message-folder.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association-message-folder.workspace-entity.ts
@@ -1,11 +1,11 @@
+import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { type EntityRelation } from 'src/engine/workspace-manager/workspace-migration/types/entity-relation.interface';
 import { type MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
-import { type MessageFolderWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-folder.workspace-entity';
 
 export class MessageChannelMessageAssociationMessageFolderWorkspaceEntity extends BaseWorkspaceEntity {
   messageChannelMessageAssociation: EntityRelation<MessageChannelMessageAssociationWorkspaceEntity>;
   messageChannelMessageAssociationId: string;
-  messageFolder: EntityRelation<MessageFolderWorkspaceEntity>;
+  messageFolder: EntityRelation<MessageFolderEntity>;
   messageFolderId: string;
 }
diff --git a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel.workspace-entity.ts b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel.workspace-entity.ts
deleted file mode 100644
index 5f310194fb..0000000000
--- a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel.workspace-entity.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { registerEnumType } from '@nestjs/graphql';
-
-import {
-  MessageChannelContactAutoCreationPolicy,
-  MessageChannelPendingGroupEmailsAction,
-  MessageChannelSyncStage,
-  MessageChannelSyncStatus,
-  MessageChannelType,
-  MessageChannelVisibility,
-  MessageFolderImportPolicy,
-} from 'twenty-shared/types';
-
-import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
-import { type EntityRelation } from 'src/engine/workspace-manager/workspace-migration/types/entity-relation.interface';
-import { type MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
-import { type MessageFolderWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-folder.workspace-entity';
-
-export {
-  MessageChannelContactAutoCreationPolicy,
-  MessageChannelPendingGroupEmailsAction,
-  MessageChannelSyncStage,
-  MessageChannelSyncStatus,
-  MessageChannelType,
-  MessageChannelVisibility,
-  MessageFolderImportPolicy,
-};
-
-registerEnumType(MessageChannelVisibility, {
-  name: 'MessageChannelVisibility',
-});
-
-registerEnumType(MessageChannelSyncStatus, {
-  name: 'MessageChannelSyncStatus',
-});
-
-registerEnumType(MessageChannelSyncStage, {
-  name: 'MessageChannelSyncStage',
-});
-
-registerEnumType(MessageChannelType, {
-  name: 'MessageChannelType',
-});
-
-registerEnumType(MessageChannelContactAutoCreationPolicy, {
-  name: 'MessageChannelContactAutoCreationPolicy',
-});
-
-registerEnumType(MessageFolderImportPolicy, {
-  name: 'MessageFolderImportPolicy',
-});
-
-registerEnumType(MessageChannelPendingGroupEmailsAction, {
-  name: 'MessageChannelPendingGroupEmailsAction',
-});
-
-export class MessageChannelWorkspaceEntity extends BaseWorkspaceEntity {
-  visibility: string;
-  handle: string | null;
-  type: string;
-  isContactAutoCreationEnabled: boolean;
-  contactAutoCreationPolicy: MessageChannelContactAutoCreationPolicy;
-  messageFolderImportPolicy: MessageFolderImportPolicy;
-  excludeNonProfessionalEmails: boolean;
-  excludeGroupEmails: boolean;
-  pendingGroupEmailsAction: MessageChannelPendingGroupEmailsAction;
-  isSyncEnabled: boolean;
-  syncCursor: string | null;
-  syncedAt: string | null;
-  syncStatus: MessageChannelSyncStatus | null;
-  syncStage: MessageChannelSyncStage;
-  syncStageStartedAt: string | null;
-  throttleFailureCount: number;
-  throttleRetryAfter: string | null;
-  connectedAccountId: string;
-  messageChannelMessageAssociations: EntityRelation<
-    MessageChannelMessageAssociationWorkspaceEntity[]
-  >;
-  messageFolders: EntityRelation<MessageFolderWorkspaceEntity[]>;
-}
diff --git a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-folder.workspace-entity.ts b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-folder.workspace-entity.ts
deleted file mode 100644
index 3230770a05..0000000000
--- a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-folder.workspace-entity.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { registerEnumType } from '@nestjs/graphql';
-
-import { MessageFolderPendingSyncAction } from 'twenty-shared/types';
-
-import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
-import { type EntityRelation } from 'src/engine/workspace-manager/workspace-migration/types/entity-relation.interface';
-import { type MessageChannelMessageAssociationMessageFolderWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association-message-folder.workspace-entity';
-
-export { MessageFolderPendingSyncAction };
-
-registerEnumType(MessageFolderPendingSyncAction, {
-  name: 'MessageFolderPendingSyncAction',
-});
-
-export class MessageFolderWorkspaceEntity extends BaseWorkspaceEntity {
-  name: string | null;
-  syncCursor: string | null;
-  isSentFolder: boolean;
-  isSynced: boolean;
-  parentFolderId: string | null;
-  externalId: string | null;
-  pendingSyncAction: MessageFolderPendingSyncAction;
-  messageChannelId: string;
-  messageChannelMessageAssociationMessageFolders: EntityRelation<
-    MessageChannelMessageAssociationMessageFolderWorkspaceEntity[]
-  >;
-}