From 5404a8ba2d5b7ad5383b8c3a7f80bf423b34c630 Mon Sep 17 00:00:00 2001
From: NitinPSingh <71833171+NitinPSingh@users.noreply.github.com>
Date: Fri, 16 Aug 2024 19:01:04 +0530
Subject: [PATCH 1/8] fixes #6499 alignment issue on workspace switcher (#6589)

fix #6499

- fix the size of workspace switcher to 32px from 40px

![Screenshot 2024-08-09
140212](https://github.com/user-attachments/assets/425c9089-8969-4d59-82ef-10572cfa7027)

- fix alignment issues

![Screenshot 2024-08-09
142357](https://github.com/user-attachments/assets/2e3e76f2-8a81-48e9-86ff-691c11215583)

---------

Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
---
 packages/twenty-front/src/hooks/useIsMatchingLocation.ts | 2 +-
 .../src/loading/components/LeftPanelSkeletonLoader.tsx   | 2 +-
 .../emails/components/MessageThreadSubscribersChip.tsx   | 2 +-
 .../utils/generateDefaultRecordChipData.ts               | 2 +-
 .../input/components/MultiSelectFieldInput.tsx           | 4 ++--
 .../components/RecordDetailRelationSection.tsx           | 2 +-
 .../utils/findUnmatchedRequiredFields.ts                 | 9 ++++-----
 .../src/modules/ui/input/components/Toggle.tsx           | 2 +-
 .../navigation-drawer/components/NavigationDrawer.tsx    | 2 +-
 .../components/NavigationDrawerHeader.tsx                | 2 --
 10 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/packages/twenty-front/src/hooks/useIsMatchingLocation.ts b/packages/twenty-front/src/hooks/useIsMatchingLocation.ts
index 044a344068a3..aa57dbb432e3 100644
--- a/packages/twenty-front/src/hooks/useIsMatchingLocation.ts
+++ b/packages/twenty-front/src/hooks/useIsMatchingLocation.ts
@@ -9,7 +9,7 @@ export const useIsMatchingLocation = () => {
   return useCallback(
     (path: string, basePath?: AppBasePath) => {
       const constructedPath = basePath
-        ? new URL(basePath + path, document.location.origin).pathname ?? ''
+        ? (new URL(basePath + path, document.location.origin).pathname ?? '')
         : path;
 
       return !!matchPath(constructedPath, location.pathname);
diff --git a/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx b/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx
index 9a94373cef34..38803c9efecf 100644
--- a/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx
+++ b/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx
@@ -17,7 +17,7 @@ const StyledItemsContainer = styled.div`
   align-items: center;
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 14px;
   height: calc(100dvh - 32px);
   margin-bottom: auto;
   max-width: 204px;
diff --git a/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersChip.tsx b/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersChip.tsx
index d10827215835..6ef97d07b28f 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersChip.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersChip.tsx
@@ -45,7 +45,7 @@ export const MessageThreadSubscribersChip = ({
       ? `+${numberOfMessageThreadSubscribers - MAX_NUMBER_OF_AVATARS}`
       : null;
 
-  const label = isPrivateThread ? privateLabel : moreAvatarsLabel ?? '';
+  const label = isPrivateThread ? privateLabel : (moreAvatarsLabel ?? '');
 
   return (
     <Chip
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/generateDefaultRecordChipData.ts b/packages/twenty-front/src/modules/object-metadata/utils/generateDefaultRecordChipData.ts
index 82fe11744317..5b3acd8698ac 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/generateDefaultRecordChipData.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/generateDefaultRecordChipData.ts
@@ -4,7 +4,7 @@ import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 export const generateDefaultRecordChipData = (record: ObjectRecord) => {
   const name = isFieldFullNameValue(record.name)
     ? record.name.firstName + ' ' + record.name.lastName
-    : record.name ?? '';
+    : (record.name ?? '');
 
   return {
     name,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx
index d36b2b9fbfc4..c6134f911a2d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx
@@ -42,8 +42,8 @@ export const MultiSelectFieldInput = ({
   const [searchFilter, setSearchFilter] = useState('');
   const containerRef = useRef<HTMLDivElement>(null);
 
-  const selectedOptions = fieldDefinition.metadata.options.filter(
-    (option) => fieldValues?.includes(option.value),
+  const selectedOptions = fieldDefinition.metadata.options.filter((option) =>
+    fieldValues?.includes(option.value),
   );
 
   const optionsInDropDown = fieldDefinition.metadata.options;
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
index e59ca3be75fe..426078f807b4 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
@@ -69,7 +69,7 @@ export const RecordDetailRelationSection = ({
   const relationRecords: ObjectRecord[] =
     fieldValue && isToOneObject
       ? [fieldValue as ObjectRecord]
-      : (fieldValue as ObjectRecord[]) ?? [];
+      : ((fieldValue as ObjectRecord[]) ?? []);
 
   const relationRecordIds = relationRecords.map(({ id }) => id);
 
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/utils/findUnmatchedRequiredFields.ts b/packages/twenty-front/src/modules/spreadsheet-import/utils/findUnmatchedRequiredFields.ts
index e7219f70bddf..71af1840263d 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/utils/findUnmatchedRequiredFields.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/utils/findUnmatchedRequiredFields.ts
@@ -6,11 +6,10 @@ export const findUnmatchedRequiredFields = <T extends string>(
   columns: Columns<T>,
 ) =>
   fields
-    .filter(
-      (field) =>
-        field.fieldValidationDefinitions?.some(
-          (validation) => validation.rule === 'required',
-        ),
+    .filter((field) =>
+      field.fieldValidationDefinitions?.some(
+        (validation) => validation.rule === 'required',
+      ),
     )
     .filter(
       (field) =>
diff --git a/packages/twenty-front/src/modules/ui/input/components/Toggle.tsx b/packages/twenty-front/src/modules/ui/input/components/Toggle.tsx
index 9aadab0eb028..f723e93e1c5a 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Toggle.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Toggle.tsx
@@ -16,7 +16,7 @@ type ContainerProps = {
 const StyledContainer = styled.div<ContainerProps>`
   align-items: center;
   background-color: ${({ theme, isOn, color }) =>
-    isOn ? color ?? theme.color.blue : theme.background.quaternary};
+    isOn ? (color ?? theme.color.blue) : theme.background.quaternary};
   border-radius: 10px;
   cursor: pointer;
   display: flex;
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
index 406402377646..92b020a7dc7b 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
@@ -32,7 +32,7 @@ const StyledContainer = styled.div<{ isSubMenu?: boolean }>`
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
-  gap: ${({ theme }) => theme.spacing(3)};
+  gap: ${({ theme }) => theme.spacing(3.5)};
   height: 100%;
   min-width: ${DESKTOP_NAV_DRAWER_WIDTHS.menu}px;
   padding: ${({ theme }) => theme.spacing(3, 2, 4)};
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
index d6bbf810089b..03ae1fcd0ada 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
@@ -15,8 +15,6 @@ const StyledContainer = styled.div<{ isMultiWorkspace: boolean }>`
   display: flex;
   gap: ${({ theme, isMultiWorkspace }) =>
     !isMultiWorkspace ? theme.spacing(2) : null};
-  padding: ${({ theme, isMultiWorkspace }) =>
-    !isMultiWorkspace ? theme.spacing(1) : null};
   height: ${({ theme }) => theme.spacing(8)};
   user-select: none;
 `;

From 20d84755bb37366c449e3890e48cbafa17bc7c56 Mon Sep 17 00:00:00 2001
From: Nabhag Motivaras <65061890+Nabhag8848@users.noreply.github.com>
Date: Fri, 16 Aug 2024 19:48:45 +0530
Subject: [PATCH 2/8] fix: exclude tabler/icons-react from optimizeDeps to
 avoid crashing  performance CI (#6621)

## ISSUE (Warning)

- Fixes #6437

### Things needed to investigate :

- [x] Can we exclude @tabler-icons from Babel / wyw-in-js / the vite
config of Storybook ?
> Yes we can

- [ ] Is there a reproducible difference between non-Linaria components
loading time and Linaria components loading times ?
> Couldn't find anything related to this, yet. but changes fix the
problem.
---
 packages/twenty-front/vite.config.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts
index 924f9c9d7ee0..a711d05916f1 100644
--- a/packages/twenty-front/vite.config.ts
+++ b/packages/twenty-front/vite.config.ts
@@ -104,5 +104,8 @@ export default defineConfig(({ command, mode }) => {
         localsConvention: 'camelCaseOnly',
       },
     },
+    optimizeDeps: {
+      exclude: ['@tabler/icons-react'],
+    },
   };
 });

From db54469c8a70d4dd02de0c80242c751bc2696d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20M?= <jeremy.magrin@gmail.com>
Date: Fri, 16 Aug 2024 21:20:02 +0200
Subject: [PATCH 3/8] feat: soft delete (#6576)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement soft delete on standards and custom objects.
This is a temporary solution, when we drop `pg_graphql` we should rely
on the `softDelete` functions of TypeORM.

---------

Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
---
 packages/twenty-front/.storybook/main.ts      |  11 +
 .../src/generated-metadata/graphql.ts         |  22 +-
 .../twenty-front/src/generated/graphql.tsx    |  24 ++-
 .../components/EventIconDynamicComponent.tsx  |   5 +-
 .../components/EventRowMainObject.tsx         |  11 +
 .../components/InformationBanner.tsx          |  28 +--
 .../InformationBannerDeletedRecord.tsx        |  37 ++++
 .../constants/InformationBannerHeight.ts      |   1 +
 .../hooks/useDeleteManyRecords.ts             |   4 +-
 .../hooks/useDestroyManyRecordMutation.ts     |  41 ++++
 .../hooks/useDestroyManyRecords.ts            | 115 ++++++++++
 .../object-record/hooks/useFindOneRecord.ts   |   3 +
 .../hooks/useFindOneRecordQuery.ts            |  12 ++
 .../hooks/useRestoreManyRecords.ts            |  94 ++++++++
 .../hooks/useRestoreManyRecordsMutation.ts    |  41 ++++
 .../object-filter-dropdown/types/Filter.ts    |   1 +
 .../hooks/useHandleToggleTrashColumnFilter.ts |  67 ++++++
 .../RecordIndexOptionsDropdownContent.tsx     |  15 ++
 .../components/RecordShowContainer.tsx        |  55 +++--
 ...ordForShowPageOperationSignatureFactory.ts |   2 +-
 .../record-show/hooks/useRecordShowPage.ts    |   1 +
 ...DestroyManyRecordsMutationResponseField.ts |   5 +
 ...RestoreManyRecordsMutationResponseField.ts |   5 +
 .../SettingsNavigationDrawerItems.tsx         |   3 +-
 .../components/SettingsPageContainer.tsx      |  18 +-
 .../objects/SettingsObjectCoverImage.tsx      |   3 +-
 ...grationDatabaseConnectionShowContainer.tsx |   3 +-
 ...tegrationEditDatabaseConnectionContent.tsx |   5 +-
 .../twenty-front/src/modules/types/AppPath.ts |   2 +-
 .../ui/input/button/components/Button.tsx     |   1 +
 .../button/components/FloatingButton.tsx      |  12 +-
 .../src/modules/ui/layout/page/PageHeader.tsx |  19 +-
 .../src/modules/ui/layout/page/PagePanel.tsx  |  12 +-
 .../ui/layout/page/SubMenuTopBarContainer.tsx |  15 +-
 .../components/ShowPageMoreButton.tsx         |  59 ++++-
 .../bread-crumb/components/Breadcrumb.tsx     |  10 +-
 .../views/components/SortOrFilterChip.tsx     |  52 ++++-
 .../views/components/VariantFilterChip.tsx    |  30 +++
 .../views/components/ViewBarDetails.tsx       |  47 +++-
 .../src/modules/views/types/ViewFilter.ts     |   1 +
 .../src/pages/settings/Releases.tsx           |   4 +-
 .../src/pages/settings/SettingsProfile.tsx    |  10 +-
 .../src/pages/settings/SettingsWorkspace.tsx  |  10 +-
 .../settings/SettingsWorkspaceMembers.tsx     |   9 +-
 .../settings/accounts/SettingsAccounts.tsx    |   7 +-
 .../accounts/SettingsAccountsCalendars.tsx    |  11 +-
 .../accounts/SettingsAccountsEmails.tsx       |  11 +-
 .../settings/accounts/SettingsNewAccount.tsx  |  11 +-
 .../crm-migration/SettingsCRMMigration.tsx    |  11 +-
 .../settings/data-model/SettingsNewObject.tsx |  43 ++--
 .../SettingsObjectDetailPageContent.tsx       |  18 +-
 .../data-model/SettingsObjectEdit.tsx         |  36 ++--
 .../data-model/SettingsObjectFieldEdit.tsx    |  28 +--
 .../SettingsObjectNewFieldStep1.tsx           |  45 ++--
 .../data-model/SettingsObjectOverview.tsx     |  17 +-
 .../settings/data-model/SettingsObjects.tsx   |  39 ++--
 .../developers/SettingsDevelopers.tsx         |  14 +-
 .../SettingsDevelopersApiKeyDetail.tsx        |  25 +--
 .../api-keys/SettingsDevelopersApiKeysNew.tsx |  45 ++--
 .../SettingsDevelopersWebhookDetail.tsx       |  39 ++--
 .../SettingsDevelopersWebhooksNew.tsx         |  39 ++--
 .../SettingsIntegrationDatabase.tsx           |   8 +-
 ...tingsIntegrationEditDatabaseConnection.tsx |  13 +-
 ...ttingsIntegrationNewDatabaseConnection.tsx |  51 ++---
 .../integrations/SettingsIntegrations.tsx     |   7 +-
 .../components/SettingsAppearance.tsx         |  10 +-
 .../ResetServerlessFunctionStatesEffect.tsx   |   4 +-
 .../SettingsServerlessFunctionDetail.tsx      |  47 ++--
 .../SettingsServerlessFunctions.tsx           |  37 ++--
 .../SettingsServerlessFunctionsNew.tsx        |  53 ++---
 .../twenty-front/src/utils/title-utils.ts     |   4 -
 packages/twenty-front/vite.config.ts          |   3 -
 packages/twenty-server/package.json           |   3 +-
 .../migrations/1723038077987-addSoftDelete.ts |  17 ++
 .../factories/args-string.factory.ts          |   9 +
 .../factories/fields-string.factory.ts        |  11 +-
 .../factories/find-many-query.factory.ts      |   1 +
 .../factories/find-one-query.factory.ts       |   2 +
 .../factories/relation-field-alias.factory.ts |   9 +-
 .../interfaces/record.interface.ts            |   1 +
 ...rkspace-query-builder-options.interface.ts |   1 +
 .../listeners/entity-events-to-db.listener.ts |   9 +-
 .../utils/with-soft-deleted.util.ts           |  29 +++
 .../types/workspace-query-hook.type.ts        |   8 +-
 .../workspace-query-runner.service.ts         | 201 ++++++++++++++++--
 .../destroy-many-resolver.factory.ts          |  42 ++++
 .../factories/factories.ts                    |   6 +
 .../restore-many-resolver.factory.ts          |  42 ++++
 .../workspace-resolvers-builder.interface.ts  |  14 +-
 .../workspace-resolver.factory.ts             |   6 +
 .../factories/root-type.factory.ts            |  22 +-
 .../utils/__tests__/get-resolver-args.spec.ts |   6 +
 .../utils/get-resolver-args.util.ts           |  14 ++
 .../interfaces/object-metadata.interface.ts   |   1 +
 .../object-metadata/object-metadata.entity.ts |   3 +
 .../twenty-orm/base.workspace-entity.ts       |  19 +-
 .../twenty-orm/custom.workspace-entity.ts     |   6 +-
 ...s => workspace-custom-entity.decorator.ts} |   9 +-
 .../decorators/workspace-entity.decorator.ts  |   2 +
 .../workspace-is-primary-field.decorator.ts   |   2 +-
 .../factories/entity-schema-column.factory.ts |   6 +
 .../factories/entity-schema.factory.ts        |   1 +
 ...orkspace-entity-metadata-args.interface.ts |   7 +-
 ...extended-entity-metadata-args.interface.ts |   5 +
 .../utils/__tests__/get-resolver-name.spec.ts |   2 +
 .../engine/utils/get-resolver-name.util.ts    |   4 +
 .../constants/standard-field-ids.ts           |   1 +
 .../factories/standard-field.factory.ts       |   8 +
 .../factories/standard-object.factory.ts      |   1 +
 .../company.workspace-entity.ts               |   1 +
 .../note-target.workspace-entity.ts           |   1 +
 .../standard-objects/note.workspace-entity.ts |   1 +
 .../opportunity.workspace-entity.ts           |   1 +
 .../person.workspace-entity.ts                |   1 +
 .../task-target.workspace-entity.ts           |   1 +
 .../standard-objects/task.workspace-entity.ts |   1 +
 .../src/display/banner/components/Banner.tsx  |  17 +-
 .../display/icon/components/TablerIcons.ts    |   2 +
 118 files changed, 1670 insertions(+), 487 deletions(-)
 create mode 100644 packages/twenty-front/src/modules/information-banner/components/deleted-record/InformationBannerDeletedRecord.tsx
 create mode 100644 packages/twenty-front/src/modules/information-banner/constants/InformationBannerHeight.ts
 create mode 100644 packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecordMutation.ts
 create mode 100644 packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecords.ts
 create mode 100644 packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecords.ts
 create mode 100644 packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecordsMutation.ts
 create mode 100644 packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts
 create mode 100644 packages/twenty-front/src/modules/object-record/utils/getDestroyManyRecordsMutationResponseField.ts
 create mode 100644 packages/twenty-front/src/modules/object-record/utils/getRestoreManyRecordsMutationResponseField.ts
 create mode 100644 packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx
 create mode 100644 packages/twenty-server/src/database/typeorm/metadata/migrations/1723038077987-addSoftDelete.ts
 create mode 100644 packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/with-soft-deleted.util.ts
 create mode 100644 packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-many-resolver.factory.ts
 create mode 100644 packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/restore-many-resolver.factory.ts
 rename packages/twenty-server/src/engine/twenty-orm/decorators/{workspace-custom-object.decorator.ts => workspace-custom-entity.decorator.ts} (63%)

diff --git a/packages/twenty-front/.storybook/main.ts b/packages/twenty-front/.storybook/main.ts
index 633df49b3dae..3bd4d16b2a57 100644
--- a/packages/twenty-front/.storybook/main.ts
+++ b/packages/twenty-front/.storybook/main.ts
@@ -45,5 +45,16 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {},
   },
+  viteFinal: async (config) => {
+    // Merge custom configuration into the default config
+    const { mergeConfig } = await import('vite');
+
+    return mergeConfig(config, {
+      // Add dependencies to pre-optimization
+      optimizeDeps: {
+        exclude: ['@tabler/icons-react'],
+      },
+    });
+  },
 };
 export default config;
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index f3c3f0e781f2..f5e61e07afd5 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -344,9 +344,9 @@ export type FieldConnection = {
 
 /** Type of the field */
 export enum FieldMetadataType {
+  Actor = 'ACTOR',
   Address = 'ADDRESS',
   Boolean = 'BOOLEAN',
-  Actor = 'ACTOR',
   Currency = 'CURRENCY',
   Date = 'DATE',
   DateTime = 'DATE_TIME',
@@ -452,13 +452,13 @@ export type Mutation = {
   generateTransientToken: TransientToken;
   impersonate: Verify;
   renewToken: AuthTokens;
+  runWorkflowVersion: WorkflowTriggerResult;
   sendInviteLink: SendInviteLink;
   signUp: LoginToken;
   skipSyncEmailOnboardingStep: OnboardingStepSuccess;
   syncRemoteTable: RemoteTable;
   syncRemoteTableSchemaChanges: RemoteTable;
   track: Analytics;
-  triggerWorkflow: WorkflowTriggerResult;
   unsyncRemoteTable: RemoteTable;
   updateBillingSubscription: UpdateBillingEntity;
   updateOneField: Field;
@@ -610,6 +610,11 @@ export type MutationRenewTokenArgs = {
 };
 
 
+export type MutationRunWorkflowVersionArgs = {
+  input: RunWorkflowVersionInput;
+};
+
+
 export type MutationSendInviteLinkArgs = {
   emails: Array<Scalars['String']['input']>;
 };
@@ -639,11 +644,6 @@ export type MutationTrackArgs = {
 };
 
 
-export type MutationTriggerWorkflowArgs = {
-  workflowVersionId: Scalars['String']['input'];
-};
-
-
 export type MutationUnsyncRemoteTableArgs = {
   input: RemoteTableInput;
 };
@@ -1001,6 +1001,13 @@ export enum RemoteTableStatus {
   Synced = 'SYNCED'
 }
 
+export type RunWorkflowVersionInput = {
+  /** Execution result in JSON format */
+  payload?: InputMaybe<Scalars['JSON']['input']>;
+  /** Workflow version ID */
+  workflowVersionId: Scalars['String']['input'];
+};
+
 export type SendInviteLink = {
   __typename?: 'SendInviteLink';
   /** Boolean that confirms query was dispatched */
@@ -1400,6 +1407,7 @@ export type WorkspaceFeatureFlagsArgs = {
 export enum WorkspaceActivationStatus {
   Active = 'ACTIVE',
   Inactive = 'INACTIVE',
+  OngoingCreation = 'ONGOING_CREATION',
   PendingCreation = 'PENDING_CREATION'
 }
 
diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
index ce20dd81f9d7..cb973a45cf52 100644
--- a/packages/twenty-front/src/generated/graphql.tsx
+++ b/packages/twenty-front/src/generated/graphql.tsx
@@ -1,5 +1,5 @@
-import * as Apollo from '@apollo/client';
 import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
@@ -249,9 +249,9 @@ export type FieldConnection = {
 
 /** Type of the field */
 export enum FieldMetadataType {
+  Actor = 'ACTOR',
   Address = 'ADDRESS',
   Boolean = 'BOOLEAN',
-  Actor = 'ACTOR',
   Currency = 'CURRENCY',
   Date = 'DATE',
   DateTime = 'DATE_TIME',
@@ -344,11 +344,11 @@ export type Mutation = {
   generateTransientToken: TransientToken;
   impersonate: Verify;
   renewToken: AuthTokens;
+  runWorkflowVersion: WorkflowTriggerResult;
   sendInviteLink: SendInviteLink;
   signUp: LoginToken;
   skipSyncEmailOnboardingStep: OnboardingStepSuccess;
   track: Analytics;
-  triggerWorkflow: WorkflowTriggerResult;
   updateBillingSubscription: UpdateBillingEntity;
   updateOneObject: Object;
   updateOneServerlessFunction: ServerlessFunction;
@@ -457,6 +457,11 @@ export type MutationRenewTokenArgs = {
 };
 
 
+export type MutationRunWorkflowVersionArgs = {
+  input: RunWorkflowVersionInput;
+};
+
+
 export type MutationSendInviteLinkArgs = {
   emails: Array<Scalars['String']>;
 };
@@ -476,11 +481,6 @@ export type MutationTrackArgs = {
 };
 
 
-export type MutationTriggerWorkflowArgs = {
-  workflowVersionId: Scalars['String'];
-};
-
-
 export type MutationUpdateOneObjectArgs = {
   input: UpdateOneObjectInput;
 };
@@ -743,6 +743,13 @@ export enum RemoteTableStatus {
   Synced = 'SYNCED'
 }
 
+export type RunWorkflowVersionInput = {
+  /** Execution result in JSON format */
+  payload?: InputMaybe<Scalars['JSON']>;
+  /** Workflow version ID */
+  workflowVersionId: Scalars['String'];
+};
+
 export type SendInviteLink = {
   __typename?: 'SendInviteLink';
   /** Boolean that confirms query was dispatched */
@@ -1087,6 +1094,7 @@ export type WorkspaceFeatureFlagsArgs = {
 export enum WorkspaceActivationStatus {
   Active = 'ACTIVE',
   Inactive = 'INACTIVE',
+  OngoingCreation = 'ONGOING_CREATION',
   PendingCreation = 'PENDING_CREATION'
 }
 
diff --git a/packages/twenty-front/src/modules/activities/timelineActivities/rows/components/EventIconDynamicComponent.tsx b/packages/twenty-front/src/modules/activities/timelineActivities/rows/components/EventIconDynamicComponent.tsx
index d1b35d7f2293..ecb7bc90d51f 100644
--- a/packages/twenty-front/src/modules/activities/timelineActivities/rows/components/EventIconDynamicComponent.tsx
+++ b/packages/twenty-front/src/modules/activities/timelineActivities/rows/components/EventIconDynamicComponent.tsx
@@ -1,4 +1,4 @@
-import { IconCirclePlus, IconEditCircle, useIcons } from 'twenty-ui';
+import { IconCirclePlus, IconEditCircle, IconTrash, useIcons } from 'twenty-ui';
 
 import { TimelineActivity } from '@/activities/timelineActivities/types/TimelineActivity';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
@@ -19,6 +19,9 @@ export const EventIconDynamicComponent = ({
   if (eventAction === 'updated') {
     return <IconEditCircle />;
   }
+  if (eventAction === 'deleted') {
+    return <IconTrash />;
+  }
 
   const IconComponent = getIcon(linkedObjectMetadataItem?.icon);
 
diff --git a/packages/twenty-front/src/modules/activities/timelineActivities/rows/main-object/components/EventRowMainObject.tsx b/packages/twenty-front/src/modules/activities/timelineActivities/rows/main-object/components/EventRowMainObject.tsx
index f2dcc69055fa..053e9217bb66 100644
--- a/packages/twenty-front/src/modules/activities/timelineActivities/rows/main-object/components/EventRowMainObject.tsx
+++ b/packages/twenty-front/src/modules/activities/timelineActivities/rows/main-object/components/EventRowMainObject.tsx
@@ -45,6 +45,17 @@ export const EventRowMainObject = ({
         />
       );
     }
+    case 'deleted': {
+      return (
+        <StyledMainContainer>
+          <StyledEventRowItemColumn>
+            {labelIdentifierValue}
+          </StyledEventRowItemColumn>
+          <StyledEventRowItemAction>was deleted by</StyledEventRowItemAction>
+          <StyledEventRowItemColumn>{authorFullName}</StyledEventRowItemColumn>
+        </StyledMainContainer>
+      );
+    }
     default:
       return null;
   }
diff --git a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
index 2581dd48934c..39d2437bf6f7 100644
--- a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
@@ -1,6 +1,6 @@
 import { Button } from '@/ui/input/button/components/Button';
 import styled from '@emotion/styled';
-import { Banner, IconComponent } from 'twenty-ui';
+import { Banner, BannerVariant, IconComponent } from 'twenty-ui';
 
 const StyledBanner = styled(Banner)`
   position: absolute;
@@ -14,26 +14,30 @@ const StyledText = styled.div`
 
 export const InformationBanner = ({
   message,
+  variant = 'default',
   buttonTitle,
   buttonIcon,
   buttonOnClick,
 }: {
   message: string;
-  buttonTitle: string;
+  variant?: BannerVariant;
+  buttonTitle?: string;
   buttonIcon?: IconComponent;
-  buttonOnClick: () => void;
+  buttonOnClick?: () => void;
 }) => {
   return (
-    <StyledBanner>
+    <StyledBanner variant={variant}>
       <StyledText>{message}</StyledText>
-      <Button
-        variant="secondary"
-        title={buttonTitle}
-        Icon={buttonIcon}
-        size="small"
-        inverted
-        onClick={buttonOnClick}
-      />
+      {buttonTitle && buttonOnClick && (
+        <Button
+          variant="secondary"
+          title={buttonTitle}
+          Icon={buttonIcon}
+          size="small"
+          inverted
+          onClick={buttonOnClick}
+        />
+      )}
     </StyledBanner>
   );
 };
diff --git a/packages/twenty-front/src/modules/information-banner/components/deleted-record/InformationBannerDeletedRecord.tsx b/packages/twenty-front/src/modules/information-banner/components/deleted-record/InformationBannerDeletedRecord.tsx
new file mode 100644
index 000000000000..1b3eb1270f2f
--- /dev/null
+++ b/packages/twenty-front/src/modules/information-banner/components/deleted-record/InformationBannerDeletedRecord.tsx
@@ -0,0 +1,37 @@
+import { InformationBanner } from '@/information-banner/components/InformationBanner';
+import { useRestoreManyRecords } from '@/object-record/hooks/useRestoreManyRecords';
+import styled from '@emotion/styled';
+import { IconRefresh } from 'twenty-ui';
+
+const StyledInformationBannerDeletedRecord = styled.div`
+  height: 40px;
+  position: relative;
+
+  &:empty {
+    height: 0;
+  }
+`;
+
+export const InformationBannerDeletedRecord = ({
+  recordId,
+  objectNameSingular,
+}: {
+  recordId: string;
+  objectNameSingular: string;
+}) => {
+  const { restoreManyRecords } = useRestoreManyRecords({
+    objectNameSingular,
+  });
+
+  return (
+    <StyledInformationBannerDeletedRecord>
+      <InformationBanner
+        variant="danger"
+        message={`This record has been deleted`}
+        buttonTitle="Restore"
+        buttonIcon={IconRefresh}
+        buttonOnClick={() => restoreManyRecords([recordId])}
+      />
+    </StyledInformationBannerDeletedRecord>
+  );
+};
diff --git a/packages/twenty-front/src/modules/information-banner/constants/InformationBannerHeight.ts b/packages/twenty-front/src/modules/information-banner/constants/InformationBannerHeight.ts
new file mode 100644
index 000000000000..472d20303a55
--- /dev/null
+++ b/packages/twenty-front/src/modules/information-banner/constants/InformationBannerHeight.ts
@@ -0,0 +1 @@
+export const INFORMATION_BANNER_HEIGHT = '40px';
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
index 1d3d82f3fe60..35a65a507765 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
@@ -13,7 +13,7 @@ import { isDefined } from '~/utils/isDefined';
 import { sleep } from '~/utils/sleep';
 import { capitalize } from '~/utils/string/capitalize';
 
-type useDeleteOneRecordProps = {
+type useDeleteManyRecordProps = {
   objectNameSingular: string;
   refetchFindManyQuery?: boolean;
 };
@@ -25,7 +25,7 @@ type DeleteManyRecordsOptions = {
 
 export const useDeleteManyRecords = ({
   objectNameSingular,
-}: useDeleteOneRecordProps) => {
+}: useDeleteManyRecordProps) => {
   const apiConfig = useRecoilValue(apiConfigState);
 
   const mutationPageSize =
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecordMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecordMutation.ts
new file mode 100644
index 000000000000..ee2e06cddc9f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecordMutation.ts
@@ -0,0 +1,41 @@
+import gql from 'graphql-tag';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getDestroyManyRecordsMutationResponseField } from '@/object-record/utils/getDestroyManyRecordsMutationResponseField';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useDestroyManyRecordsMutation = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { destroyManyRecordsMutation: EMPTY_MUTATION };
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.namePlural);
+
+  const mutationResponseField = getDestroyManyRecordsMutationResponseField(
+    objectMetadataItem.namePlural,
+  );
+
+  const destroyManyRecordsMutation = gql`
+    mutation DestroyMany${capitalizedObjectName}($filter: ${capitalize(
+      objectMetadataItem.nameSingular,
+    )}FilterInput!)  {
+      ${mutationResponseField}(filter: $filter) {
+        id
+      }
+    }
+  `;
+
+  return {
+    destroyManyRecordsMutation,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecords.ts
new file mode 100644
index 000000000000..6524374c5efe
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecords.ts
@@ -0,0 +1,115 @@
+import { useApolloClient } from '@apollo/client';
+
+import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
+import { apiConfigState } from '@/client-config/states/apiConfigState';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { DEFAULT_MUTATION_BATCH_SIZE } from '@/object-record/constants/DefaultMutationBatchSize';
+import { useDestroyManyRecordsMutation } from '@/object-record/hooks/useDestroyManyRecordMutation';
+import { getDestroyManyRecordsMutationResponseField } from '@/object-record/utils/getDestroyManyRecordsMutationResponseField';
+import { useRecoilValue } from 'recoil';
+import { isDefined } from '~/utils/isDefined';
+import { sleep } from '~/utils/sleep';
+import { capitalize } from '~/utils/string/capitalize';
+
+type useDestroyManyRecordProps = {
+  objectNameSingular: string;
+  refetchFindManyQuery?: boolean;
+};
+
+type DestroyManyRecordsOptions = {
+  skipOptimisticEffect?: boolean;
+  delayInMsBetweenRequests?: number;
+};
+
+export const useDestroyManyRecords = ({
+  objectNameSingular,
+}: useDestroyManyRecordProps) => {
+  const apiConfig = useRecoilValue(apiConfigState);
+
+  const mutationPageSize =
+    apiConfig?.mutationMaximumAffectedRecords ?? DEFAULT_MUTATION_BATCH_SIZE;
+
+  const apolloClient = useApolloClient();
+
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular,
+  });
+
+  const { destroyManyRecordsMutation } = useDestroyManyRecordsMutation({
+    objectNameSingular,
+  });
+
+  const { objectMetadataItems } = useObjectMetadataItems();
+
+  const mutationResponseField = getDestroyManyRecordsMutationResponseField(
+    objectMetadataItem.namePlural,
+  );
+
+  const destroyManyRecords = async (
+    idsToDestroy: string[],
+    options?: DestroyManyRecordsOptions,
+  ) => {
+    const numberOfBatches = Math.ceil(idsToDestroy.length / mutationPageSize);
+
+    const destroyedRecords = [];
+
+    for (let batchIndex = 0; batchIndex < numberOfBatches; batchIndex++) {
+      const batchIds = idsToDestroy.slice(
+        batchIndex * mutationPageSize,
+        (batchIndex + 1) * mutationPageSize,
+      );
+
+      const destroyedRecordsResponse = await apolloClient.mutate({
+        mutation: destroyManyRecordsMutation,
+        variables: {
+          filter: { id: { in: batchIds } },
+        },
+        optimisticResponse: options?.skipOptimisticEffect
+          ? undefined
+          : {
+              [mutationResponseField]: batchIds.map((idToDestroy) => ({
+                __typename: capitalize(objectNameSingular),
+                id: idToDestroy,
+              })),
+            },
+        update: options?.skipOptimisticEffect
+          ? undefined
+          : (cache, { data }) => {
+              const records = data?.[mutationResponseField];
+
+              if (!records?.length) return;
+
+              const cachedRecords = records
+                .map((record) => getRecordFromCache(record.id, cache))
+                .filter(isDefined);
+
+              triggerDeleteRecordsOptimisticEffect({
+                cache,
+                objectMetadataItem,
+                recordsToDelete: cachedRecords,
+                objectMetadataItems,
+              });
+            },
+      });
+
+      const destroyedRecordsForThisBatch =
+        destroyedRecordsResponse.data?.[mutationResponseField] ?? [];
+
+      destroyedRecords.push(...destroyedRecordsForThisBatch);
+
+      if (isDefined(options?.delayInMsBetweenRequests)) {
+        await sleep(options.delayInMsBetweenRequests);
+      }
+    }
+
+    return destroyedRecords;
+  };
+
+  return { destroyManyRecords };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
index 76c9645bd850..0ddbde032ac3 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
@@ -17,11 +17,13 @@ export const useFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
   recordGqlFields,
   onCompleted,
   skip,
+  withSoftDeleted = false,
 }: ObjectMetadataItemIdentifier & {
   objectRecordId: string | undefined;
   recordGqlFields?: RecordGqlOperationGqlRecordFields;
   onCompleted?: (data: T) => void;
   skip?: boolean;
+  withSoftDeleted?: boolean;
 }) => {
   const { objectMetadataItem } = useObjectMetadataItem({
     objectNameSingular,
@@ -33,6 +35,7 @@ export const useFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
   const { findOneRecordQuery } = useFindOneRecordQuery({
     objectNameSingular,
     recordGqlFields: computedRecordGqlFields,
+    withSoftDeleted,
   });
 
   const { data, loading, error } = useQuery<{
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts
index 725ec05d9c3c..b67b28e52d11 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts
@@ -10,9 +10,11 @@ import { capitalize } from '~/utils/string/capitalize';
 export const useFindOneRecordQuery = ({
   objectNameSingular,
   recordGqlFields,
+  withSoftDeleted = false,
 }: {
   objectNameSingular: string;
   recordGqlFields?: RecordGqlOperationGqlRecordFields;
+  withSoftDeleted?: boolean;
 }) => {
   const { objectMetadataItem } = useObjectMetadataItem({
     objectNameSingular,
@@ -25,6 +27,16 @@ export const useFindOneRecordQuery = ({
         objectMetadataItem.nameSingular,
       )}($objectRecordId: ID!) {
         ${objectMetadataItem.nameSingular}(filter: {
+        ${
+          withSoftDeleted
+            ? `
+          or: [
+            { deletedAt: { is: NULL } },
+            { deletedAt: { is: NOT_NULL } }
+          ],
+        `
+            : ''
+        }
           id: {
             eq: $objectRecordId
           }
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecords.ts
new file mode 100644
index 000000000000..f1fb1c17c13c
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecords.ts
@@ -0,0 +1,94 @@
+import { useApolloClient } from '@apollo/client';
+
+import { apiConfigState } from '@/client-config/states/apiConfigState';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { DEFAULT_MUTATION_BATCH_SIZE } from '@/object-record/constants/DefaultMutationBatchSize';
+import { useRestoreManyRecordsMutation } from '@/object-record/hooks/useRestoreManyRecordsMutation';
+import { getRestoreManyRecordsMutationResponseField } from '@/object-record/utils/getRestoreManyRecordsMutationResponseField';
+import { useRecoilValue } from 'recoil';
+import { isDefined } from '~/utils/isDefined';
+import { sleep } from '~/utils/sleep';
+import { capitalize } from '~/utils/string/capitalize';
+
+type useRestoreManyRecordProps = {
+  objectNameSingular: string;
+  refetchFindManyQuery?: boolean;
+};
+
+type RestoreManyRecordsOptions = {
+  skipOptimisticEffect?: boolean;
+  delayInMsBetweenRequests?: number;
+};
+
+export const useRestoreManyRecords = ({
+  objectNameSingular,
+}: useRestoreManyRecordProps) => {
+  const apiConfig = useRecoilValue(apiConfigState);
+
+  const mutationPageSize =
+    apiConfig?.mutationMaximumAffectedRecords ?? DEFAULT_MUTATION_BATCH_SIZE;
+
+  const apolloClient = useApolloClient();
+
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { restoreManyRecordsMutation } = useRestoreManyRecordsMutation({
+    objectNameSingular,
+  });
+
+  const mutationResponseField = getRestoreManyRecordsMutationResponseField(
+    objectMetadataItem.namePlural,
+  );
+
+  const restoreManyRecords = async (
+    idsToRestore: string[],
+    options?: RestoreManyRecordsOptions,
+  ) => {
+    const numberOfBatches = Math.ceil(idsToRestore.length / mutationPageSize);
+
+    const restoredRecords = [];
+
+    for (let batchIndex = 0; batchIndex < numberOfBatches; batchIndex++) {
+      const batchIds = idsToRestore.slice(
+        batchIndex * mutationPageSize,
+        (batchIndex + 1) * mutationPageSize,
+      );
+
+      // TODO: fix optimistic effect
+      const findOneQueryName = `FindOne${capitalize(objectNameSingular)}`;
+      const findManyQueryName = `FindMany${capitalize(objectMetadataItem.namePlural)}`;
+
+      const restoredRecordsResponse = await apolloClient.mutate({
+        mutation: restoreManyRecordsMutation,
+        refetchQueries: [findOneQueryName, findManyQueryName],
+        variables: {
+          filter: { id: { in: batchIds } },
+        },
+        optimisticResponse: options?.skipOptimisticEffect
+          ? undefined
+          : {
+              [mutationResponseField]: batchIds.map((idToRestore) => ({
+                __typename: capitalize(objectNameSingular),
+                id: idToRestore,
+                deletedAt: null,
+              })),
+            },
+      });
+
+      const restoredRecordsForThisBatch =
+        restoredRecordsResponse.data?.[mutationResponseField] ?? [];
+
+      restoredRecords.push(...restoredRecordsForThisBatch);
+
+      if (isDefined(options?.delayInMsBetweenRequests)) {
+        await sleep(options.delayInMsBetweenRequests);
+      }
+    }
+
+    return restoredRecords;
+  };
+
+  return { restoreManyRecords };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecordsMutation.ts b/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecordsMutation.ts
new file mode 100644
index 000000000000..baafc3a18a0d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/hooks/useRestoreManyRecordsMutation.ts
@@ -0,0 +1,41 @@
+import gql from 'graphql-tag';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getRestoreManyRecordsMutationResponseField } from '@/object-record/utils/getRestoreManyRecordsMutationResponseField';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useRestoreManyRecordsMutation = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { restoreManyRecordsMutation: EMPTY_MUTATION };
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.namePlural);
+
+  const mutationResponseField = getRestoreManyRecordsMutationResponseField(
+    objectMetadataItem.namePlural,
+  );
+
+  const restoreManyRecordsMutation = gql`
+    mutation RestoreMany${capitalizedObjectName}($filter: ${capitalize(
+      objectMetadataItem.nameSingular,
+    )}FilterInput!)  {
+      ${mutationResponseField}(filter: $filter) {
+        id
+      }
+    }
+  `;
+
+  return {
+    restoreManyRecordsMutation,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/Filter.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/Filter.ts
index 862e99bed5f4..52ed99ac5531 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/Filter.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/Filter.ts
@@ -4,6 +4,7 @@ import { FilterDefinition } from './FilterDefinition';
 
 export type Filter = {
   id: string;
+  variant?: 'default' | 'danger';
   fieldMetadataId: string;
   value: string;
   displayValue: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts
new file mode 100644
index 000000000000..170e912d726c
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts
@@ -0,0 +1,67 @@
+import { useCallback } from 'react';
+import { v4 } from 'uuid';
+
+import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { getFilterTypeFromFieldType } from '@/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions';
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { useCombinedViewFilters } from '@/views/hooks/useCombinedViewFilters';
+import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+import { isDefined } from '~/utils/isDefined';
+
+type UseHandleToggleTrashColumnFilterProps = {
+  objectNameSingular: string;
+  viewBarId: string;
+};
+
+export const useHandleToggleTrashColumnFilter = ({
+  viewBarId,
+  objectNameSingular,
+}: UseHandleToggleTrashColumnFilterProps) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { columnDefinitions } =
+    useColumnDefinitionsFromFieldMetadata(objectMetadataItem);
+
+  const { upsertCombinedViewFilter } = useCombinedViewFilters(viewBarId);
+
+  const handleToggleTrashColumnFilter = useCallback(() => {
+    const trashFieldMetadata = objectMetadataItem.fields.find(
+      (field) => field.name === 'deletedAt',
+    );
+
+    if (!isDefined(trashFieldMetadata)) return;
+
+    const correspondingColumnDefinition = columnDefinitions.find(
+      (columnDefinition) =>
+        columnDefinition.fieldMetadataId === trashFieldMetadata.id,
+    );
+
+    if (!isDefined(correspondingColumnDefinition)) return;
+
+    const filterType = getFilterTypeFromFieldType(
+      correspondingColumnDefinition?.type,
+    );
+
+    const newFilter: Filter = {
+      id: v4(),
+      variant: 'danger',
+      fieldMetadataId: trashFieldMetadata.id,
+      operand: ViewFilterOperand.IsNotEmpty,
+      displayValue: '',
+      definition: {
+        label: 'Trash',
+        iconName: 'IconTrash',
+        fieldMetadataId: trashFieldMetadata.id,
+        type: filterType,
+      },
+      value: '',
+    };
+
+    upsertCombinedViewFilter(newFilter);
+  }, [columnDefinitions, objectMetadataItem.fields, upsertCombinedViewFilter]);
+
+  return handleToggleTrashColumnFilter;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx
index 29e15b03a7ac..8a2201d8192a 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx
@@ -8,6 +8,7 @@ import {
   IconFileImport,
   IconSettings,
   IconTag,
+  IconTrash,
 } from 'twenty-ui';
 
 import { useObjectNamePluralFromSingular } from '@/object-metadata/hooks/useObjectNamePluralFromSingular';
@@ -37,6 +38,7 @@ import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { ViewType } from '@/views/types/ViewType';
 import { useLocation } from 'react-router-dom';
 import { useSetRecoilState } from 'recoil';
+import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
 
 type RecordIndexOptionsMenu = 'fields' | 'hiddenFields';
 
@@ -88,6 +90,11 @@ export const RecordIndexOptionsDropdownContent = ({
     hiddenTableColumns,
   } = useRecordIndexOptionsForTable(recordIndexId);
 
+  const handleToggleTrashColumnFilter = useHandleToggleTrashColumnFilter({
+    objectNameSingular,
+    viewBarId: recordIndexId,
+  });
+
   const {
     visibleBoardFields,
     hiddenBoardFields,
@@ -153,6 +160,14 @@ export const RecordIndexOptionsDropdownContent = ({
             LeftIcon={IconFileExport}
             text={displayedExportProgress(progress)}
           />
+          <MenuItem
+            onClick={() => {
+              handleToggleTrashColumnFilter();
+              closeDropdown();
+            }}
+            LeftIcon={IconTrash}
+            text="Trash"
+          />
         </DropdownMenuItemsContainer>
       )}
       {currentMenu === 'fields' && (
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx
index ae6a92be30c0..505dfae807c5 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx
@@ -4,6 +4,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 import { ActivityTargetsInlineCell } from '@/activities/inline-cell/components/ActivityTargetsInlineCell';
 import { Note } from '@/activities/types/Note';
 import { Task } from '@/activities/types/Task';
+import { InformationBannerDeletedRecord } from '@/information-banner/components/deleted-record/InformationBannerDeletedRecord';
 import { useLabelIdentifierFieldMetadataItem } from '@/object-metadata/hooks/useLabelIdentifierFieldMetadataItem';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -126,7 +127,11 @@ export const RecordShowContainer = ({
     );
 
   const { inlineFieldMetadataItems, relationFieldMetadataItems } = groupBy(
-    availableFieldMetadataItems,
+    availableFieldMetadataItems.filter(
+      (fieldMetadataItem) =>
+        fieldMetadataItem.name !== 'createdAt' &&
+        fieldMetadataItem.name !== 'deletedAt',
+    ),
     (fieldMetadataItem) =>
       fieldMetadataItem.type === FieldMetadataType.Relation
         ? 'relationFieldMetadataItems'
@@ -301,25 +306,33 @@ export const RecordShowContainer = ({
   );
 
   return (
-    <ShowPageContainer>
-      <ShowPageLeftContainer forceMobile={isMobile}>
-        {!isMobile && summaryCard}
-        {!isMobile && fieldsBox}
-      </ShowPageLeftContainer>
-      <ShowPageRightContainer
-        targetableObject={{
-          id: objectRecordId,
-          targetObjectNameSingular: objectMetadataItem?.nameSingular,
-        }}
-        timeline
-        tasks
-        notes
-        emails
-        isInRightDrawer={isInRightDrawer}
-        summaryCard={isMobile ? summaryCard : <></>}
-        fieldsBox={fieldsBox}
-        loading={isPrefetchLoading || loading || recordLoading}
-      />
-    </ShowPageContainer>
+    <>
+      {recordFromStore && recordFromStore.deletedAt && (
+        <InformationBannerDeletedRecord
+          recordId={objectRecordId}
+          objectNameSingular={objectNameSingular}
+        />
+      )}
+      <ShowPageContainer>
+        <ShowPageLeftContainer forceMobile={isMobile}>
+          {!isMobile && summaryCard}
+          {!isMobile && fieldsBox}
+        </ShowPageLeftContainer>
+        <ShowPageRightContainer
+          targetableObject={{
+            id: objectRecordId,
+            targetObjectNameSingular: objectMetadataItem?.nameSingular,
+          }}
+          timeline
+          tasks
+          notes
+          emails
+          isInRightDrawer={isInRightDrawer}
+          summaryCard={isMobile ? summaryCard : <></>}
+          fieldsBox={fieldsBox}
+          loading={isPrefetchLoading || loading || recordLoading}
+        />
+      </ShowPageContainer>
+    </>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-show/graphql/operations/factories/findOneRecordForShowPageOperationSignatureFactory.ts b/packages/twenty-front/src/modules/object-record/record-show/graphql/operations/factories/findOneRecordForShowPageOperationSignatureFactory.ts
index 510c1f7a5d47..f9ed0579c3ba 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/graphql/operations/factories/findOneRecordForShowPageOperationSignatureFactory.ts
+++ b/packages/twenty-front/src/modules/object-record/record-show/graphql/operations/factories/findOneRecordForShowPageOperationSignatureFactory.ts
@@ -29,7 +29,7 @@ export const buildFindOneRecordForShowPageOperationSignature: RecordGqlOperation
             },
           }
         : {}),
-      ...(objectMetadataItem.nameSingular === 'Note'
+      ...(objectMetadataItem.nameSingular === CoreObjectNameSingular.Note
         ? {
             noteTargets: {
               id: true,
diff --git a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts
index 667f4eac13b5..7bdaf0b4284b 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts
+++ b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts
@@ -50,6 +50,7 @@ export const useRecordShowPage = (
     objectRecordId,
     objectNameSingular,
     recordGqlFields: FIND_ONE_RECORD_FOR_SHOW_PAGE_OPERATION_SIGNATURE.fields,
+    withSoftDeleted: true,
   });
 
   useEffect(() => {
diff --git a/packages/twenty-front/src/modules/object-record/utils/getDestroyManyRecordsMutationResponseField.ts b/packages/twenty-front/src/modules/object-record/utils/getDestroyManyRecordsMutationResponseField.ts
new file mode 100644
index 000000000000..04f102f30754
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/getDestroyManyRecordsMutationResponseField.ts
@@ -0,0 +1,5 @@
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getDestroyManyRecordsMutationResponseField = (
+  objectNamePlural: string,
+) => `destroy${capitalize(objectNamePlural)}`;
diff --git a/packages/twenty-front/src/modules/object-record/utils/getRestoreManyRecordsMutationResponseField.ts b/packages/twenty-front/src/modules/object-record/utils/getRestoreManyRecordsMutationResponseField.ts
new file mode 100644
index 000000000000..ac375b79e1f0
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/getRestoreManyRecordsMutationResponseField.ts
@@ -0,0 +1,5 @@
+import { capitalize } from '~/utils/string/capitalize';
+
+export const getRestoreManyRecordsMutationResponseField = (
+  objectNamePlural: string,
+) => `restore${capitalize(objectNamePlural)}`;
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
index c87f636a66d5..f68981a195e6 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
@@ -7,13 +7,13 @@ import {
   IconColorSwatch,
   IconCurrencyDollar,
   IconDoorEnter,
+  IconFunction,
   IconHierarchy2,
   IconMail,
   IconRocket,
   IconSettings,
   IconUserCircle,
   IconUsers,
-  IconFunction,
 } from 'twenty-ui';
 
 import { useAuth } from '@/auth/hooks/useAuth';
@@ -49,7 +49,6 @@ export const SettingsNavigationDrawerItems = () => {
           path={SettingsPath.Appearance}
           Icon={IconColorSwatch}
         />
-
         <NavigationDrawerItemGroup>
           <SettingsNavigationDrawerItem
             label="Accounts"
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsx b/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsx
index c49ff35df80d..d25c530762c6 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsx
@@ -1,9 +1,12 @@
 import styled from '@emotion/styled';
+import { ReactNode } from 'react';
 
 import { OBJECT_SETTINGS_WIDTH } from '@/settings/data-model/constants/ObjectSettings';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { isDefined } from '~/utils/isDefined';
 
+import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
+
 const StyledSettingsPageContainer = styled.div<{ width?: number }>`
   display: flex;
   flex-direction: column;
@@ -21,4 +24,17 @@ const StyledSettingsPageContainer = styled.div<{ width?: number }>`
   }};
 `;
 
-export { StyledSettingsPageContainer as SettingsPageContainer };
+const StyledScrollWrapper = styled(ScrollWrapper)`
+  background-color: ${({ theme }) => theme.background.secondary};
+  border-radius: ${({ theme }) => theme.border.radius.md};
+`;
+
+export const SettingsPageContainer = ({
+  children,
+}: {
+  children: ReactNode;
+}) => (
+  <StyledScrollWrapper>
+    <StyledSettingsPageContainer>{children}</StyledSettingsPageContainer>
+  </StyledScrollWrapper>
+);
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectCoverImage.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectCoverImage.tsx
index 23be86ff8ca0..87ce82a443ea 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectCoverImage.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/SettingsObjectCoverImage.tsx
@@ -4,6 +4,7 @@ import { IconEye } from 'twenty-ui';
 import { FloatingButton } from '@/ui/input/button/components/FloatingButton';
 import { Card } from '@/ui/layout/card/components/Card';
 
+import { SettingsPath } from '@/types/SettingsPath';
 import DarkCoverImage from '../assets/cover-dark.png';
 import LightCoverImage from '../assets/cover-light.png';
 
@@ -34,7 +35,7 @@ export const SettingsObjectCoverImage = () => {
           Icon={IconEye}
           title="Visualize"
           size="small"
-          to="/settings/objects/overview"
+          to={'/settings/' + SettingsPath.ObjectOverview}
         />
       </StyledButtonContainer>
     </StyledCoverImageContainer>
diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx
index 03b733e4a94e..1e2b75d7c2b6 100644
--- a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx
@@ -1,5 +1,5 @@
-import { useNavigate } from 'react-router-dom';
 import { Section } from '@react-email/components';
+import { useNavigate } from 'react-router-dom';
 import { H2Title } from 'twenty-ui';
 
 import { useDeleteOneDatabaseConnection } from '@/databases/hooks/useDeleteOneDatabaseConnection';
@@ -31,6 +31,7 @@ export const SettingsIntegrationDatabaseConnectionShowContainer = () => {
     SettingsPath.Integrations,
   );
 
+  // TODO: move breadcrumb to header?
   return (
     <>
       <Breadcrumb
diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx
index b454a31b0421..b1b3ae1a03fb 100644
--- a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx
+++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx
@@ -1,8 +1,8 @@
-import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router-dom';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Section } from '@react-email/components';
 import pick from 'lodash.pick';
+import { FormProvider, useForm } from 'react-hook-form';
+import { useNavigate } from 'react-router-dom';
 import { H2Title } from 'twenty-ui';
 import { z } from 'zod';
 
@@ -94,6 +94,7 @@ export const SettingsIntegrationEditDatabaseConnectionContent = ({
     }
   };
 
+  // TODO: move breadcrumb to header?
   return (
     <>
       <FormProvider
diff --git a/packages/twenty-front/src/modules/types/AppPath.ts b/packages/twenty-front/src/modules/types/AppPath.ts
index 5aab0b7e2ef6..dbbab7ad239e 100644
--- a/packages/twenty-front/src/modules/types/AppPath.ts
+++ b/packages/twenty-front/src/modules/types/AppPath.ts
@@ -15,7 +15,7 @@ export enum AppPath {
 
   // Onboarded
   Index = '/',
-  TasksPage = '/tasks',
+  TasksPage = '/objects/tasks',
   OpportunitiesPage = '/objects/opportunities',
 
   RecordIndexPage = '/objects/:objectNamePlural',
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx b/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx
index a90daab5bb9d..de07f830399a 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/Button.tsx
@@ -336,6 +336,7 @@ const StyledButton = styled('button', {
   flex-direction: row;
   font-family: ${({ theme }) => theme.font.family};
   font-weight: 500;
+  font-size: ${({ theme }) => theme.font.size.md};
   gap: ${({ theme }) => theme.spacing(1)};
   height: ${({ size }) => (size === 'small' ? '24px' : '32px')};
   justify-content: ${({ justify }) => justify};
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/FloatingButton.tsx b/packages/twenty-front/src/modules/ui/input/button/components/FloatingButton.tsx
index 7904445a54c6..820da15de574 100644
--- a/packages/twenty-front/src/modules/ui/input/button/components/FloatingButton.tsx
+++ b/packages/twenty-front/src/modules/ui/input/button/components/FloatingButton.tsx
@@ -1,3 +1,4 @@
+import isPropValid from '@emotion/is-prop-valid';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { Link } from 'react-router-dom';
@@ -19,12 +20,11 @@ export type FloatingButtonProps = {
   to?: string;
 };
 
-const shouldForwardProp = (prop: string) =>
-  !['applyBlur', 'applyShadow', 'focus', 'position', 'size', 'to'].includes(
-    prop,
-  );
-
-const StyledButton = styled('button', { shouldForwardProp })<
+const StyledButton = styled('button', {
+  shouldForwardProp: (prop) =>
+    !['applyBlur', 'applyShadow', 'focus', 'position', 'size'].includes(prop) &&
+    isPropValid(prop),
+})<
   Pick<
     FloatingButtonProps,
     | 'size'
diff --git a/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx b/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx
index ae60265f63b5..f9f9a1046e9c 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx
@@ -1,6 +1,6 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { ComponentProps, ReactNode } from 'react';
+import { ReactNode } from 'react';
 import { useRecoilValue } from 'recoil';
 import {
   IconChevronDown,
@@ -18,7 +18,7 @@ import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 
 export const PAGE_BAR_MIN_HEIGHT = 40;
 
-const StyledTopBarContainer = styled.div`
+const StyledTopBarContainer = styled.div<{ width?: number }>`
   align-items: center;
   background: ${({ theme }) => theme.background.noisy};
   color: ${({ theme }) => theme.font.color.primary};
@@ -31,6 +31,7 @@ const StyledTopBarContainer = styled.div`
   padding-left: 0;
   padding-right: ${({ theme }) => theme.spacing(3)};
   z-index: 20;
+  width: ${({ width }) => width + 'px' || '100%'};
 
   @media (max-width: ${MOBILE_VIEWPORT}px) {
     padding-left: ${({ theme }) => theme.spacing(3)};
@@ -76,8 +77,8 @@ const StyledTopBarButtonContainer = styled.div`
   margin-right: ${({ theme }) => theme.spacing(1)};
 `;
 
-type PageHeaderProps = ComponentProps<'div'> & {
-  title: string;
+type PageHeaderProps = {
+  title: ReactNode;
   hasClosePageButton?: boolean;
   onClosePage?: () => void;
   hasPaginationButtons?: boolean;
@@ -87,6 +88,7 @@ type PageHeaderProps = ComponentProps<'div'> & {
   navigateToNextRecord?: () => void;
   Icon: IconComponent;
   children?: ReactNode;
+  width?: number;
 };
 
 export const PageHeader = ({
@@ -100,13 +102,14 @@ export const PageHeader = ({
   navigateToNextRecord,
   Icon,
   children,
+  width,
 }: PageHeaderProps) => {
   const isMobile = useIsMobile();
   const theme = useTheme();
   const isNavigationDrawerOpen = useRecoilValue(isNavigationDrawerOpenState);
 
   return (
-    <StyledTopBarContainer>
+    <StyledTopBarContainer width={width}>
       <StyledLeftContainer>
         {!isMobile && !isNavigationDrawerOpen && (
           <StyledTopBarButtonContainer>
@@ -143,7 +146,11 @@ export const PageHeader = ({
           )}
           {Icon && <Icon size={theme.icon.size.md} />}
           <StyledTitleContainer data-testid="top-bar-title">
-            <OverflowingTextWithTooltip text={title} />
+            {typeof title === 'string' ? (
+              <OverflowingTextWithTooltip text={title} />
+            ) : (
+              title
+            )}
           </StyledTitleContainer>
         </StyledTopBarIconStyledTitleContainer>
       </StyledLeftContainer>
diff --git a/packages/twenty-front/src/modules/ui/layout/page/PagePanel.tsx b/packages/twenty-front/src/modules/ui/layout/page/PagePanel.tsx
index 92a917a7181b..14cf6b0dfe12 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/PagePanel.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/PagePanel.tsx
@@ -1,15 +1,21 @@
-import React from 'react';
 import styled from '@emotion/styled';
+import React from 'react';
 
 const StyledPanel = styled.div`
   background: ${({ theme }) => theme.background.primary};
   border: 1px solid ${({ theme }) => theme.border.color.medium};
   border-radius: ${({ theme }) => theme.border.radius.md};
   height: 100%;
-  overflow: auto;
+  overflow-x: auto;
+  overflow-y: hidden;
   width: 100%;
 `;
 
-export const PagePanel = ({ children }: { children: React.ReactNode }) => (
+type PagePanelProps = {
+  children: React.ReactNode;
+  hasInformationBar?: boolean;
+};
+
+export const PagePanel = ({ children }: PagePanelProps) => (
   <StyledPanel>{children}</StyledPanel>
 );
diff --git a/packages/twenty-front/src/modules/ui/layout/page/SubMenuTopBarContainer.tsx b/packages/twenty-front/src/modules/ui/layout/page/SubMenuTopBarContainer.tsx
index de229145dc84..8df4797d8199 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/SubMenuTopBarContainer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/SubMenuTopBarContainer.tsx
@@ -1,16 +1,18 @@
 import styled from '@emotion/styled';
-import { JSX } from 'react';
+import { JSX, ReactNode } from 'react';
 import { IconComponent } from 'twenty-ui';
 
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 
 import { InformationBannerWrapper } from '@/information-banner/components/InformationBannerWrapper';
+import { OBJECT_SETTINGS_WIDTH } from '@/settings/data-model/constants/ObjectSettings';
 import { PageBody } from './PageBody';
 import { PageHeader } from './PageHeader';
 
 type SubMenuTopBarContainerProps = {
   children: JSX.Element | JSX.Element[];
-  title: string;
+  title: string | ReactNode;
+  actionButton?: ReactNode;
   Icon: IconComponent;
   className?: string;
 };
@@ -25,6 +27,7 @@ const StyledContainer = styled.div<{ isMobile: boolean }>`
 export const SubMenuTopBarContainer = ({
   children,
   title,
+  actionButton,
   Icon,
   className,
 }: SubMenuTopBarContainerProps) => {
@@ -32,7 +35,13 @@ export const SubMenuTopBarContainer = ({
 
   return (
     <StyledContainer isMobile={isMobile} className={className}>
-      {isMobile && <PageHeader title={title} Icon={Icon} />}
+      <PageHeader
+        title={title}
+        Icon={Icon}
+        width={OBJECT_SETTINGS_WIDTH + 4 * 8}
+      >
+        {actionButton}
+      </PageHeader>
       <PageBody>
         <InformationBannerWrapper />
         {children}
diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageMoreButton.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageMoreButton.tsx
index 166b568c85ee..9cecd4558277 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageMoreButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageMoreButton.tsx
@@ -1,7 +1,7 @@
-import { useNavigate } from 'react-router-dom';
 import styled from '@emotion/styled';
-import { useRecoilValue } from 'recoil';
-import { IconDotsVertical, IconTrash } from 'twenty-ui';
+import { useNavigate } from 'react-router-dom';
+import { useRecoilState, useRecoilValue } from 'recoil';
+import { IconDotsVertical, IconRestore, IconTrash } from 'twenty-ui';
 
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
@@ -11,6 +11,9 @@ import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
 
+import { useDestroyManyRecords } from '@/object-record/hooks/useDestroyManyRecords';
+import { useRestoreManyRecords } from '@/object-record/hooks/useRestoreManyRecords';
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { Dropdown } from '../../dropdown/components/Dropdown';
 import { DropdownMenu } from '../../dropdown/components/DropdownMenu';
 
@@ -32,6 +35,12 @@ export const ShowPageMoreButton = ({
   const { deleteOneRecord } = useDeleteOneRecord({
     objectNameSingular,
   });
+  const { destroyManyRecords } = useDestroyManyRecords({
+    objectNameSingular,
+  });
+  const { restoreManyRecords } = useRestoreManyRecords({
+    objectNameSingular,
+  });
 
   const handleDelete = () => {
     deleteOneRecord(recordId);
@@ -39,6 +48,21 @@ export const ShowPageMoreButton = ({
     navigate(navigationMemorizedUrl, { replace: true });
   };
 
+  const handleDestroy = () => {
+    destroyManyRecords([recordId]);
+    closeDropdown();
+    navigate(navigationMemorizedUrl, { replace: true });
+  };
+
+  const handleRestore = () => {
+    restoreManyRecords([recordId]);
+    closeDropdown();
+  };
+
+  const [recordFromStore] = useRecoilState<any>(
+    recordStoreFamilyState(recordId),
+  );
+
   return (
     <StyledContainer>
       <Dropdown
@@ -56,12 +80,29 @@ export const ShowPageMoreButton = ({
         dropdownComponents={
           <DropdownMenu>
             <DropdownMenuItemsContainer>
-              <MenuItem
-                onClick={handleDelete}
-                accent="danger"
-                LeftIcon={IconTrash}
-                text="Delete"
-              />
+              {recordFromStore && !recordFromStore.deletedAt && (
+                <MenuItem
+                  onClick={handleDelete}
+                  accent="danger"
+                  LeftIcon={IconTrash}
+                  text="Delete"
+                />
+              )}
+              {recordFromStore && recordFromStore.deletedAt && (
+                <>
+                  <MenuItem
+                    onClick={handleDestroy}
+                    accent="danger"
+                    LeftIcon={IconTrash}
+                    text="Destroy"
+                  />
+                  <MenuItem
+                    onClick={handleRestore}
+                    LeftIcon={IconRestore}
+                    text="Restore"
+                  />
+                </>
+              )}
             </DropdownMenuItemsContainer>
           </DropdownMenu>
         }
diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx
index 099f3022e15c..d06cfc8263ca 100644
--- a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/Breadcrumb.tsx
@@ -1,6 +1,6 @@
+import styled from '@emotion/styled';
 import { Fragment } from 'react';
 import { Link } from 'react-router-dom';
-import styled from '@emotion/styled';
 
 type BreadcrumbProps = {
   className?: string;
@@ -9,10 +9,10 @@ type BreadcrumbProps = {
 
 const StyledWrapper = styled.nav`
   align-items: center;
-  color: ${({ theme }) => theme.font.color.extraLight};
+  color: ${({ theme }) => theme.font.color.secondary};
   display: flex;
-  font-size: ${({ theme }) => theme.font.size.lg};
-  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+  font-size: ${({ theme }) => theme.font.size.md};
+  // font-weight: ${({ theme }) => theme.font.weight.semiBold};
   gap: ${({ theme }) => theme.spacing(2)};
   line-height: ${({ theme }) => theme.text.lineHeight.lg};
 `;
@@ -23,7 +23,7 @@ const StyledLink = styled(Link)`
 `;
 
 const StyledText = styled.span`
-  color: ${({ theme }) => theme.font.color.tertiary};
+  color: ${({ theme }) => theme.font.color.primary};
 `;
 
 export const Breadcrumb = ({ className, links }: BreadcrumbProps) => (
diff --git a/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx b/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
index 47106b58c1f8..0fab6fffdece 100644
--- a/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
@@ -2,12 +2,37 @@ import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { IconComponent, IconX } from 'twenty-ui';
 
-const StyledChip = styled.div`
+const StyledChip = styled.div<{ variant: SortOrFitlerChipVariant }>`
   align-items: center;
-  background-color: ${({ theme }) => theme.accent.quaternary};
-  border: 1px solid ${({ theme }) => theme.accent.tertiary};
+  background-color: ${({ theme, variant }) => {
+    switch (variant) {
+      case 'danger':
+        return theme.background.danger;
+      case 'default':
+      default:
+        return theme.accent.quaternary;
+    }
+  }};
+  border: 1px solid
+    ${({ theme, variant }) => {
+      switch (variant) {
+        case 'danger':
+          return theme.border.color.danger;
+        case 'default':
+        default:
+          return theme.accent.tertiary;
+      }
+    }};
   border-radius: 4px;
-  color: ${({ theme }) => theme.color.blue};
+  color: ${({ theme, variant }) => {
+    switch (variant) {
+      case 'danger':
+        return theme.color.red;
+      case 'default':
+      default:
+        return theme.color.blue;
+    }
+  }};
   cursor: pointer;
   display: flex;
   flex-direction: row;
@@ -24,7 +49,7 @@ const StyledIcon = styled.div`
   margin-right: ${({ theme }) => theme.spacing(1)};
 `;
 
-const StyledDelete = styled.div`
+const StyledDelete = styled.div<{ variant: SortOrFitlerChipVariant }>`
   align-items: center;
   cursor: pointer;
   display: flex;
@@ -33,7 +58,15 @@ const StyledDelete = styled.div`
   margin-top: 1px;
   user-select: none;
   &:hover {
-    background-color: ${({ theme }) => theme.accent.secondary};
+    background-color: ${({ theme, variant }) => {
+      switch (variant) {
+        case 'danger':
+          return theme.color.red20;
+        case 'default':
+        default:
+          return theme.accent.secondary;
+      }
+    }};
     border-radius: ${({ theme }) => theme.border.radius.sm};
   }
 `;
@@ -42,9 +75,12 @@ const StyledLabelKey = styled.div`
   font-weight: ${({ theme }) => theme.font.weight.medium};
 `;
 
+type SortOrFitlerChipVariant = 'default' | 'danger';
+
 type SortOrFilterChipProps = {
   labelKey?: string;
   labelValue: string;
+  variant?: SortOrFitlerChipVariant;
   Icon?: IconComponent;
   onRemove: () => void;
   onClick?: () => void;
@@ -54,6 +90,7 @@ type SortOrFilterChipProps = {
 export const SortOrFilterChip = ({
   labelKey,
   labelValue,
+  variant = 'default',
   Icon,
   onRemove,
   testId,
@@ -67,7 +104,7 @@ export const SortOrFilterChip = ({
   };
 
   return (
-    <StyledChip onClick={onClick}>
+    <StyledChip onClick={onClick} variant={variant}>
       {Icon && (
         <StyledIcon>
           <Icon size={theme.icon.size.sm} />
@@ -76,6 +113,7 @@ export const SortOrFilterChip = ({
       {labelKey && <StyledLabelKey>{labelKey}</StyledLabelKey>}
       {labelValue}
       <StyledDelete
+        variant={variant}
         onClick={handleDeleteClick}
         data-testid={'remove-icon-' + testId}
       >
diff --git a/packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx b/packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx
new file mode 100644
index 000000000000..70033af530d8
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx
@@ -0,0 +1,30 @@
+import { useIcons } from 'twenty-ui';
+
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
+import { useCombinedViewFilters } from '@/views/hooks/useCombinedViewFilters';
+
+type VariantFilterChipProps = {
+  viewFilter: Filter;
+};
+
+export const VariantFilterChip = ({ viewFilter }: VariantFilterChipProps) => {
+  const { removeCombinedViewFilter } = useCombinedViewFilters();
+
+  const { getIcon } = useIcons();
+
+  const handleRemoveClick = () => {
+    removeCombinedViewFilter(viewFilter.id);
+  };
+
+  return (
+    <SortOrFilterChip
+      key={viewFilter.fieldMetadataId}
+      testId={viewFilter.fieldMetadataId}
+      variant={viewFilter.variant}
+      labelValue={viewFilter.definition.label}
+      Icon={getIcon(viewFilter.definition.iconName)}
+      onRemove={handleRemoveClick}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
index e51137f74461..6f2c9f6e7076 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
@@ -1,9 +1,10 @@
-import { ReactNode } from 'react';
 import styled from '@emotion/styled';
+import { ReactNode, useMemo } from 'react';
 import { useRecoilValue } from 'recoil';
 
 import { AddObjectFilterFromDetailsButton } from '@/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton';
 import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
 import { EditableFilterDropdownButton } from '@/views/components/EditableFilterDropdownButton';
 import { EditableSortChip } from '@/views/components/EditableSortChip';
@@ -14,6 +15,7 @@ import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { useResetCurrentView } from '@/views/hooks/useResetCurrentView';
 import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
 import { mapViewSortsToSorts } from '@/views/utils/mapViewSortsToSorts';
+import { VariantFilterChip } from './VariantFilterChip';
 
 export type ViewBarDetailsProps = {
   hasFilterButton?: boolean;
@@ -118,6 +120,29 @@ export const ViewBarDetails = ({
   const { resetCurrentView } = useResetCurrentView();
   const canResetView = canPersistView && !hasFiltersQueryParams;
 
+  const { otherViewFilters, defaultViewFilters } = useMemo(() => {
+    if (!currentViewWithCombinedFiltersAndSorts) {
+      return {
+        otherViewFilters: [],
+        defaultViewFilters: [],
+      };
+    }
+
+    const otherViewFilters =
+      currentViewWithCombinedFiltersAndSorts.viewFilters.filter(
+        (viewFilter) => viewFilter.variant && viewFilter.variant !== 'default',
+      );
+    const defaultViewFilters =
+      currentViewWithCombinedFiltersAndSorts.viewFilters.filter(
+        (viewFilter) => !viewFilter.variant || viewFilter.variant === 'default',
+      );
+
+    return {
+      otherViewFilters,
+      defaultViewFilters,
+    };
+  }, [currentViewWithCombinedFiltersAndSorts]);
+
   const handleCancelClick = () => {
     resetCurrentView();
   };
@@ -136,6 +161,22 @@ export const ViewBarDetails = ({
     <StyledBar>
       <StyledFilterContainer>
         <StyledChipcontainer>
+          {otherViewFilters.map((viewFilter) => (
+            <VariantFilterChip
+              key={viewFilter.fieldMetadataId}
+              // Why do we have two types, Filter and ViewFilter?
+              // Why key defition is already present in the Filter type and added on the fly here with mapViewFiltersToFilters ?
+              // Also as filter is spread into viewFilter, definition is present
+              // FixMe: Ugly hack to make it work
+              viewFilter={viewFilter as unknown as Filter}
+            />
+          ))}
+          {!!otherViewFilters.length &&
+            !!currentViewWithCombinedFiltersAndSorts?.viewSorts?.length && (
+              <StyledSeperatorContainer>
+                <StyledSeperator />
+              </StyledSeperatorContainer>
+            )}
           {mapViewSortsToSorts(
             currentViewWithCombinedFiltersAndSorts?.viewSorts ?? [],
             availableSortDefinitions,
@@ -143,13 +184,13 @@ export const ViewBarDetails = ({
             <EditableSortChip key={sort.fieldMetadataId} viewSort={sort} />
           ))}
           {!!currentViewWithCombinedFiltersAndSorts?.viewSorts?.length &&
-            !!currentViewWithCombinedFiltersAndSorts?.viewFilters?.length && (
+            !!defaultViewFilters.length && (
               <StyledSeperatorContainer>
                 <StyledSeperator />
               </StyledSeperatorContainer>
             )}
           {mapViewFiltersToFilters(
-            currentViewWithCombinedFiltersAndSorts?.viewFilters ?? [],
+            defaultViewFilters,
             availableFilterDefinitions,
           ).map((viewFilter) => (
             <ObjectFilterDropdownScope
diff --git a/packages/twenty-front/src/modules/views/types/ViewFilter.ts b/packages/twenty-front/src/modules/views/types/ViewFilter.ts
index 1a21b111f071..608e13918550 100644
--- a/packages/twenty-front/src/modules/views/types/ViewFilter.ts
+++ b/packages/twenty-front/src/modules/views/types/ViewFilter.ts
@@ -3,6 +3,7 @@ import { ViewFilterOperand } from './ViewFilterOperand';
 export type ViewFilter = {
   __typename: 'ViewFilter';
   id: string;
+  variant?: 'default' | 'danger';
   fieldMetadataId: string;
   operand: ViewFilterOperand;
   value: string;
diff --git a/packages/twenty-front/src/pages/settings/Releases.tsx b/packages/twenty-front/src/pages/settings/Releases.tsx
index de3c74f33659..72d9732b7ebb 100644
--- a/packages/twenty-front/src/pages/settings/Releases.tsx
+++ b/packages/twenty-front/src/pages/settings/Releases.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import rehypeStringify from 'rehype-stringify';
 import remarkParse from 'remark-parse';
 import remarkRehype from 'remark-rehype';
-import { H1Title, IconSettings } from 'twenty-ui';
+import { H1Title, IconRocket } from 'twenty-ui';
 import { unified } from 'unified';
 import { visit } from 'unist-util-visit';
 
@@ -108,7 +108,7 @@ export const Releases = () => {
   }, []);
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Releases">
+    <SubMenuTopBarContainer Icon={IconRocket} title="Releases">
       <SettingsPageContainer>
         <StyledH1Title title="Releases" />
         <ScrollWrapper>
diff --git a/packages/twenty-front/src/pages/settings/SettingsProfile.tsx b/packages/twenty-front/src/pages/settings/SettingsProfile.tsx
index 4f876639c054..07202b6fa42f 100644
--- a/packages/twenty-front/src/pages/settings/SettingsProfile.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsProfile.tsx
@@ -1,5 +1,4 @@
-import styled from '@emotion/styled';
-import { H1Title, H2Title, IconSettings } from 'twenty-ui';
+import { H2Title, IconUserCircle } from 'twenty-ui';
 
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { ChangePassword } from '@/settings/profile/components/ChangePassword';
@@ -10,14 +9,9 @@ import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePic
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
 
-const StyledH1Title = styled(H1Title)`
-  margin-bottom: 0;
-`;
-
 export const SettingsProfile = () => (
-  <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+  <SubMenuTopBarContainer Icon={IconUserCircle} title="Profile">
     <SettingsPageContainer>
-      <StyledH1Title title="Profile" />
       <Section>
         <H2Title title="Picture" />
         <ProfilePictureUploader />
diff --git a/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx b/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx
index bfcee4cc1d2e..84f27a4c4cc2 100644
--- a/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx
@@ -1,5 +1,4 @@
-import styled from '@emotion/styled';
-import { H1Title, H2Title, IconSettings } from 'twenty-ui';
+import { H2Title, IconSettings } from 'twenty-ui';
 
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { DeleteWorkspace } from '@/settings/profile/components/DeleteWorkspace';
@@ -9,14 +8,9 @@ import { WorkspaceLogoUploader } from '@/settings/workspace/components/Workspace
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
 
-const StyledH1Title = styled(H1Title)`
-  margin-bottom: 0;
-`;
-
 export const SettingsWorkspace = () => (
-  <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+  <SubMenuTopBarContainer Icon={IconSettings} title="General">
     <SettingsPageContainer>
-      <StyledH1Title title="General" />
       <Section>
         <H2Title title="Picture" />
         <WorkspaceLogoUploader />
diff --git a/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx b/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
index 8339d1cbbf58..2408fd380d6b 100644
--- a/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 import { useState } from 'react';
 import { useRecoilValue } from 'recoil';
-import { H1Title, H2Title, IconSettings, IconTrash } from 'twenty-ui';
+import { H2Title, IconTrash, IconUsers } from 'twenty-ui';
 
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
@@ -18,10 +18,6 @@ import { WorkspaceInviteLink } from '@/workspace/components/WorkspaceInviteLink'
 import { WorkspaceInviteTeam } from '@/workspace/components/WorkspaceInviteTeam';
 import { WorkspaceMemberCard } from '@/workspace/components/WorkspaceMemberCard';
 
-const StyledH1Title = styled(H1Title)`
-  margin-bottom: 0;
-`;
-
 const StyledButtonContainer = styled.div`
   align-items: center;
   display: flex;
@@ -50,9 +46,8 @@ export const SettingsWorkspaceMembers = () => {
   };
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer Icon={IconUsers} title="Members">
       <SettingsPageContainer>
-        <StyledH1Title title="Members" />
         <Section>
           <H2Title
             title="Invite by email"
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
index 0a46dfbe95d9..c9fa96c6c404 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
@@ -1,5 +1,5 @@
 import { useRecoilValue } from 'recoil';
-import { H2Title, IconSettings } from 'twenty-ui';
+import { H2Title, IconAt } from 'twenty-ui';
 
 import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
@@ -14,7 +14,6 @@ import { SettingsAccountsSettingsSection } from '@/settings/accounts/components/
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
-import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 
 export const SettingsAccounts = () => {
@@ -37,10 +36,8 @@ export const SettingsAccounts = () => {
   const isBlocklistEnabled = useIsFeatureEnabled('IS_BLOCKLIST_ENABLED');
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer Icon={IconAt} title="Account">
       <SettingsPageContainer>
-        <Breadcrumb links={[{ children: 'Accounts' }]} />
-
         {loading ? (
           <SettingsAccountLoader />
         ) : (
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
index 6d3d1c3570e7..f2e93d234ecc 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
@@ -1,5 +1,3 @@
-import { IconSettings } from 'twenty-ui';
-
 import { SettingsAccountsCalendarChannelsContainer } from '@/settings/accounts/components/SettingsAccountsCalendarChannelsContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
@@ -7,11 +5,13 @@ import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { IconCalendarEvent } from 'twenty-ui';
 
 export const SettingsAccountsCalendars = () => {
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
-      <SettingsPageContainer>
+    <SubMenuTopBarContainer
+      Icon={IconCalendarEvent}
+      title={
         <Breadcrumb
           links={[
             {
@@ -21,6 +21,9 @@ export const SettingsAccountsCalendars = () => {
             { children: 'Calendars' },
           ]}
         />
+      }
+    >
+      <SettingsPageContainer>
         <Section>
           <SettingsAccountsCalendarChannelsContainer />
         </Section>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
index b972ad215e87..11af16608aef 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
@@ -1,20 +1,23 @@
-import { IconSettings } from 'twenty-ui';
-
 import { SettingsAccountsMessageChannelsContainer } from '@/settings/accounts/components/SettingsAccountsMessageChannelsContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { IconMail } from 'twenty-ui';
 
 export const SettingsAccountsEmails = () => (
-  <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
-    <SettingsPageContainer>
+  <SubMenuTopBarContainer
+    Icon={IconMail}
+    title={
       <Breadcrumb
         links={[
           { children: 'Accounts', href: '/settings/accounts' },
           { children: 'Emails' },
         ]}
       />
+    }
+  >
+    <SettingsPageContainer>
       <Section>
         <SettingsAccountsMessageChannelsContainer />
       </Section>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx
index 7c7a5d31b96a..69465ef5e579 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx
@@ -1,20 +1,23 @@
-import { IconSettings } from 'twenty-ui';
-
 import { SettingsNewAccountSection } from '@/settings/accounts/components/SettingsNewAccountSection';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { IconAt } from 'twenty-ui';
 
 export const SettingsNewAccount = () => {
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
-      <SettingsPageContainer>
+    <SubMenuTopBarContainer
+      Icon={IconAt}
+      title={
         <Breadcrumb
           links={[
             { children: 'Accounts', href: '/settings/accounts' },
             { children: `New` },
           ]}
         />
+      }
+    >
+      <SettingsPageContainer>
         <SettingsNewAccountSection />
       </SettingsPageContainer>
     </SubMenuTopBarContainer>
diff --git a/packages/twenty-front/src/pages/settings/crm-migration/SettingsCRMMigration.tsx b/packages/twenty-front/src/pages/settings/crm-migration/SettingsCRMMigration.tsx
index 48c8ca73304a..4b6c98be095f 100644
--- a/packages/twenty-front/src/pages/settings/crm-migration/SettingsCRMMigration.tsx
+++ b/packages/twenty-front/src/pages/settings/crm-migration/SettingsCRMMigration.tsx
@@ -16,12 +16,13 @@ const REVERT_PUBLIC_KEY = 'pk_live_a87fee8c-28c7-494f-99a3-996ff89f9918';
 export const SettingsCRMMigration = () => {
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconSettings}
+      title={<Breadcrumb links={[{ children: 'Migrate' }]} />}
+      actionButton={<SettingsReadDocumentationButton />}
+    >
       <SettingsPageContainer>
-        <SettingsHeaderContainer>
-          <Breadcrumb links={[{ children: 'Migrate' }]} />
-          <SettingsReadDocumentationButton />
-        </SettingsHeaderContainer>
+        <SettingsHeaderContainer></SettingsHeaderContainer>
         <Section>
           <RevertConnect
             config={{
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
index 7adb8ee74f2c..0b40a39d8723 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
-import { H2Title, IconSettings } from 'twenty-ui';
+import { H2Title, IconHierarchy2 } from 'twenty-ui';
 import { z } from 'zod';
 
 import { useCreateOneObjectMetadataItem } from '@/object-metadata/hooks/useCreateOneObjectMetadataItem';
@@ -70,25 +70,30 @@ export const SettingsNewObject = () => {
   return (
     // eslint-disable-next-line react/jsx-props-no-spreading
     <FormProvider {...formConfig}>
-      <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+      <SubMenuTopBarContainer
+        Icon={IconHierarchy2}
+        title={
+          <Breadcrumb
+            links={[
+              {
+                children: 'Objects',
+                href: settingsObjectsPagePath,
+              },
+              { children: 'New' },
+            ]}
+          />
+        }
+        actionButton={
+          <SaveAndCancelButtons
+            isSaveDisabled={!canSave}
+            isCancelDisabled={isSubmitting}
+            onCancel={() => navigate(settingsObjectsPagePath)}
+            onSave={formConfig.handleSubmit(handleSave)}
+          />
+        }
+      >
         <SettingsPageContainer>
-          <SettingsHeaderContainer>
-            <Breadcrumb
-              links={[
-                {
-                  children: 'Objects',
-                  href: settingsObjectsPagePath,
-                },
-                { children: 'New' },
-              ]}
-            />
-            <SaveAndCancelButtons
-              isSaveDisabled={!canSave}
-              isCancelDisabled={isSubmitting}
-              onCancel={() => navigate(settingsObjectsPagePath)}
-              onSave={formConfig.handleSubmit(handleSave)}
-            />
-          </SettingsHeaderContainer>
+          <SettingsHeaderContainer></SettingsHeaderContainer>
           <Section>
             <H2Title
               title="About"
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPageContent.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPageContent.tsx
index 9f51f890c6b2..f7ca61f50492 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPageContent.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPageContent.tsx
@@ -1,12 +1,7 @@
-import styled from '@emotion/styled';
-import { useNavigate } from 'react-router-dom';
-import { H2Title, IconPlus, IconSettings } from 'twenty-ui';
-
 import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-
 import { getDisabledFieldMetadataItems } from '@/object-metadata/utils/getDisabledFieldMetadataItems';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsObjectSummaryCard } from '@/settings/data-model/object-details/components/SettingsObjectSummaryCard';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
@@ -15,7 +10,10 @@ import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink';
+import styled from '@emotion/styled';
 import { isNonEmptyArray } from '@sniptt/guards';
+import { useNavigate } from 'react-router-dom';
+import { H2Title, IconHierarchy2, IconPlus } from 'twenty-ui';
 import { SettingsObjectFieldTable } from '~/pages/settings/data-model/SettingsObjectFieldTable';
 
 const StyledDiv = styled.div`
@@ -49,14 +47,18 @@ export const SettingsObjectDetailPageContent = ({
   const shouldDisplayAddFieldButton = !objectMetadataItem.isRemote;
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
-      <SettingsPageContainer>
+    <SubMenuTopBarContainer
+      Icon={IconHierarchy2}
+      title={
         <Breadcrumb
           links={[
             { children: 'Objects', href: '/settings/objects' },
             { children: objectMetadataItem.labelPlural },
           ]}
         />
+      }
+    >
+      <SettingsPageContainer>
         <Section>
           <H2Title title="About" description="Manage your object" />
           <SettingsObjectSummaryCard
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx
index 662f5c9a2ef2..641c6b30d914 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectEdit.tsx
@@ -5,12 +5,13 @@ import pick from 'lodash.pick';
 import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useNavigate, useParams } from 'react-router-dom';
-import { H2Title, IconArchive, IconSettings } from 'twenty-ui';
+import { H2Title, IconArchive, IconHierarchy2 } from 'twenty-ui';
 import { z } from 'zod';
 
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
 import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
+import { RecordFieldValueSelectorContextProvider } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -30,7 +31,6 @@ import { Button } from '@/ui/input/button/components/Button';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
-import { RecordFieldValueSelectorContextProvider } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 
 const objectEditFormSchema = z
   .object({})
@@ -108,22 +108,26 @@ export const SettingsObjectEdit = () => {
   return (
     <RecordFieldValueSelectorContextProvider>
       <FormProvider {...formConfig}>
-        <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+        <SubMenuTopBarContainer
+          Icon={IconHierarchy2}
+          title={
+            <Breadcrumb
+              links={[
+                {
+                  children: 'Objects',
+                  href: settingsObjectsPagePath,
+                },
+                {
+                  children: activeObjectMetadataItem.labelPlural,
+                  href: `${settingsObjectsPagePath}/${objectSlug}`,
+                },
+                { children: 'Edit' },
+              ]}
+            />
+          }
+        >
           <SettingsPageContainer>
             <SettingsHeaderContainer>
-              <Breadcrumb
-                links={[
-                  {
-                    children: 'Objects',
-                    href: settingsObjectsPagePath,
-                  },
-                  {
-                    children: activeObjectMetadataItem.labelPlural,
-                    href: `${settingsObjectsPagePath}/${objectSlug}`,
-                  },
-                  { children: 'Edit' },
-                ]}
-              />
               {activeObjectMetadataItem.isCustom && (
                 <SaveAndCancelButtons
                   isSaveDisabled={!canSave}
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index f69f30beb052..cff1a2d75fe0 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -6,7 +6,7 @@ import pick from 'lodash.pick';
 import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useNavigate, useParams } from 'react-router-dom';
-import { H2Title, IconArchive, IconSettings } from 'twenty-ui';
+import { H2Title, IconArchive, IconHierarchy2 } from 'twenty-ui';
 import { z } from 'zod';
 
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
@@ -172,19 +172,23 @@ export const SettingsObjectFieldEdit = () => {
     <RecordFieldValueSelectorContextProvider>
       {/* eslint-disable-next-line react/jsx-props-no-spreading */}
       <FormProvider {...formConfig}>
-        <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+        <SubMenuTopBarContainer
+          Icon={IconHierarchy2}
+          title={
+            <Breadcrumb
+              links={[
+                { children: 'Objects', href: '/settings/objects' },
+                {
+                  children: activeObjectMetadataItem.labelPlural,
+                  href: `/settings/objects/${objectSlug}`,
+                },
+                { children: activeMetadataField.label },
+              ]}
+            />
+          }
+        >
           <SettingsPageContainer>
             <SettingsHeaderContainer>
-              <Breadcrumb
-                links={[
-                  { children: 'Objects', href: '/settings/objects' },
-                  {
-                    children: activeObjectMetadataItem.labelPlural,
-                    href: `/settings/objects/${objectSlug}`,
-                  },
-                  { children: activeMetadataField.label },
-                ]}
-              />
               {shouldDisplaySaveAndCancel && (
                 <SaveAndCancelButtons
                   isSaveDisabled={!canSave}
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx
index 6fbc2d1e6016..f2e18dc14f6a 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx
@@ -5,7 +5,6 @@ import { H2Title, IconPlus, IconSettings } from 'twenty-ui';
 
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
@@ -85,27 +84,31 @@ export const SettingsObjectNewFieldStep1 = () => {
   if (!activeObjectMetadataItem) return null;
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
-      <SettingsPageContainer>
-        <SettingsHeaderContainer>
-          <Breadcrumb
-            links={[
-              { children: 'Objects', href: '/settings/objects' },
-              {
-                children: activeObjectMetadataItem.labelPlural,
-                href: `/settings/objects/${objectSlug}`,
-              },
-              { children: 'New Field' },
-            ]}
+    <SubMenuTopBarContainer
+      Icon={IconSettings}
+      title={
+        <Breadcrumb
+          links={[
+            { children: 'Objects', href: '/settings/objects' },
+            {
+              children: activeObjectMetadataItem.labelPlural,
+              href: `/settings/objects/${objectSlug}`,
+            },
+            { children: 'New Field' },
+          ]}
+        />
+      }
+      actionButton={
+        !activeObjectMetadataItem.isRemote && (
+          <SaveAndCancelButtons
+            isSaveDisabled={!canSave}
+            onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
+            onSave={handleSave}
           />
-          {!activeObjectMetadataItem.isRemote && (
-            <SaveAndCancelButtons
-              isSaveDisabled={!canSave}
-              onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
-              onSave={handleSave}
-            />
-          )}
-        </SettingsHeaderContainer>
+        )
+      }
+    >
+      <SettingsPageContainer>
         <StyledSection>
           <H2Title
             title="Check deactivated fields"
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectOverview.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectOverview.tsx
index 265171d71be5..a33ed73e4764 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectOverview.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectOverview.tsx
@@ -1,12 +1,25 @@
 import { ReactFlowProvider } from 'reactflow';
-import { IconSettings } from 'twenty-ui';
 
 import { SettingsDataModelOverview } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverview';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { IconHierarchy2 } from 'twenty-ui';
 
 export const SettingsObjectOverview = () => {
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconHierarchy2}
+      title={
+        <Breadcrumb
+          links={[
+            { children: 'Data model', href: '/settings/objects' },
+            {
+              children: 'Overview',
+            },
+          ]}
+        />
+      }
+    >
       <ReactFlowProvider>
         <SettingsDataModelOverview />
       </ReactFlowProvider>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
index ef6dc2e34cd8..30b148cdbd25 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
@@ -1,19 +1,12 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import {
-  H1Title,
-  H2Title,
-  IconChevronRight,
-  IconPlus,
-  IconSettings,
-} from 'twenty-ui';
+import { H2Title, IconChevronRight, IconHierarchy2, IconPlus } from 'twenty-ui';
 
 import { useDeleteOneObjectMetadataItem } from '@/object-metadata/hooks/useDeleteOneObjectMetadataItem';
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
 import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
 import { useCombinedGetTotalCount } from '@/object-record/multiple-objects/hooks/useCombinedGetTotalCount';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import {
   SettingsObjectMetadataItemTableRow,
@@ -42,10 +35,6 @@ const StyledIconChevronRight = styled(IconChevronRight)`
   color: ${({ theme }) => theme.font.color.tertiary};
 `;
 
-const StyledH1Title = styled(H1Title)`
-  margin-bottom: 0;
-`;
-
 export const SettingsObjects = () => {
   const theme = useTheme();
 
@@ -115,19 +104,21 @@ export const SettingsObjects = () => {
   );
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconHierarchy2}
+      title="Data model"
+      actionButton={
+        <UndecoratedLink to={getSettingsPagePath(SettingsPath.NewObject)}>
+          <Button
+            Icon={IconPlus}
+            title="Add object"
+            accent="blue"
+            size="small"
+          />
+        </UndecoratedLink>
+      }
+    >
       <SettingsPageContainer>
-        <SettingsHeaderContainer>
-          <StyledH1Title title="Objects" />
-          <UndecoratedLink to={getSettingsPagePath(SettingsPath.NewObject)}>
-            <Button
-              Icon={IconPlus}
-              title="Add object"
-              accent="blue"
-              size="small"
-            />
-          </UndecoratedLink>
-        </SettingsHeaderContainer>
         <>
           <SettingsObjectCoverImage />
           <Section>
diff --git a/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx b/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx
index c2dc7014bc96..c551fda4572c 100644
--- a/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled';
-import { H2Title, IconPlus, IconSettings } from 'twenty-ui';
+import { H2Title, IconCode, IconPlus } from 'twenty-ui';
 
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsApiKeysTable } from '@/settings/developers/components/SettingsApiKeysTable';
 import { SettingsReadDocumentationButton } from '@/settings/developers/components/SettingsReadDocumentationButton';
@@ -9,7 +8,6 @@ import { SettingsWebhooksTable } from '@/settings/developers/components/Settings
 import { Button } from '@/ui/input/button/components/Button';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
-import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 
 const StyledButtonContainer = styled.div`
   display: flex;
@@ -19,12 +17,12 @@ const StyledButtonContainer = styled.div`
 
 export const SettingsDevelopers = () => {
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconCode}
+      title="Developers"
+      actionButton={<SettingsReadDocumentationButton />}
+    >
       <SettingsPageContainer>
-        <SettingsHeaderContainer>
-          <Breadcrumb links={[{ children: 'Developers' }]} />
-          <SettingsReadDocumentationButton />
-        </SettingsHeaderContainer>
         <Section>
           <H2Title
             title="API keys"
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
index fd83b5ee6be8..21919f09a4f5 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
@@ -4,16 +4,16 @@ import { DateTime } from 'luxon';
 import { useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { useRecoilState } from 'recoil';
-import { H2Title, IconRepeat, IconSettings, IconTrash } from 'twenty-ui';
+import { H2Title, IconCode, IconRepeat, IconTrash } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { ApiKeyInput } from '@/settings/developers/components/ApiKeyInput';
 import { ApiKeyNameInput } from '@/settings/developers/components/ApiKeyNameInput';
+import { apiKeyTokenState } from '@/settings/developers/states/generatedApiKeyTokenState';
 import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
 import { computeNewExpirationDate } from '@/settings/developers/utils/compute-new-expiration-date';
 import { formatExpiration } from '@/settings/developers/utils/format-expiration';
@@ -24,7 +24,6 @@ import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer'
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { useGenerateApiKeyTokenMutation } from '~/generated/graphql';
-import { apiKeyTokenState } from '@/settings/developers/states/generatedApiKeyTokenState';
 
 const StyledInfo = styled.span`
   color: ${({ theme }) => theme.font.color.light};
@@ -121,16 +120,18 @@ export const SettingsDevelopersApiKeyDetail = () => {
   return (
     <>
       {apiKeyData?.name && (
-        <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+        <SubMenuTopBarContainer
+          Icon={IconCode}
+          title={
+            <Breadcrumb
+              links={[
+                { children: 'Developers', href: '/settings/developers' },
+                { children: `${apiKeyName} API Key` },
+              ]}
+            />
+          }
+        >
           <SettingsPageContainer>
-            <SettingsHeaderContainer>
-              <Breadcrumb
-                links={[
-                  { children: 'Developers', href: '/settings/developers' },
-                  { children: `${apiKeyName} API Key` },
-                ]}
-              />
-            </SettingsHeaderContainer>
             <Section>
               {apiKeyToken ? (
                 <>
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
index 15b5a83c9549..7a2207125022 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
@@ -1,25 +1,24 @@
 import { DateTime } from 'luxon';
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { H2Title, IconSettings } from 'twenty-ui';
+import { H2Title, IconCode } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { EXPIRATION_DATES } from '@/settings/developers/constants/ExpirationDates';
+import { apiKeyTokenState } from '@/settings/developers/states/generatedApiKeyTokenState';
 import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
 import { Select } from '@/ui/input/components/Select';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { Section } from '@/ui/layout/section/components/Section';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { useSetRecoilState } from 'recoil';
+import { Key } from 'ts-key-enum';
 import { useGenerateApiKeyTokenMutation } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
-import { Key } from 'ts-key-enum';
-import { apiKeyTokenState } from '@/settings/developers/states/generatedApiKeyTokenState';
-import { useSetRecoilState } from 'recoil';
 
 export const SettingsDevelopersApiKeysNew = () => {
   const [generateOneApiKeyToken] = useGenerateApiKeyTokenMutation();
@@ -64,23 +63,27 @@ export const SettingsDevelopersApiKeysNew = () => {
   };
   const canSave = !!formValues.name && createOneApiKey;
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconCode}
+      title={
+        <Breadcrumb
+          links={[
+            { children: 'Developers', href: '/settings/developers' },
+            { children: 'New API Key' },
+          ]}
+        />
+      }
+      actionButton={
+        <SaveAndCancelButtons
+          isSaveDisabled={!canSave}
+          onCancel={() => {
+            navigate('/settings/developers');
+          }}
+          onSave={handleSave}
+        />
+      }
+    >
       <SettingsPageContainer>
-        <SettingsHeaderContainer>
-          <Breadcrumb
-            links={[
-              { children: 'Developers', href: '/settings/developers' },
-              { children: 'New API Key' },
-            ]}
-          />
-          <SaveAndCancelButtons
-            isSaveDisabled={!canSave}
-            onCancel={() => {
-              navigate('/settings/developers');
-            }}
-            onSave={handleSave}
-          />
-        </SettingsHeaderContainer>
         <Section>
           <H2Title title="Name" description="Name of your API key" />
           <TextInput
diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx
index 0ef044167ddd..174561f6a9f2 100644
--- a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhookDetail.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 import { useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
-import { H2Title, IconSettings, IconTrash } from 'twenty-ui';
+import { H2Title, IconCode, IconTrash } from 'twenty-ui';
 
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -9,7 +9,6 @@ import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { Webhook } from '@/settings/developers/types/webhook/Webhook';
 import { Button } from '@/ui/input/button/components/Button';
@@ -88,23 +87,27 @@ export const SettingsDevelopersWebhooksDetail = () => {
   return (
     <>
       {webhookData?.targetUrl && (
-        <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+        <SubMenuTopBarContainer
+          Icon={IconCode}
+          title={
+            <Breadcrumb
+              links={[
+                { children: 'Developers', href: '/settings/developers' },
+                { children: 'Webhook' },
+              ]}
+            />
+          }
+          actionButton={
+            <SaveAndCancelButtons
+              isSaveDisabled={!isDirty}
+              onCancel={() => {
+                navigate('/settings/developers');
+              }}
+              onSave={handleSave}
+            />
+          }
+        >
           <SettingsPageContainer>
-            <SettingsHeaderContainer>
-              <Breadcrumb
-                links={[
-                  { children: 'Developers', href: '/settings/developers' },
-                  { children: 'Webhook' },
-                ]}
-              />
-              <SaveAndCancelButtons
-                isSaveDisabled={!isDirty}
-                onCancel={() => {
-                  navigate('/settings/developers');
-                }}
-                onSave={handleSave}
-              />
-            </SettingsHeaderContainer>
             <Section>
               <H2Title
                 title="Endpoint URL"
diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx
index ba471414b551..2e9f06e10d3e 100644
--- a/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/webhooks/SettingsDevelopersWebhooksNew.tsx
@@ -1,11 +1,10 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { H2Title, IconSettings } from 'twenty-ui';
+import { H2Title, IconCode } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { Webhook } from '@/settings/developers/types/webhook/Webhook';
 import { TextInput } from '@/ui/input/components/TextInput';
@@ -35,23 +34,27 @@ export const SettingsDevelopersWebhooksNew = () => {
   };
   const canSave = !!formValues.targetUrl && createOneWebhook;
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconCode}
+      title={
+        <Breadcrumb
+          links={[
+            { children: 'Developers', href: '/settings/developers' },
+            { children: 'New webhook' },
+          ]}
+        />
+      }
+      actionButton={
+        <SaveAndCancelButtons
+          isSaveDisabled={!canSave}
+          onCancel={() => {
+            navigate('/settings/developers');
+          }}
+          onSave={handleSave}
+        />
+      }
+    >
       <SettingsPageContainer>
-        <SettingsHeaderContainer>
-          <Breadcrumb
-            links={[
-              { children: 'Developers', href: '/settings/developers' },
-              { children: 'New webhook' },
-            ]}
-          />
-          <SaveAndCancelButtons
-            isSaveDisabled={!canSave}
-            onCancel={() => {
-              navigate('/settings/developers');
-            }}
-            onSave={handleSave}
-          />
-        </SettingsHeaderContainer>
         <Section>
           <H2Title
             title="Endpoint URL"
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx
index adb50e51f9ea..430848d7615b 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx
@@ -42,8 +42,9 @@ export const SettingsIntegrationDatabase = () => {
   if (!isIntegrationAvailable) return null;
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
-      <SettingsPageContainer>
+    <SubMenuTopBarContainer
+      Icon={IconSettings}
+      title={
         <Breadcrumb
           links={[
             {
@@ -53,6 +54,9 @@ export const SettingsIntegrationDatabase = () => {
             { children: integration.text },
           ]}
         />
+      }
+    >
+      <SettingsPageContainer>
         <SettingsIntegrationPreview
           integrationLogoUrl={integration.from.image}
         />
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationEditDatabaseConnection.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationEditDatabaseConnection.tsx
index 284f4ed22c52..7600c2a89cd0 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationEditDatabaseConnection.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationEditDatabaseConnection.tsx
@@ -3,10 +3,21 @@ import { IconSettings } from 'twenty-ui';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsIntegrationEditDatabaseConnectionContainer } from '@/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContainer';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 
 export const SettingsIntegrationEditDatabaseConnection = () => {
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconSettings}
+      title={
+        <Breadcrumb
+          links={[
+            // TODO
+            { children: 'Edit connection' },
+          ]}
+        />
+      }
+    >
       <SettingsPageContainer>
         <SettingsIntegrationEditDatabaseConnectionContainer />
       </SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx
index ddfa70336953..4763e02e664f 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx
@@ -8,7 +8,6 @@ import { z } from 'zod';
 import { useCreateOneDatabaseConnection } from '@/databases/hooks/useCreateOneDatabaseConnection';
 import { getForeignDataWrapperType } from '@/databases/utils/getForeignDataWrapperType';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import {
   SettingsIntegrationDatabaseConnectionForm,
@@ -132,34 +131,38 @@ export const SettingsIntegrationNewDatabaseConnection = () => {
   };
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconSettings}
+      title={
+        <Breadcrumb
+          links={[
+            {
+              children: 'Integrations',
+              href: settingsIntegrationsPagePath,
+            },
+            {
+              children: integration.text,
+              href: `${settingsIntegrationsPagePath}/${databaseKey}`,
+            },
+            { children: 'New' },
+          ]}
+        />
+      }
+      actionButton={
+        <SaveAndCancelButtons
+          isSaveDisabled={!canSave}
+          onCancel={() =>
+            navigate(`${settingsIntegrationsPagePath}/${databaseKey}`)
+          }
+          onSave={handleSave}
+        />
+      }
+    >
       <SettingsPageContainer>
         <FormProvider
           // eslint-disable-next-line react/jsx-props-no-spreading
           {...formConfig}
         >
-          <SettingsHeaderContainer>
-            <Breadcrumb
-              links={[
-                {
-                  children: 'Integrations',
-                  href: settingsIntegrationsPagePath,
-                },
-                {
-                  children: integration.text,
-                  href: `${settingsIntegrationsPagePath}/${databaseKey}`,
-                },
-                { children: 'New' },
-              ]}
-            />
-            <SaveAndCancelButtons
-              isSaveDisabled={!canSave}
-              onCancel={() =>
-                navigate(`${settingsIntegrationsPagePath}/${databaseKey}`)
-              }
-              onSave={handleSave}
-            />
-          </SettingsHeaderContainer>
           <Section>
             <H2Title
               title="Connect a new database"
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx
index 9cbc824004d0..cd12fb14eae3 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx
@@ -1,18 +1,15 @@
-import { IconSettings } from 'twenty-ui';
-
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsIntegrationGroup } from '@/settings/integrations/components/SettingsIntegrationGroup';
 import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
-import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { IconApps } from 'twenty-ui';
 
 export const SettingsIntegrations = () => {
   const integrationCategories = useSettingsIntegrationCategories();
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer Icon={IconApps} title="Integrations">
       <SettingsPageContainer>
-        <Breadcrumb links={[{ children: 'Integrations' }]} />
         {integrationCategories.map((group) => (
           <SettingsIntegrationGroup key={group.key} integrationGroup={group} />
         ))}
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx
index fa34fdd5d687..efa1036b0acf 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx
@@ -1,5 +1,4 @@
-import styled from '@emotion/styled';
-import { H1Title, H2Title, IconSettings } from 'twenty-ui';
+import { H2Title, IconColorSwatch } from 'twenty-ui';
 
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { ColorSchemePicker } from '@/ui/input/color-scheme/components/ColorSchemePicker';
@@ -8,17 +7,12 @@ import { Section } from '@/ui/layout/section/components/Section';
 import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';
 import { DateTimeSettings } from '~/pages/settings/profile/appearance/components/DateTimeSettings';
 
-const StyledH1Title = styled(H1Title)`
-  margin-bottom: 0;
-`;
-
 export const SettingsAppearance = () => {
   const { colorScheme, setColorScheme } = useColorScheme();
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer Icon={IconColorSwatch} title="Appearance">
       <SettingsPageContainer>
-        <StyledH1Title title="Appearance" />
         <Section>
           <H2Title title="Theme" />
           <ColorSchemePicker value={colorScheme} onChange={setColorScheme} />
diff --git a/packages/twenty-front/src/pages/settings/serverless-functions/ResetServerlessFunctionStatesEffect.tsx b/packages/twenty-front/src/pages/settings/serverless-functions/ResetServerlessFunctionStatesEffect.tsx
index f158f69cb69c..595f2b2a1d47 100644
--- a/packages/twenty-front/src/pages/settings/serverless-functions/ResetServerlessFunctionStatesEffect.tsx
+++ b/packages/twenty-front/src/pages/settings/serverless-functions/ResetServerlessFunctionStatesEffect.tsx
@@ -1,7 +1,7 @@
-import { useResetRecoilState } from 'recoil';
+import { settingsServerlessFunctionCodeEditorOutputParamsState } from '@/settings/serverless-functions/states/settingsServerlessFunctionCodeEditorOutputParamsState';
 import { settingsServerlessFunctionInputState } from '@/settings/serverless-functions/states/settingsServerlessFunctionInputState';
 import { settingsServerlessFunctionOutputState } from '@/settings/serverless-functions/states/settingsServerlessFunctionOutputState';
-import { settingsServerlessFunctionCodeEditorOutputParamsState } from '@/settings/serverless-functions/states/settingsServerlessFunctionCodeEditorOutputParamsState';
+import { useResetRecoilState } from 'recoil';
 
 export const ResetServerlessFunctionStatesEffect = () => {
   const resetSettingsServerlessFunctionInput = useResetRecoilState(
diff --git a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionDetail.tsx b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionDetail.tsx
index afb03cd87a53..b67cd4655479 100644
--- a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionDetail.tsx
@@ -1,25 +1,24 @@
-import { useParams } from 'react-router-dom';
-import { IconCode, IconSettings, IconTestPipe } from 'twenty-ui';
-import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
-import { Section } from '@/ui/layout/section/components/Section';
-import { TabList } from '@/ui/layout/tab/components/TabList';
-import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
-import { useRecoilValue, useSetRecoilState } from 'recoil';
 import { SettingsServerlessFunctionCodeEditorTab } from '@/settings/serverless-functions/components/tabs/SettingsServerlessFunctionCodeEditorTab';
 import { SettingsServerlessFunctionSettingsTab } from '@/settings/serverless-functions/components/tabs/SettingsServerlessFunctionSettingsTab';
-import { useServerlessFunctionUpdateFormState } from '@/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState';
 import { SettingsServerlessFunctionTestTab } from '@/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTestTab';
+import { SettingsServerlessFunctionTestTabEffect } from '@/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTestTabEffect';
 import { useExecuteOneServerlessFunction } from '@/settings/serverless-functions/hooks/useExecuteOneServerlessFunction';
+import { useServerlessFunctionUpdateFormState } from '@/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState';
+import { useUpdateOneServerlessFunction } from '@/settings/serverless-functions/hooks/useUpdateOneServerlessFunction';
+import { settingsServerlessFunctionInputState } from '@/settings/serverless-functions/states/settingsServerlessFunctionInputState';
+import { settingsServerlessFunctionOutputState } from '@/settings/serverless-functions/states/settingsServerlessFunctionOutputState';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { useUpdateOneServerlessFunction } from '@/settings/serverless-functions/hooks/useUpdateOneServerlessFunction';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Section } from '@/ui/layout/section/components/Section';
+import { TabList } from '@/ui/layout/tab/components/TabList';
+import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
+import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
+import { useParams } from 'react-router-dom';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { IconCode, IconFunction, IconSettings, IconTestPipe } from 'twenty-ui';
 import { useDebouncedCallback } from 'use-debounce';
-import { SettingsServerlessFunctionTestTabEffect } from '@/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTestTabEffect';
-import { settingsServerlessFunctionOutputState } from '@/settings/serverless-functions/states/settingsServerlessFunctionOutputState';
-import { settingsServerlessFunctionInputState } from '@/settings/serverless-functions/states/settingsServerlessFunctionInputState';
 
 const TAB_LIST_COMPONENT_ID = 'serverless-function-detail';
 
@@ -145,16 +144,18 @@ export const SettingsServerlessFunctionDetail = () => {
 
   return (
     formValues.name && (
-      <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+      <SubMenuTopBarContainer
+        Icon={IconFunction}
+        title={
+          <Breadcrumb
+            links={[
+              { children: 'Functions', href: '/settings/functions' },
+              { children: `${formValues.name}` },
+            ]}
+          />
+        }
+      >
         <SettingsPageContainer>
-          <SettingsHeaderContainer>
-            <Breadcrumb
-              links={[
-                { children: 'Functions', href: '/settings/functions' },
-                { children: `${formValues.name}` },
-              ]}
-            />
-          </SettingsHeaderContainer>
           <Section>
             <TabList tabListId={TAB_LIST_COMPONENT_ID} tabs={tabs} />
           </Section>
diff --git a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx
index d186ffdec76a..ff44358c0d62 100644
--- a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx
+++ b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx
@@ -1,31 +1,36 @@
-import { IconPlus, IconSettings } from 'twenty-ui';
-import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
-import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
-import { Section } from '@/ui/layout/section/components/Section';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsServerlessFunctionsTable } from '@/settings/serverless-functions/components/SettingsServerlessFunctionsTable';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { Button } from '@/ui/input/button/components/Button';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Section } from '@/ui/layout/section/components/Section';
+import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink';
+import { IconFunction, IconPlus } from 'twenty-ui';
 
 export const SettingsServerlessFunctions = () => {
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconFunction}
+      title="Functions"
+      actionButton={
+        <UndecoratedLink
+          to={getSettingsPagePath(SettingsPath.NewServerlessFunction)}
+        >
+          <Button
+            Icon={IconPlus}
+            title="New Function"
+            accent="blue"
+            size="small"
+          />
+        </UndecoratedLink>
+      }
+    >
       <SettingsPageContainer>
         <SettingsHeaderContainer>
           <Breadcrumb links={[{ children: 'Functions' }]} />
-          <UndecoratedLink
-            to={getSettingsPagePath(SettingsPath.NewServerlessFunction)}
-          >
-            <Button
-              Icon={IconPlus}
-              title="New Function"
-              accent="blue"
-              size="small"
-            />
-          </UndecoratedLink>
         </SettingsHeaderContainer>
         <Section>
           <SettingsServerlessFunctionsTable />
diff --git a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionsNew.tsx b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionsNew.tsx
index 2f5dbce31bf7..c4f9eadce925 100644
--- a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionsNew.tsx
+++ b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionsNew.tsx
@@ -1,19 +1,18 @@
-import { IconSettings } from 'twenty-ui';
-import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
-import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
-import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
+import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { useNavigate } from 'react-router-dom';
 
+import { SettingsServerlessFunctionNewForm } from '@/settings/serverless-functions/components/SettingsServerlessFunctionNewForm';
 import { useCreateOneServerlessFunction } from '@/settings/serverless-functions/hooks/useCreateOneServerlessFunction';
-import { DEFAULT_CODE } from '@/ui/input/code-editor/components/CodeEditor';
 import { ServerlessFunctionNewFormValues } from '@/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState';
-import { SettingsServerlessFunctionNewForm } from '@/settings/serverless-functions/components/SettingsServerlessFunctionNewForm';
-import { isDefined } from '~/utils/isDefined';
-import { useState } from 'react';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
+import { DEFAULT_CODE } from '@/ui/input/code-editor/components/CodeEditor';
+import { useState } from 'react';
+import { IconFunction } from 'twenty-ui';
+import { isDefined } from '~/utils/isDefined';
 
 export const SettingsServerlessFunctionsNew = () => {
   const navigate = useNavigate();
@@ -54,23 +53,27 @@ export const SettingsServerlessFunctionsNew = () => {
   const canSave = !!formValues.name && createOneServerlessFunction;
 
   return (
-    <SubMenuTopBarContainer Icon={IconSettings} title="Settings">
+    <SubMenuTopBarContainer
+      Icon={IconFunction}
+      title={
+        <Breadcrumb
+          links={[
+            { children: 'Functions', href: '/settings/functions' },
+            { children: 'New' },
+          ]}
+        />
+      }
+      actionButton={
+        <SaveAndCancelButtons
+          isSaveDisabled={!canSave}
+          onCancel={() => {
+            navigate('/settings/functions');
+          }}
+          onSave={handleSave}
+        />
+      }
+    >
       <SettingsPageContainer>
-        <SettingsHeaderContainer>
-          <Breadcrumb
-            links={[
-              { children: 'Functions', href: '/settings/functions' },
-              { children: 'New' },
-            ]}
-          />
-          <SaveAndCancelButtons
-            isSaveDisabled={!canSave}
-            onCancel={() => {
-              navigate('/settings/functions');
-            }}
-            onSave={handleSave}
-          />
-        </SettingsHeaderContainer>
         <SettingsServerlessFunctionNewForm
           formValues={formValues}
           onChange={onChange}
diff --git a/packages/twenty-front/src/utils/title-utils.ts b/packages/twenty-front/src/utils/title-utils.ts
index 74213f0083da..dddb2ce1196e 100644
--- a/packages/twenty-front/src/utils/title-utils.ts
+++ b/packages/twenty-front/src/utils/title-utils.ts
@@ -49,10 +49,6 @@ export const getPageTitleFromPath = (pathname: string): string => {
       return 'Create Workspace';
     case AppPath.CreateProfile:
       return 'Create Profile';
-    case AppPath.TasksPage:
-      return 'Tasks';
-    case AppPath.OpportunitiesPage:
-      return 'Opportunities';
     case SettingsPathPrefixes.Appearance:
       return SettingsPageTitles.Appearance;
     case SettingsPathPrefixes.Accounts:
diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts
index a711d05916f1..924f9c9d7ee0 100644
--- a/packages/twenty-front/vite.config.ts
+++ b/packages/twenty-front/vite.config.ts
@@ -104,8 +104,5 @@ export default defineConfig(({ command, mode }) => {
         localsConvention: 'camelCaseOnly',
       },
     },
-    optimizeDeps: {
-      exclude: ['@tabler/icons-react'],
-    },
   };
 });
diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json
index abcab3e11298..4b80f49e6871 100644
--- a/packages/twenty-server/package.json
+++ b/packages/twenty-server/package.json
@@ -11,7 +11,8 @@
     "command:prod": "node dist/src/command/command",
     "worker:prod": "node dist/src/queue-worker/queue-worker",
     "database:init:prod": "npx ts-node ./scripts/setup-db.ts && yarn database:migrate:prod",
-    "database:migrate:prod": "npx -y typeorm migration:run -d dist/src/database/typeorm/metadata/metadata.datasource && npx -y typeorm migration:run -d dist/src/database/typeorm/core/core.datasource"
+    "database:migrate:prod": "npx -y typeorm migration:run -d dist/src/database/typeorm/metadata/metadata.datasource && npx -y typeorm migration:run -d dist/src/database/typeorm/core/core.datasource",
+    "typeorm": "../../node_modules/typeorm/.bin/typeorm"
   },
   "dependencies": {
     "@graphql-yoga/nestjs": "patch:@graphql-yoga/nestjs@2.1.0#./patches/@graphql-yoga-nestjs-npm-2.1.0-cb509e6047.patch",
diff --git a/packages/twenty-server/src/database/typeorm/metadata/migrations/1723038077987-addSoftDelete.ts b/packages/twenty-server/src/database/typeorm/metadata/migrations/1723038077987-addSoftDelete.ts
new file mode 100644
index 000000000000..c9550c95408e
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/metadata/migrations/1723038077987-addSoftDelete.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddSoftDelete1723038077987 implements MigrationInterface {
+  name = 'AddSoftDelete1723038077987';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" ADD "isSoftDeletable" boolean`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."objectMetadata" DROP COLUMN "isSoftDeletable"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-string.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-string.factory.ts
index d4b8efd77ed6..5755fe413489 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-string.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-string.factory.ts
@@ -3,6 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
 import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { isDefined } from 'src/utils/is-defined';
 
 import { ArgsAliasFactory } from './args-alias.factory';
 
@@ -13,10 +14,18 @@ export class ArgsStringFactory {
   create(
     initialArgs: Record<string, any> | undefined,
     fieldMetadataCollection: FieldMetadataInterface[],
+    softDeletable?: boolean,
   ): string | null {
     if (!initialArgs) {
       return null;
     }
+    if (softDeletable) {
+      initialArgs.filter = {
+        and: [initialArgs.filter, { deletedAt: { is: 'NULL' } }].filter(
+          isDefined,
+        ),
+      };
+    }
     let argsString = '';
     const computedArgs = this.argsAliasFactory.create(
       initialArgs,
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory.ts
index 1acc3778d15f..7dbf38b897c8 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory.ts
@@ -22,19 +22,23 @@ export class FieldsStringFactory {
     private readonly relationFieldAliasFactory: RelationFieldAliasFactory,
   ) {}
 
-  create(
+  async create(
     info: GraphQLResolveInfo,
     fieldMetadataCollection: FieldMetadataInterface[],
     objectMetadataCollection: ObjectMetadataInterface[],
+    withSoftDeleted?: boolean,
   ): Promise<string> {
     const selectedFields: Partial<Record> = graphqlFields(info);
 
-    return this.createFieldsStringRecursive(
+    const res = await this.createFieldsStringRecursive(
       info,
       selectedFields,
       fieldMetadataCollection,
       objectMetadataCollection,
+      withSoftDeleted ?? false,
     );
+
+    return res;
   }
 
   async createFieldsStringRecursive(
@@ -42,6 +46,7 @@ export class FieldsStringFactory {
     selectedFields: Partial<Record>,
     fieldMetadataCollection: FieldMetadataInterface[],
     objectMetadataCollection: ObjectMetadataInterface[],
+    withSoftDeleted: boolean,
     accumulator = '',
   ): Promise<string> {
     const fieldMetadataMap = new Map(
@@ -65,6 +70,7 @@ export class FieldsStringFactory {
             fieldMetadata,
             objectMetadataCollection,
             info,
+            withSoftDeleted,
           );
 
           fieldAlias = alias;
@@ -91,6 +97,7 @@ export class FieldsStringFactory {
           fieldValue,
           fieldMetadataCollection,
           objectMetadataCollection,
+          withSoftDeleted,
           accumulator,
         );
         accumulator += `}\n`;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-many-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-many-query.factory.ts
index 476695f3c6dd..03391ce4cb53 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-many-query.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-many-query.factory.ts
@@ -36,6 +36,7 @@ export class FindManyQueryFactory {
     const argsString = this.argsStringFactory.create(
       args,
       options.fieldMetadataCollection,
+      !options.withSoftDeleted && !!options.objectMetadataItem.isSoftDeletable,
     );
 
     return `
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-one-query.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-one-query.factory.ts
index 80bbf3c9eea0..efef8ff69ff5 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-one-query.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-one-query.factory.ts
@@ -26,10 +26,12 @@ export class FindOneQueryFactory {
       options.info,
       options.fieldMetadataCollection,
       options.objectMetadataCollection,
+      options.withSoftDeleted,
     );
     const argsString = this.argsStringFactory.create(
       args,
       options.fieldMetadataCollection,
+      !options.withSoftDeleted && !!options.objectMetadataItem.isSoftDeletable,
     );
 
     return `
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts
index 51371924dd15..00918785cc97 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts
@@ -12,7 +12,6 @@ import {
   RelationDirection,
 } from 'src/engine/utils/deduce-relation-direction.util';
 import { getFieldArgumentsByKey } from 'src/engine/api/graphql/workspace-query-builder/utils/get-field-arguments-by-key.util';
-import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
 import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
 import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
 
@@ -27,7 +26,6 @@ export class RelationFieldAliasFactory {
     @Inject(forwardRef(() => FieldsStringFactory))
     private readonly fieldsStringFactory: CircularDep<FieldsStringFactory>,
     private readonly argsStringFactory: ArgsStringFactory,
-    private readonly objectMetadataService: ObjectMetadataService,
   ) {}
 
   create(
@@ -36,6 +34,7 @@ export class RelationFieldAliasFactory {
     fieldMetadata: FieldMetadataInterface,
     objectMetadataCollection: ObjectMetadataInterface[],
     info: GraphQLResolveInfo,
+    withSoftDeleted?: boolean,
   ): Promise<string> {
     if (!isRelationFieldMetadataType(fieldMetadata.type)) {
       throw new Error(`Field ${fieldMetadata.name} is not a relation field`);
@@ -47,6 +46,7 @@ export class RelationFieldAliasFactory {
       fieldMetadata,
       objectMetadataCollection,
       info,
+      withSoftDeleted,
     );
   }
 
@@ -56,6 +56,7 @@ export class RelationFieldAliasFactory {
     fieldMetadata: FieldMetadataInterface,
     objectMetadataCollection: ObjectMetadataInterface[],
     info: GraphQLResolveInfo,
+    withSoftDeleted?: boolean,
   ): Promise<string> {
     const relationMetadata =
       fieldMetadata.fromRelationMetadata ?? fieldMetadata.toRelationMetadata;
@@ -98,9 +99,11 @@ export class RelationFieldAliasFactory {
       relationDirection === RelationDirection.FROM
     ) {
       const args = getFieldArgumentsByKey(info, fieldKey);
+
       const argsString = this.argsStringFactory.create(
         args,
         referencedObjectMetadata.fields ?? [],
+        !withSoftDeleted && !!referencedObjectMetadata.isSoftDeletable,
       );
       const fieldsString =
         await this.fieldsStringFactory.createFieldsStringRecursive(
@@ -108,6 +111,7 @@ export class RelationFieldAliasFactory {
           fieldValue,
           referencedObjectMetadata.fields ?? [],
           objectMetadataCollection,
+          withSoftDeleted ?? false,
         );
 
       return `
@@ -137,6 +141,7 @@ export class RelationFieldAliasFactory {
         fieldValue,
         referencedObjectMetadata.fields ?? [],
         objectMetadataCollection,
+        withSoftDeleted ?? false,
       );
 
     // Otherwise it means it's a relation destination is of kind ONE
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/record.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/record.interface.ts
index 32ee60f567c6..54d2c373b642 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/record.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/record.interface.ts
@@ -3,6 +3,7 @@ export interface Record {
   [key: string]: any;
   createdAt: string;
   updatedAt: string;
+  deletedAt: string | null;
 }
 
 export type RecordFilter = {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts
index 4f1ace4a8013..4a543cea0eda 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface.ts
@@ -8,4 +8,5 @@ export interface WorkspaceQueryBuilderOptions {
   info: GraphQLResolveInfo;
   fieldMetadataCollection: FieldMetadataInterface[];
   objectMetadataCollection: ObjectMetadataInterface[];
+  withSoftDeleted?: boolean;
 }
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
index 0d5909471ddb..6c7d6e066d24 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
@@ -35,11 +35,10 @@ export class EntityEventsToDbListener {
     return this.handle(payload);
   }
 
-  // @OnEvent('*.deleted') - TODO: implement when we soft delete has been implemented
-  // ....
-
-  // @OnEvent('*.restored') - TODO: implement when we soft delete has been implemented
-  // ....
+  @OnEvent('*.deleted')
+  async handleDelete(payload: ObjectRecordUpdateEvent<any>) {
+    return this.handle(payload);
+  }
 
   private async handle(payload: ObjectRecordBaseEvent) {
     if (!payload.objectMetadata?.isAuditLogged) {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/with-soft-deleted.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/with-soft-deleted.util.ts
new file mode 100644
index 000000000000..a972782a6ad1
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/with-soft-deleted.util.ts
@@ -0,0 +1,29 @@
+import { RecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+
+import { isDefined } from 'src/utils/is-defined';
+
+export const withSoftDeleted = <T extends RecordFilter>(
+  filter: T | undefined | null,
+): boolean => {
+  if (!isDefined(filter)) {
+    return false;
+  }
+
+  if (Array.isArray(filter)) {
+    return filter.some((item) => withSoftDeleted(item));
+  }
+
+  for (const [key, value] of Object.entries(filter)) {
+    if (key === 'deletedAt') {
+      return true;
+    }
+
+    if (typeof value === 'object' && value !== null) {
+      if (withSoftDeleted(value)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+};
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type.ts
index 40ec1df6b4d4..f155475877e0 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type.ts
@@ -3,9 +3,11 @@ import {
   CreateOneResolverArgs,
   DeleteManyResolverArgs,
   DeleteOneResolverArgs,
+  DestroyManyResolverArgs,
   FindDuplicatesResolverArgs,
   FindManyResolverArgs,
   FindOneResolverArgs,
+  RestoreManyResolverArgs,
   UpdateManyResolverArgs,
   UpdateOneResolverArgs,
 } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
@@ -33,4 +35,8 @@ export type WorkspacePreQueryHookPayload<T> = T extends 'createMany'
                 ? UpdateOneResolverArgs
                 : T extends 'findDuplicates'
                   ? FindDuplicatesResolverArgs
-                  : never;
+                  : T extends 'restoreMany'
+                    ? RestoreManyResolverArgs
+                    : T extends 'destroyMany'
+                      ? DestroyManyResolverArgs
+                      : never;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
index 18a55038861f..30f526a345ef 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
@@ -15,10 +15,12 @@ import {
   CreateOneResolverArgs,
   DeleteManyResolverArgs,
   DeleteOneResolverArgs,
+  DestroyManyResolverArgs,
   FindDuplicatesResolverArgs,
   FindManyResolverArgs,
   FindOneResolverArgs,
   ResolverArgsType,
+  RestoreManyResolverArgs,
   UpdateManyResolverArgs,
   UpdateOneResolverArgs,
 } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
@@ -34,6 +36,7 @@ import {
 } from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook-jobs.job';
 import { assertIsValidUuid } from 'src/engine/api/graphql/workspace-query-runner/utils/assert-is-valid-uuid.util';
 import { parseResult } from 'src/engine/api/graphql/workspace-query-runner/utils/parse-result.util';
+import { withSoftDeleted } from 'src/engine/api/graphql/workspace-query-runner/utils/with-soft-deleted.util';
 import { WorkspaceQueryHookService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.service';
 import {
   WorkspaceQueryRunnerException,
@@ -108,7 +111,10 @@ export class WorkspaceQueryRunnerService {
 
     const query = await this.workspaceQueryBuilderFactory.findMany(
       computedArgs,
-      options,
+      {
+        ...options,
+        withSoftDeleted: withSoftDeleted(args.filter),
+      },
     );
 
     const result = await this.execute(query, authContext.workspace.id);
@@ -159,7 +165,10 @@ export class WorkspaceQueryRunnerService {
 
     const query = await this.workspaceQueryBuilderFactory.findOne(
       computedArgs,
-      options,
+      {
+        ...options,
+        withSoftDeleted: withSoftDeleted(args.filter),
+      },
     );
 
     const result = await this.execute(query, authContext.workspace.id);
@@ -540,6 +549,7 @@ export class WorkspaceQueryRunnerService {
     options: WorkspaceQueryRunnerOptions,
   ): Promise<Record[] | undefined> {
     const { authContext, objectMetadataItem } = options;
+    let query: string;
 
     assertMutationNotOnRemoteObject(objectMetadataItem);
 
@@ -555,8 +565,96 @@ export class WorkspaceQueryRunnerService {
         args,
       );
 
+    if (objectMetadataItem.isSoftDeletable) {
+      query = await this.workspaceQueryBuilderFactory.updateMany(
+        {
+          filter: hookedArgs.filter,
+          data: {
+            deletedAt: new Date().toISOString(),
+          },
+        },
+        {
+          ...options,
+          atMost: maximumRecordAffected,
+        },
+      );
+    } else {
+      query = await this.workspaceQueryBuilderFactory.deleteMany(hookedArgs, {
+        ...options,
+        atMost: maximumRecordAffected,
+      });
+    }
+
+    const result = await this.execute(query, authContext.workspace.id);
+
+    const parsedResults = (
+      await this.parseResult<PGGraphQLMutation<Record>>(
+        result,
+        objectMetadataItem,
+        objectMetadataItem.isSoftDeletable ? 'update' : 'deleteFrom',
+        authContext.workspace.id,
+      )
+    )?.records;
+
+    await this.triggerWebhooks<Record>(
+      parsedResults,
+      CallWebhookJobsJobOperation.delete,
+      options,
+    );
+
+    parsedResults.forEach((record) => {
+      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
+        name: `${objectMetadataItem.nameSingular}.deleted`,
+        workspaceId: authContext.workspace.id,
+        userId: authContext.user?.id,
+        recordId: record.id,
+        objectMetadata: objectMetadataItem,
+        properties: {
+          before: this.removeNestedProperties(record),
+        },
+      } satisfies ObjectRecordDeleteEvent<any>);
+    });
+
+    return parsedResults;
+  }
+
+  async destroyMany<
+    Record extends IRecord = IRecord,
+    Filter extends RecordFilter = RecordFilter,
+  >(
+    args: DestroyManyResolverArgs<Filter>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record[] | undefined> {
+    const { authContext, objectMetadataItem } = options;
+
+    assertMutationNotOnRemoteObject(objectMetadataItem);
+
+    if (!objectMetadataItem.isSoftDeletable) {
+      throw new WorkspaceQueryRunnerException(
+        'This method is reserved to objects that can be soft-deleted, use delete instead',
+        WorkspaceQueryRunnerExceptionCode.DATA_NOT_FOUND,
+      );
+    }
+
+    const maximumRecordAffected = this.environmentService.get(
+      'MUTATION_MAXIMUM_AFFECTED_RECORDS',
+    );
+
+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'destroyMany',
+        args,
+      );
+
     const query = await this.workspaceQueryBuilderFactory.deleteMany(
-      hookedArgs,
+      {
+        filter: {
+          ...hookedArgs.filter,
+          deletedAt: { is: 'NOT_NULL' },
+        },
+      },
       {
         ...options,
         atMost: maximumRecordAffected,
@@ -580,17 +678,83 @@ export class WorkspaceQueryRunnerService {
       options,
     );
 
+    return parsedResults;
+  }
+
+  async restoreMany<
+    Record extends IRecord = IRecord,
+    Filter extends RecordFilter = RecordFilter,
+  >(
+    args: RestoreManyResolverArgs<Filter>,
+    options: WorkspaceQueryRunnerOptions,
+  ): Promise<Record[] | undefined> {
+    const { authContext, objectMetadataItem } = options;
+
+    assertMutationNotOnRemoteObject(objectMetadataItem);
+
+    if (!objectMetadataItem.isSoftDeletable) {
+      throw new WorkspaceQueryRunnerException(
+        'This method is reserved to objects that can be soft-deleted',
+        WorkspaceQueryRunnerExceptionCode.DATA_NOT_FOUND,
+      );
+    }
+
+    const maximumRecordAffected = this.environmentService.get(
+      'MUTATION_MAXIMUM_AFFECTED_RECORDS',
+    );
+
+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'restoreMany',
+        args,
+      );
+
+    const query = await this.workspaceQueryBuilderFactory.updateMany(
+      {
+        filter: {
+          ...hookedArgs.filter,
+          deletedAt: { is: 'NOT_NULL' },
+        },
+        data: {
+          deletedAt: null,
+        },
+      },
+      {
+        ...options,
+        atMost: maximumRecordAffected,
+      },
+    );
+
+    const result = await this.execute(query, authContext.workspace.id);
+
+    const parsedResults = (
+      await this.parseResult<PGGraphQLMutation<Record>>(
+        result,
+        objectMetadataItem,
+        'update',
+        authContext.workspace.id,
+      )
+    )?.records;
+
+    await this.triggerWebhooks<Record>(
+      parsedResults,
+      CallWebhookJobsJobOperation.delete,
+      options,
+    );
+
     parsedResults.forEach((record) => {
-      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
-        name: `${objectMetadataItem.nameSingular}.deleted`,
+      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.created`, {
+        name: `${objectMetadataItem.nameSingular}.created`,
         workspaceId: authContext.workspace.id,
         userId: authContext.user?.id,
         recordId: record.id,
         objectMetadata: objectMetadataItem,
         properties: {
-          before: this.removeNestedProperties(record),
+          after: this.removeNestedProperties(record),
         },
-      } satisfies ObjectRecordDeleteEvent<any>);
+      } satisfies ObjectRecordCreateEvent<any>);
     });
 
     return parsedResults;
@@ -606,6 +770,7 @@ export class WorkspaceQueryRunnerService {
         authContext.workspace.id,
         objectMetadataItem.nameSingular,
       );
+    let query: string;
 
     assertMutationNotOnRemoteObject(objectMetadataItem);
     assertIsValidUuid(args.id);
@@ -618,10 +783,22 @@ export class WorkspaceQueryRunnerService {
         args,
       );
 
-    const query = await this.workspaceQueryBuilderFactory.deleteOne(
-      hookedArgs,
-      options,
-    );
+    if (objectMetadataItem.isSoftDeletable) {
+      query = await this.workspaceQueryBuilderFactory.updateOne(
+        {
+          id: hookedArgs.id,
+          data: {
+            deletedAt: new Date().toISOString(),
+          },
+        },
+        options,
+      );
+    } else {
+      query = await this.workspaceQueryBuilderFactory.deleteOne(
+        hookedArgs,
+        options,
+      );
+    }
 
     const existingRecord = await repository.findOne({
       where: { id: args.id },
@@ -633,7 +810,7 @@ export class WorkspaceQueryRunnerService {
       await this.parseResult<PGGraphQLMutation<Record>>(
         result,
         objectMetadataItem,
-        'deleteFrom',
+        objectMetadataItem.isSoftDeletable ? 'update' : 'deleteFrom',
         authContext.workspace.id,
       )
     )?.records;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-many-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-many-resolver.factory.ts
new file mode 100644
index 000000000000..4a064a406b9b
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-many-resolver.factory.ts
@@ -0,0 +1,42 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+import {
+  DestroyManyResolverArgs,
+  Resolver,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+
+import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class DestroyManyResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'destroyMany' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<DestroyManyResolverArgs> {
+    const internalContext = context;
+
+    return async (_source, args, context, info) => {
+      try {
+        return await this.workspaceQueryRunnerService.destroyMany(args, {
+          authContext: internalContext.authContext,
+          objectMetadataItem: internalContext.objectMetadataItem,
+          info,
+          fieldMetadataCollection: internalContext.fieldMetadataCollection,
+          objectMetadataCollection: internalContext.objectMetadataCollection,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
+      }
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/factories.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/factories.ts
index 2f4a88b34d2a..99d9c5419766 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/factories.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/factories.ts
@@ -1,3 +1,5 @@
+import { DestroyManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/destroy-many-resolver.factory';
+import { RestoreManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/restore-many-resolver.factory';
 import { UpdateManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory';
 
 import { CreateManyResolverFactory } from './create-many-resolver.factory';
@@ -19,6 +21,8 @@ export const workspaceResolverBuilderFactories = [
   DeleteOneResolverFactory,
   UpdateManyResolverFactory,
   DeleteManyResolverFactory,
+  DestroyManyResolverFactory,
+  RestoreManyResolverFactory,
 ];
 
 export const workspaceResolverBuilderMethodNames = {
@@ -34,5 +38,7 @@ export const workspaceResolverBuilderMethodNames = {
     DeleteOneResolverFactory.methodName,
     UpdateManyResolverFactory.methodName,
     DeleteManyResolverFactory.methodName,
+    DestroyManyResolverFactory.methodName,
+    RestoreManyResolverFactory.methodName,
   ],
 } as const;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/restore-many-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/restore-many-resolver.factory.ts
new file mode 100644
index 000000000000..ceba95306aed
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/restore-many-resolver.factory.ts
@@ -0,0 +1,42 @@
+import { Injectable } from '@nestjs/common';
+
+import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
+import {
+  Resolver,
+  RestoreManyResolverArgs,
+} from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
+
+import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
+import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+
+@Injectable()
+export class RestoreManyResolverFactory
+  implements WorkspaceResolverBuilderFactoryInterface
+{
+  public static methodName = 'restoreMany' as const;
+
+  constructor(
+    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+  ) {}
+
+  create(
+    context: WorkspaceSchemaBuilderContext,
+  ): Resolver<RestoreManyResolverArgs> {
+    const internalContext = context;
+
+    return async (_source, args, context, info) => {
+      try {
+        return await this.workspaceQueryRunnerService.restoreMany(args, {
+          authContext: internalContext.authContext,
+          objectMetadataItem: internalContext.objectMetadataItem,
+          info,
+          fieldMetadataCollection: internalContext.fieldMetadataCollection,
+          objectMetadataCollection: internalContext.objectMetadataCollection,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
+      }
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
index 2727a3fdc605..cbe5b1fa2e84 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
@@ -20,6 +20,8 @@ export enum ResolverArgsType {
   UpdateMany = 'UpdateMany',
   DeleteOne = 'DeleteOne',
   DeleteMany = 'DeleteMany',
+  RestoreMany = 'RestoreMany',
+  DestroyMany = 'DestroyMany',
 }
 
 export interface FindManyResolverArgs<
@@ -82,6 +84,14 @@ export interface DeleteManyResolverArgs<Filter = any> {
   filter: Filter;
 }
 
+export interface RestoreManyResolverArgs<Filter = any> {
+  filter: Filter;
+}
+
+export interface DestroyManyResolverArgs<Filter = any> {
+  filter: Filter;
+}
+
 export type WorkspaceResolverBuilderQueryMethodNames =
   (typeof workspaceResolverBuilderMethodNames.queries)[number];
 
@@ -106,4 +116,6 @@ export type ResolverArgs =
   | FindOneResolverArgs
   | FindDuplicatesResolverArgs
   | UpdateManyResolverArgs
-  | UpdateOneResolverArgs;
+  | UpdateOneResolverArgs
+  | DestroyManyResolverArgs
+  | RestoreManyResolverArgs;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
index 7fed8b96c613..fc405bfff689 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
@@ -5,6 +5,8 @@ import { IResolvers } from '@graphql-tools/utils';
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 import { DeleteManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory';
+import { DestroyManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/destroy-many-resolver.factory';
+import { RestoreManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/restore-many-resolver.factory';
 import { UpdateManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory';
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import { getResolverName } from 'src/engine/utils/get-resolver-name.util';
@@ -36,6 +38,8 @@ export class WorkspaceResolverFactory {
     private readonly deleteOneResolverFactory: DeleteOneResolverFactory,
     private readonly updateManyResolverFactory: UpdateManyResolverFactory,
     private readonly deleteManyResolverFactory: DeleteManyResolverFactory,
+    private readonly restoreManyResolverFactory: RestoreManyResolverFactory,
+    private readonly destroyManyResolverFactory: DestroyManyResolverFactory,
   ) {}
 
   async create(
@@ -56,6 +60,8 @@ export class WorkspaceResolverFactory {
       ['deleteOne', this.deleteOneResolverFactory],
       ['updateMany', this.updateManyResolverFactory],
       ['deleteMany', this.deleteManyResolverFactory],
+      ['restoreMany', this.restoreManyResolverFactory],
+      ['destroyMany', this.destroyManyResolverFactory],
     ]);
     const resolvers: IResolvers = {
       Query: {},
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/root-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/root-type.factory.ts
index 780cf2985af7..c39111d3ff18 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/root-type.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/root-type.factory.ts
@@ -2,14 +2,14 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLFieldConfigMap, GraphQLObjectType } from 'graphql';
 
-import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
 import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
+import { TypeMapperService } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
 import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
-import { getResolverName } from 'src/engine/utils/get-resolver-name.util';
 import { getResolverArgs } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util';
-import { TypeMapperService } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
+import { getResolverName } from 'src/engine/utils/get-resolver-name.util';
 
 import { ArgsFactory } from './args.factory';
 import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
@@ -101,13 +101,17 @@ export class RootTypeFactory {
           );
         }
 
+        const allowedMethodNames = [
+          'updateMany',
+          'deleteMany',
+          'createMany',
+          'findDuplicates',
+          'restoreMany',
+          'destroyMany',
+        ];
+
         const outputType = this.typeMapperService.mapToGqlType(objectType, {
-          isArray: [
-            'updateMany',
-            'deleteMany',
-            'createMany',
-            'findDuplicates',
-          ].includes(methodName),
+          isArray: allowedMethodNames.includes(methodName),
         });
 
         fieldConfigMap[name] = {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts
index 72a9de127dc4..3f47f10797ac 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts
@@ -50,6 +50,12 @@ describe('getResolverArgs', () => {
     deleteOne: {
       id: { type: GraphQLID, isNullable: false },
     },
+    restoreMany: {
+      filter: { kind: InputTypeDefinitionKind.Filter, isNullable: false },
+    },
+    destroyMany: {
+      filter: { kind: InputTypeDefinitionKind.Filter, isNullable: false },
+    },
   };
 
   // Test each resolver type
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts
index a279282b50dc..f42377b89c20 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts
@@ -116,6 +116,20 @@ export const getResolverArgs = (
           isNullable: false,
         },
       };
+    case 'restoreMany':
+      return {
+        filter: {
+          kind: InputTypeDefinitionKind.Filter,
+          isNullable: false,
+        },
+      };
+    case 'destroyMany':
+      return {
+        filter: {
+          kind: InputTypeDefinitionKind.Filter,
+          isNullable: false,
+        },
+      };
     default:
       throw new Error(`Unknown resolver type: ${type}`);
   }
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface.ts
index 8d805dfe4a03..2eac59ec319a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface.ts
@@ -20,4 +20,5 @@ export interface ObjectMetadataInterface {
   isAuditLogged: boolean;
   labelIdentifierFieldMetadataId?: string | null;
   imageIdentifierFieldMetadataId?: string | null;
+  isSoftDeletable?: boolean | null;
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
index 3d550b02fe5d..ebbb188669b9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
@@ -69,6 +69,9 @@ export class ObjectMetadataEntity implements ObjectMetadataInterface {
   @Column({ default: true })
   isAuditLogged: boolean;
 
+  @Column({ nullable: true, type: 'boolean' })
+  isSoftDeletable?: boolean | null;
+
   @Column({ nullable: true, type: 'uuid' })
   labelIdentifierFieldMetadataId?: string | null;
 
diff --git a/packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts b/packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts
index f7e430a8d6b9..f122f29c47a5 100644
--- a/packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts
@@ -1,6 +1,7 @@
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
-import { WorkspaceIsPimaryField } from 'src/engine/twenty-orm/decorators/workspace-is-primary-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceIsPrimaryField } from 'src/engine/twenty-orm/decorators/workspace-is-primary-field.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
 import { BASE_OBJECT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 
@@ -13,7 +14,7 @@ export abstract class BaseWorkspaceEntity {
     defaultValue: 'uuid',
     icon: 'Icon123',
   })
-  @WorkspaceIsPimaryField()
+  @WorkspaceIsPrimaryField()
   @WorkspaceIsSystem()
   id: string;
 
@@ -25,7 +26,7 @@ export abstract class BaseWorkspaceEntity {
     icon: 'IconCalendar',
     defaultValue: 'now',
   })
-  createdAt: Date;
+  createdAt: string;
 
   @WorkspaceField({
     standardId: BASE_OBJECT_STANDARD_FIELD_IDS.updatedAt,
@@ -35,5 +36,15 @@ export abstract class BaseWorkspaceEntity {
     icon: 'IconCalendarClock',
     defaultValue: 'now',
   })
-  updatedAt: Date;
+  updatedAt: string;
+
+  @WorkspaceField({
+    standardId: BASE_OBJECT_STANDARD_FIELD_IDS.deletedAt,
+    type: FieldMetadataType.DATE_TIME,
+    label: 'Deleted at',
+    description: 'Date when the record was deleted',
+    icon: 'IconCalendarMinus',
+  })
+  @WorkspaceIsNullable()
+  deletedAt?: string | null;
 }
diff --git a/packages/twenty-server/src/engine/twenty-orm/custom.workspace-entity.ts b/packages/twenty-server/src/engine/twenty-orm/custom.workspace-entity.ts
index 5fd099f02531..92085ec61151 100644
--- a/packages/twenty-server/src/engine/twenty-orm/custom.workspace-entity.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/custom.workspace-entity.ts
@@ -8,7 +8,7 @@ import {
   RelationOnDeleteAction,
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
-import { WorkspaceCustomObject } from 'src/engine/twenty-orm/decorators/workspace-custom-object.decorator';
+import { WorkspaceCustomEntity } from 'src/engine/twenty-orm/decorators/workspace-custom-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
@@ -21,7 +21,9 @@ import { NoteTargetWorkspaceEntity } from 'src/modules/note/standard-objects/not
 import { TaskTargetWorkspaceEntity } from 'src/modules/task/standard-objects/task-target.workspace-entity';
 import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
 
-@WorkspaceCustomObject()
+@WorkspaceCustomEntity({
+  softDelete: true,
+})
 export class CustomWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
     standardId: CUSTOM_OBJECT_STANDARD_FIELD_IDS.name,
diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-custom-object.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-custom-entity.decorator.ts
similarity index 63%
rename from packages/twenty-server/src/engine/twenty-orm/decorators/workspace-custom-object.decorator.ts
rename to packages/twenty-server/src/engine/twenty-orm/decorators/workspace-custom-entity.decorator.ts
index 17f6ef526b31..74f1ff0295be 100644
--- a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-custom-object.decorator.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-custom-entity.decorator.ts
@@ -1,7 +1,13 @@
 import { metadataArgsStorage } from 'src/engine/twenty-orm/storage/metadata-args.storage';
 import { TypedReflect } from 'src/utils/typed-reflect';
 
-export function WorkspaceCustomObject(): ClassDecorator {
+interface WorkspaceCustomEntityOptions {
+  softDelete?: boolean;
+}
+
+export function WorkspaceCustomEntity(
+  options: WorkspaceCustomEntityOptions = {},
+): ClassDecorator {
   return (target) => {
     const gate = TypedReflect.getMetadata(
       'workspace:gate-metadata-args',
@@ -11,6 +17,7 @@ export function WorkspaceCustomObject(): ClassDecorator {
     metadataArgsStorage.addExtendedEntities({
       target,
       gate,
+      softDelete: options.softDelete,
     });
   };
 }
diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-entity.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-entity.decorator.ts
index 5e56de14008c..3b9e5b6f1d66 100644
--- a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-entity.decorator.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-entity.decorator.ts
@@ -12,6 +12,7 @@ interface WorkspaceEntityOptions {
   icon?: string;
   labelIdentifierStandardId?: string;
   imageIdentifierStandardId?: string;
+  softDelete?: boolean;
 }
 
 export function WorkspaceEntity(
@@ -47,6 +48,7 @@ export function WorkspaceEntity(
       isAuditLogged,
       isSystem,
       gate,
+      softDelete: options.softDelete,
     });
   };
 }
diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-is-primary-field.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-is-primary-field.decorator.ts
index 5dc8a389b675..efebefa469d3 100644
--- a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-is-primary-field.decorator.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-is-primary-field.decorator.ts
@@ -1,6 +1,6 @@
 import { TypedReflect } from 'src/utils/typed-reflect';
 
-export function WorkspaceIsPimaryField(): PropertyDecorator {
+export function WorkspaceIsPrimaryField(): PropertyDecorator {
   return (object, propertyKey) => {
     TypedReflect.defineMetadata(
       'workspace:is-primary-field-metadata-args',
diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts
index d85282c6293d..251e3058d778 100644
--- a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts
@@ -22,12 +22,18 @@ type EntitySchemaColumnMap = {
 export class EntitySchemaColumnFactory {
   create(
     fieldMetadataCollection: FieldMetadataEntity[],
+    softDelete: boolean,
   ): EntitySchemaColumnMap {
     let entitySchemaColumnMap: EntitySchemaColumnMap = {};
 
     for (const fieldMetadata of fieldMetadataCollection) {
       const key = fieldMetadata.name;
 
+      // Skip deletedAt column if soft delete is not enabled
+      if (!softDelete && key === 'deletedAt') {
+        continue;
+      }
+
       if (isRelationFieldMetadataType(fieldMetadata.type)) {
         const relationMetadata =
           fieldMetadata.fromRelationMetadata ??
diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema.factory.ts
index 14564a02920a..249f14091139 100644
--- a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema.factory.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema.factory.ts
@@ -21,6 +21,7 @@ export class EntitySchemaFactory {
   ): Promise<EntitySchema> {
     const columns = this.entitySchemaColumnFactory.create(
       objectMetadata.fields,
+      objectMetadata.isSoftDeletable ?? false,
     );
 
     const relations = await this.entitySchemaRelationFactory.create(
diff --git a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-entity-metadata-args.interface.ts b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-entity-metadata-args.interface.ts
index ac10ea898dd2..0f506c5e25a1 100644
--- a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-entity-metadata-args.interface.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-entity-metadata-args.interface.ts
@@ -54,12 +54,15 @@ export interface WorkspaceEntityMetadataArgs {
   /**
    * Label identifier.
    */
-
   readonly labelIdentifierStandardId: string | null;
 
   /**
    * Image identifier.
    */
-
   readonly imageIdentifierStandardId: string | null;
+
+  /**
+   * Enable soft delete.
+   */
+  readonly softDelete?: boolean;
 }
diff --git a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-extended-entity-metadata-args.interface.ts b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-extended-entity-metadata-args.interface.ts
index 12706f004849..fe29d8c15e86 100644
--- a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-extended-entity-metadata-args.interface.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-extended-entity-metadata-args.interface.ts
@@ -13,4 +13,9 @@ export interface WorkspaceExtendedEntityMetadataArgs {
    * Entity gate.
    */
   readonly gate?: Gate;
+
+  /**
+   * Enable soft delete.
+   */
+  readonly softDelete?: boolean;
 }
diff --git a/packages/twenty-server/src/engine/utils/__tests__/get-resolver-name.spec.ts b/packages/twenty-server/src/engine/utils/__tests__/get-resolver-name.spec.ts
index 55f327d19651..dec23df4b14f 100644
--- a/packages/twenty-server/src/engine/utils/__tests__/get-resolver-name.spec.ts
+++ b/packages/twenty-server/src/engine/utils/__tests__/get-resolver-name.spec.ts
@@ -15,6 +15,8 @@ describe('getResolverName', () => {
     ['createOne', 'createEntity'],
     ['updateOne', 'updateEntity'],
     ['deleteOne', 'deleteEntity'],
+    ['restoreMany', 'restoreEntities'],
+    ['destroyMany', 'destroyEntities'],
   ])('should return correct name for %s resolver', (type, expectedResult) => {
     expect(
       getResolverName(metadata, type as WorkspaceResolverBuilderMethodNames),
diff --git a/packages/twenty-server/src/engine/utils/get-resolver-name.util.ts b/packages/twenty-server/src/engine/utils/get-resolver-name.util.ts
index 4c35f0edafd6..f5462b87fd8c 100644
--- a/packages/twenty-server/src/engine/utils/get-resolver-name.util.ts
+++ b/packages/twenty-server/src/engine/utils/get-resolver-name.util.ts
@@ -25,8 +25,12 @@ export const getResolverName = (
       return `delete${pascalCase(objectMetadata.nameSingular)}`;
     case 'updateMany':
       return `update${pascalCase(objectMetadata.namePlural)}`;
+    case 'restoreMany':
+      return `restore${pascalCase(objectMetadata.namePlural)}`;
     case 'deleteMany':
       return `delete${pascalCase(objectMetadata.namePlural)}`;
+    case 'destroyMany':
+      return `destroy${pascalCase(objectMetadata.namePlural)}`;
     default:
       throw new Error(`Unknown resolver type: ${type}`);
   }
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts
index 5ce6734b97f8..ff51c318ea17 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts
@@ -53,6 +53,7 @@ export const BASE_OBJECT_STANDARD_FIELD_IDS = {
   id: '20202020-eda0-4cee-9577-3eb357e3c22b',
   createdAt: '20202020-66ac-4502-9975-e4d959c50311',
   updatedAt: '20202020-d767-4622-bdcf-d8a084834d86',
+  deletedAt: '20202020-b9a7-48d8-8387-b9a3090a50ec',
 };
 
 export const BLOCKLIST_STANDARD_FIELD_IDS = {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts
index 44ba0da72150..a54b77c38b96 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts
@@ -150,6 +150,14 @@ export class StandardFieldFactory {
       return [];
     }
 
+    if (
+      workspaceFieldMetadataArgs.name === 'deletedAt' &&
+      workspaceEntityMetadataArgs &&
+      !workspaceEntityMetadataArgs.softDelete
+    ) {
+      return [];
+    }
+
     return [
       {
         type: workspaceFieldMetadataArgs.type,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory.ts
index 72e29753e992..da2c8318b8fa 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory.ts
@@ -54,6 +54,7 @@ export class StandardObjectFactory {
       isCustom: false,
       isRemote: false,
       isSystem: workspaceEntityMetadataArgs.isSystem ?? false,
+      isSoftDeletable: workspaceEntityMetadataArgs.softDelete ?? false,
     };
   }
 }
diff --git a/packages/twenty-server/src/modules/company/standard-objects/company.workspace-entity.ts b/packages/twenty-server/src/modules/company/standard-objects/company.workspace-entity.ts
index 32e774d4ccd5..bfea234bb283 100644
--- a/packages/twenty-server/src/modules/company/standard-objects/company.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/company/standard-objects/company.workspace-entity.ts
@@ -40,6 +40,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
   description: 'A company',
   icon: 'IconBuildingSkyscraper',
   labelIdentifierStandardId: COMPANY_STANDARD_FIELD_IDS.name,
+  softDelete: true,
 })
 export class CompanyWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
diff --git a/packages/twenty-server/src/modules/note/standard-objects/note-target.workspace-entity.ts b/packages/twenty-server/src/modules/note/standard-objects/note-target.workspace-entity.ts
index 51e82ca8c57d..abb015895611 100644
--- a/packages/twenty-server/src/modules/note/standard-objects/note-target.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/note/standard-objects/note-target.workspace-entity.ts
@@ -26,6 +26,7 @@ import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-ob
   labelPlural: 'Note Targets',
   description: 'A note target',
   icon: 'IconCheckbox',
+  softDelete: true,
 })
 @WorkspaceIsSystem()
 export class NoteTargetWorkspaceEntity extends BaseWorkspaceEntity {
diff --git a/packages/twenty-server/src/modules/note/standard-objects/note.workspace-entity.ts b/packages/twenty-server/src/modules/note/standard-objects/note.workspace-entity.ts
index 7b5c9611885e..a8aa5b9342c4 100644
--- a/packages/twenty-server/src/modules/note/standard-objects/note.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/note/standard-objects/note.workspace-entity.ts
@@ -30,6 +30,7 @@ import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-o
   description: 'A note',
   icon: 'IconNotes',
   labelIdentifierStandardId: NOTE_STANDARD_FIELD_IDS.title,
+  softDelete: true,
 })
 export class NoteWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
diff --git a/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.workspace-entity.ts b/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.workspace-entity.ts
index 142b000b9a0d..3acd4dc88ebd 100644
--- a/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.workspace-entity.ts
@@ -39,6 +39,7 @@ import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-o
   description: 'An opportunity',
   icon: 'IconTargetArrow',
   labelIdentifierStandardId: OPPORTUNITY_STANDARD_FIELD_IDS.name,
+  softDelete: true,
 })
 @WorkspaceIsNotAuditLogged()
 export class OpportunityWorkspaceEntity extends BaseWorkspaceEntity {
diff --git a/packages/twenty-server/src/modules/person/standard-objects/person.workspace-entity.ts b/packages/twenty-server/src/modules/person/standard-objects/person.workspace-entity.ts
index ac8aa9f628a5..4083e4a4b8ba 100644
--- a/packages/twenty-server/src/modules/person/standard-objects/person.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/person/standard-objects/person.workspace-entity.ts
@@ -40,6 +40,7 @@ import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-o
   icon: 'IconUser',
   labelIdentifierStandardId: PERSON_STANDARD_FIELD_IDS.name,
   imageIdentifierStandardId: PERSON_STANDARD_FIELD_IDS.avatarUrl,
+  softDelete: true,
 })
 export class PersonWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
diff --git a/packages/twenty-server/src/modules/task/standard-objects/task-target.workspace-entity.ts b/packages/twenty-server/src/modules/task/standard-objects/task-target.workspace-entity.ts
index e5a856bbd99f..82c864ed2382 100644
--- a/packages/twenty-server/src/modules/task/standard-objects/task-target.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/task/standard-objects/task-target.workspace-entity.ts
@@ -26,6 +26,7 @@ import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-ob
   labelPlural: 'Task Targets',
   description: 'An task target',
   icon: 'IconCheckbox',
+  softDelete: true,
 })
 @WorkspaceIsSystem()
 export class TaskTargetWorkspaceEntity extends BaseWorkspaceEntity {
diff --git a/packages/twenty-server/src/modules/task/standard-objects/task.workspace-entity.ts b/packages/twenty-server/src/modules/task/standard-objects/task.workspace-entity.ts
index 03f0c88002e3..d087d69c6fbd 100644
--- a/packages/twenty-server/src/modules/task/standard-objects/task.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/task/standard-objects/task.workspace-entity.ts
@@ -32,6 +32,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
   description: 'A task',
   icon: 'IconCheckbox',
   labelIdentifierStandardId: TASK_STANDARD_FIELD_IDS.title,
+  softDelete: true,
 })
 export class TaskWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
diff --git a/packages/twenty-ui/src/display/banner/components/Banner.tsx b/packages/twenty-ui/src/display/banner/components/Banner.tsx
index f08b15ce0249..8a89a8b209ea 100644
--- a/packages/twenty-ui/src/display/banner/components/Banner.tsx
+++ b/packages/twenty-ui/src/display/banner/components/Banner.tsx
@@ -1,9 +1,10 @@
 import styled from '@emotion/styled';
 
-const StyledBanner = styled.div`
+const StyledBanner = styled.div<{ variant?: BannerVariant }>`
   align-items: center;
   backdrop-filter: blur(5px);
-  background: ${({ theme }) => theme.color.blue};
+  background: ${({ theme, variant }) =>
+    variant === 'danger' ? theme.color.red : theme.color.blue};
   display: flex;
   gap: ${({ theme }) => theme.spacing(3)};
   height: 40px;
@@ -19,4 +20,14 @@ const StyledBanner = styled.div`
   box-sizing: border-box;
 `;
 
-export { StyledBanner as Banner };
+export type BannerVariant = 'danger' | 'default';
+
+export const Banner = ({
+  variant = 'default',
+  children,
+}: {
+  variant?: BannerVariant;
+  children: React.ReactNode;
+} & React.HTMLAttributes<HTMLDivElement>) => (
+  <StyledBanner variant={variant}>{children}</StyledBanner>
+);
diff --git a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts
index 2b5996d9b772..722507d11c96 100644
--- a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts
+++ b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts
@@ -146,6 +146,7 @@ export {
   IconRelationOneToOne,
   IconReload,
   IconRepeat,
+  IconRestore,
   IconRocket,
   IconRotate,
   IconSearch,
@@ -174,4 +175,5 @@ export {
   IconWorld,
   IconX,
 } from '@tabler/icons-react';
+
 export type { TablerIconsProps } from '@tabler/icons-react';

From 12a657ce297891b3d964b8ac223ffaae5a8a0791 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Mon, 19 Aug 2024 19:19:01 +0200
Subject: [PATCH 4/8] Patch messaging import crons not running (#6688)

In 0.23.1, we have introduced a regression by migrating to TwentyORM ;
messageChannels were not considered as syncable anymore
---
 .../crons/jobs/messaging-message-list-fetch.cron.job.ts       | 4 +---
 .../messaging-message-channel-sync-status-monitoring.cron.ts  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
index 0eb06acc5ec1..3f7334cf7c19 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
@@ -46,9 +46,7 @@ export class MessagingMessageListFetchCronJob {
           'messageChannel',
         );
 
-      const messageChannels = await messageChannelRepository.find({
-        select: ['id'],
-      });
+      const messageChannels = await messageChannelRepository.find();
 
       for (const messageChannel of messageChannels) {
         if (
diff --git a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts
index 9d403fa09941..e3a3b5e06c63 100644
--- a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts
+++ b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts
@@ -46,8 +46,8 @@ export class MessagingMessageChannelSyncStatusMonitoringCronJob {
     for (const activeWorkspace of activeWorkspaces) {
       const messageChannelRepository =
         await this.twentyORMGlobalManager.getRepositoryForWorkspace<MessageChannelWorkspaceEntity>(
-          'messageChannel',
           activeWorkspace.id,
+          'messageChannel',
         );
       const messageChannels = await messageChannelRepository.find({
         select: ['id', 'syncStatus', 'connectedAccountId'],

From be20a690b30243cc80e9b94799c0a00d8cfb9fac Mon Sep 17 00:00:00 2001
From: Syed Md Mihan Chistie
 <42113027+Mihan786Chistie@users.noreply.github.com>
Date: Tue, 20 Aug 2024 14:35:13 +0530
Subject: [PATCH 5/8] added typechecking for all ts files (#6466)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: #6436

Changes made:

- Added typecheck step before twenty-ui build to check stories TS errors
- Added a tsconfig.dev.json to add stories and tests to typecheking when
in dev mode
- Added tsconfig.dev.json to storybook dev command of twenty-ui to
typecheck stories while developing
- Fixed twenty-ui stories that were broken

- Added a serve command to serve front build
- Fixed unit test from another PR

---------

Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
---
 nx.json                                       |   2 +-
 packages/twenty-front/project.json            |   6 +
 .../components/__stories__/Status.stories.tsx |   1 +
 .../src/utils/__tests__/title-utils.test.ts   |   4 -
 ...{tsconfig.app.json => tsconfig.build.json} |   0
 packages/twenty-front/tsconfig.dev.json       |  13 ++
 packages/twenty-front/tsconfig.json           |   7 +-
 packages/twenty-front/vite.config.ts          |   6 +-
 packages/twenty-ui/.storybook/main.ts         |  15 +++
 .../components/__stories__/Banner.stories.tsx |   5 +-
 .../twenty-ui/src/utilities/config/index.ts   |   4 +-
 ...{tsconfig.lib.json => tsconfig.build.json} |   0
 packages/twenty-ui/tsconfig.dev.json          |  19 +++
 packages/twenty-ui/tsconfig.json              |   5 +-
 packages/twenty-ui/vite.config.ts             | 114 ++++++++++--------
 15 files changed, 135 insertions(+), 66 deletions(-)
 rename packages/twenty-front/{tsconfig.app.json => tsconfig.build.json} (100%)
 create mode 100644 packages/twenty-front/tsconfig.dev.json
 rename packages/twenty-ui/{tsconfig.lib.json => tsconfig.build.json} (100%)
 create mode 100644 packages/twenty-ui/tsconfig.dev.json

diff --git a/nx.json b/nx.json
index 35b6e7501700..4ec242fd5172 100644
--- a/nx.json
+++ b/nx.json
@@ -32,7 +32,7 @@
     },
     "start": {
       "cache": true,
-      "dependsOn": ["^build"]
+      "dependsOn": ["^typecheck","^build"]
     },
     "lint": {
       "executor": "@nx/eslint:lint",
diff --git a/packages/twenty-front/project.json b/packages/twenty-front/project.json
index 636fd29af6a6..4dcb7f444a00 100644
--- a/packages/twenty-front/project.json
+++ b/packages/twenty-front/project.json
@@ -10,6 +10,12 @@
         "outputPath": "{projectRoot}/build"
       }
     },
+    "serve": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "npx serve -s {projectRoot}/build"
+      }
+    },
     "start": {
       "executor": "@nx/vite:dev-server",
       "options": {
diff --git a/packages/twenty-front/src/modules/ui/display/status/components/__stories__/Status.stories.tsx b/packages/twenty-front/src/modules/ui/display/status/components/__stories__/Status.stories.tsx
index 7db5637d0497..cd480d45aae2 100644
--- a/packages/twenty-front/src/modules/ui/display/status/components/__stories__/Status.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/display/status/components/__stories__/Status.stories.tsx
@@ -15,6 +15,7 @@ const meta: Meta<typeof Status> = {
   component: Status,
   args: {
     text: 'Urgent',
+    weight: 'medium',
   },
 };
 
diff --git a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts b/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
index 6fee91bf0a74..d67c5ecb0c47 100644
--- a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
@@ -9,10 +9,6 @@ describe('title-utils', () => {
     expect(getPageTitleFromPath('/invite/:workspaceInviteHash')).toBe('Invite');
     expect(getPageTitleFromPath('/create/workspace')).toBe('Create Workspace');
     expect(getPageTitleFromPath('/create/profile')).toBe('Create Profile');
-    expect(getPageTitleFromPath('/tasks')).toBe('Tasks');
-    expect(getPageTitleFromPath('/objects/opportunities')).toBe(
-      'Opportunities',
-    );
     expect(getPageTitleFromPath('/settings/objects/opportunities')).toBe(
       SettingsPageTitles.Objects,
     );
diff --git a/packages/twenty-front/tsconfig.app.json b/packages/twenty-front/tsconfig.build.json
similarity index 100%
rename from packages/twenty-front/tsconfig.app.json
rename to packages/twenty-front/tsconfig.build.json
diff --git a/packages/twenty-front/tsconfig.dev.json b/packages/twenty-front/tsconfig.dev.json
new file mode 100644
index 000000000000..f90dcae862bb
--- /dev/null
+++ b/packages/twenty-front/tsconfig.dev.json
@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": ["node"]
+  },
+  "include": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.d.ts",
+    "src/**/*.ts",
+    "src/**/*.tsx"
+  ]
+}
diff --git a/packages/twenty-front/tsconfig.json b/packages/twenty-front/tsconfig.json
index ac1d6e2f997e..f6c268d9c2fd 100644
--- a/packages/twenty-front/tsconfig.json
+++ b/packages/twenty-front/tsconfig.json
@@ -32,7 +32,10 @@
   "include": [],
   "references": [
     {
-      "path": "./tsconfig.app.json"
+      "path": "./tsconfig.dev.json"
+    },
+    {
+      "path": "./tsconfig.build.json"
     },
     {
       "path": "./tsconfig.spec.json"
@@ -42,4 +45,4 @@
     }
   ],
   "extends": "../../tsconfig.base.json"
-}
+}
\ No newline at end of file
diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts
index 924f9c9d7ee0..682b6466ab40 100644
--- a/packages/twenty-front/vite.config.ts
+++ b/packages/twenty-front/vite.config.ts
@@ -19,9 +19,13 @@ export default defineConfig(({ command, mode }) => {
 
   const isBuildCommand = command === 'build';
 
+  const tsConfigPath = isBuildCommand
+    ? path.resolve(__dirname, './tsconfig.build.json')
+    : path.resolve(__dirname, './tsconfig.dev.json');
+
   const checkers: Checkers = {
     typescript: {
-      tsconfigPath: path.resolve(__dirname, './tsconfig.app.json'),
+      tsconfigPath: tsConfigPath,
     },
     overlay: false,
   };
diff --git a/packages/twenty-ui/.storybook/main.ts b/packages/twenty-ui/.storybook/main.ts
index 270259adfdd7..f3f46370d125 100644
--- a/packages/twenty-ui/.storybook/main.ts
+++ b/packages/twenty-ui/.storybook/main.ts
@@ -1,4 +1,6 @@
 import { StorybookConfig } from '@storybook/react-vite';
+import * as path from 'path';
+import checker from 'vite-plugin-checker';
 
 const config: StorybookConfig = {
   stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
@@ -16,6 +18,19 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {},
   },
+  viteFinal: (config) => {
+    return {
+      ...config,
+      plugins: [
+        ...(config.plugins ?? []),
+        checker({
+          typescript: {
+            tsconfigPath: path.resolve(__dirname, '../tsconfig.dev.json'),
+          },
+        }),
+      ],
+    };
+  },
 };
 
 export default config;
diff --git a/packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.tsx b/packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.tsx
index 425209802564..73e6d6a316e8 100644
--- a/packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.tsx
+++ b/packages/twenty-ui/src/display/banner/components/__stories__/Banner.stories.tsx
@@ -13,10 +13,7 @@ const meta: Meta<typeof Banner> = {
       Sync lost with mailbox hello@twenty.com. Please reconnect for updates:
     </Banner>
   ),
-  argTypes: {
-    as: { control: false },
-    theme: { control: false },
-  },
+  argTypes: {},
 };
 
 export default meta;
diff --git a/packages/twenty-ui/src/utilities/config/index.ts b/packages/twenty-ui/src/utilities/config/index.ts
index 4525e814d61b..5038c501089a 100644
--- a/packages/twenty-ui/src/utilities/config/index.ts
+++ b/packages/twenty-ui/src/utilities/config/index.ts
@@ -25,6 +25,4 @@ const getDefaultUrl = () => {
 };
 
 export const REACT_APP_SERVER_BASE_URL =
-  window._env_?.REACT_APP_SERVER_BASE_URL ||
-  process.env.REACT_APP_SERVER_BASE_URL ||
-  getDefaultUrl();
+  window._env_?.REACT_APP_SERVER_BASE_URL || getDefaultUrl();
diff --git a/packages/twenty-ui/tsconfig.lib.json b/packages/twenty-ui/tsconfig.build.json
similarity index 100%
rename from packages/twenty-ui/tsconfig.lib.json
rename to packages/twenty-ui/tsconfig.build.json
diff --git a/packages/twenty-ui/tsconfig.dev.json b/packages/twenty-ui/tsconfig.dev.json
new file mode 100644
index 000000000000..7cf734bdd02d
--- /dev/null
+++ b/packages/twenty-ui/tsconfig.dev.json
@@ -0,0 +1,19 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "vite.config.ts",
+    "jest.config.ts",
+    "setupTests.ts",
+    "src/**/*.d.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.ts",
+    "src/**/*.stories.tsx",
+    "src/**/*.tsx",
+    "src/**/*.ts",
+    "vite.config.ts"
+  ]
+}
diff --git a/packages/twenty-ui/tsconfig.json b/packages/twenty-ui/tsconfig.json
index c7c587845c85..cb70a38df1ed 100644
--- a/packages/twenty-ui/tsconfig.json
+++ b/packages/twenty-ui/tsconfig.json
@@ -17,7 +17,10 @@
   "include": [],
   "references": [
     {
-      "path": "./tsconfig.lib.json"
+      "path": "./tsconfig.build.json"
+    },
+    {
+      "path": "./tsconfig.dev.json"
     },
     {
       "path": "./tsconfig.spec.json"
diff --git a/packages/twenty-ui/vite.config.ts b/packages/twenty-ui/vite.config.ts
index 3692ff065325..03fc2e351fbd 100644
--- a/packages/twenty-ui/vite.config.ts
+++ b/packages/twenty-ui/vite.config.ts
@@ -4,64 +4,78 @@ import wyw from '@wyw-in-js/vite';
 import * as path from 'path';
 import { defineConfig } from 'vite';
 import checker from 'vite-plugin-checker';
-import dts from 'vite-plugin-dts';
+import dts, { PluginOptions } from 'vite-plugin-dts';
 import svgr from 'vite-plugin-svgr';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
+import { UserPluginConfig } from 'vite-plugin-checker/dist/esm/types';
+
 // eslint-disable-next-line @nx/enforce-module-boundaries, import/no-relative-packages
 import packageJson from '../../package.json';
 
-export default defineConfig({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/packages/twenty-ui',
+export default defineConfig(({ command }) => {
+  const isBuildCommand = command === 'build';
 
-  plugins: [
-    react({ jsxImportSource: '@emotion/react' }),
-    tsconfigPaths(),
-    svgr(),
-    dts({
-      entryRoot: 'src',
-      tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
-    }),
-    checker({
-      typescript: {
-        tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
-      },
-    }),
-    wyw({
-      include: [
-        '**/OverflowingTextWithTooltip.tsx',
-        '**/Chip.tsx',
-        '**/Tag.tsx',
-        '**/Avatar.tsx',
-        '**/AvatarChip.tsx',
-      ],
-      babelOptions: {
-        presets: ['@babel/preset-typescript', '@babel/preset-react'],
-      },
-    }),
-  ],
+  const tsConfigPath = isBuildCommand
+    ? path.resolve(__dirname, './tsconfig.build.json')
+    : path.resolve(__dirname, './tsconfig.dev.json');
 
-  // Configuration for building your library.
-  // See: https://vitejs.dev/guide/build.html#library-mode
-  build: {
-    outDir: './dist',
-    reportCompressedSize: true,
-    commonjsOptions: {
-      transformMixedEsModules: true,
+  const checkersConfig: UserPluginConfig = {
+    typescript: {
+      tsconfigPath: tsConfigPath,
     },
-    lib: {
-      // Could also be a dictionary or array of multiple entry points.
-      entry: 'src/index.ts',
-      name: 'twenty-ui',
-      fileName: 'index',
-      // Change this to the formats you want to support.
-      // Don't forget to update your package.json as well.
-      formats: ['es', 'cjs'],
-    },
-    rollupOptions: {
-      // External packages that should not be bundled into your library.
-      external: Object.keys(packageJson.dependencies || {}),
+  };
+
+  const dtsConfig: PluginOptions = {
+    entryRoot: 'src',
+    tsconfigPath: tsConfigPath,
+  };
+
+  return {
+    root: __dirname,
+    cacheDir: '../../node_modules/.vite/packages/twenty-ui',
+
+    plugins: [
+      react({ jsxImportSource: '@emotion/react' }),
+      tsconfigPaths(),
+      svgr(),
+      dts(dtsConfig),
+      checker(checkersConfig),
+      wyw({
+        include: [
+          '**/OverflowingTextWithTooltip.tsx',
+          '**/Chip.tsx',
+          '**/Tag.tsx',
+          '**/Avatar.tsx',
+          '**/AvatarChip.tsx',
+        ],
+        babelOptions: {
+          presets: ['@babel/preset-typescript', '@babel/preset-react'],
+        },
+      }),
+    ],
+
+    // Configuration for building your library.
+    // See: https://vitejs.dev/guide/build.html#library-mode
+    build: {
+      outDir: './dist',
+      reportCompressedSize: true,
+      commonjsOptions: {
+        transformMixedEsModules: true,
+      },
+      lib: {
+        // Could also be a dictionary or array of multiple entry points.
+        entry: 'src/index.ts',
+        name: 'twenty-ui',
+        fileName: 'index',
+        // Change this to the formats you want to support.
+        // Don't forget to update your package.json as well.
+        formats: ['es', 'cjs'],
+      },
+      rollupOptions: {
+        // External packages that should not be bundled into your library.
+        external: Object.keys(packageJson.dependencies || {}),
+      },
     },
-  },
+  };
 });

From 3ae89d15de5c95f13b2c87388de97105bcdba291 Mon Sep 17 00:00:00 2001
From: Lucas Bordeau <bordeau.lucas@gmail.com>
Date: Tue, 20 Aug 2024 16:45:00 +0200
Subject: [PATCH 6/8] Fix post merge (#6699)

Fixed settingsPreviewRecordId state naming.
---
 .../components/MultiRecordSelect.tsx             |  1 +
 .../components/SettingsDataModelFieldPreview.tsx |  4 ++--
 .../SettingsDataModelSetFieldValueEffect.tsx     |  6 +++---
 .../SettingsDataModelSetRecordEffect.tsx         | 16 +++++++++-------
 .../preview/states/previewRecordIdState.ts       |  6 ------
 .../states/settingsPreviewRecordIdState.ts       |  6 ++++++
 6 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 packages/twenty-front/src/modules/settings/data-model/fields/preview/states/previewRecordIdState.ts
 create mode 100644 packages/twenty-front/src/modules/settings/data-model/fields/preview/states/settingsPreviewRecordIdState.ts

diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/components/MultiRecordSelect.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/components/MultiRecordSelect.tsx
index 0730c05059e3..87c0532208fe 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/components/MultiRecordSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/components/MultiRecordSelect.tsx
@@ -27,6 +27,7 @@ export const StyledSelectableItem = styled(SelectableItem)`
   height: 100%;
   width: 100%;
 `;
+
 export const MultiRecordSelect = ({
   onChange,
   onSubmit,
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
index 31b78cd0d4eb..a7b69af6a905 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
@@ -10,7 +10,7 @@ import { FieldContext } from '@/object-record/record-field/contexts/FieldContext
 import { BooleanFieldInput } from '@/object-record/record-field/meta-types/input/components/BooleanFieldInput';
 import { RatingFieldInput } from '@/object-record/record-field/meta-types/input/components/RatingFieldInput';
 import { SettingsDataModelSetFieldValueEffect } from '@/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect';
-import { SettingsDataModelSetRecordEffect } from '@/settings/data-model/fields/preview/components/SettingsDataModelSetRecordEffect';
+import { SettingsDataModelSetPreviewRecordEffect } from '@/settings/data-model/fields/preview/components/SettingsDataModelSetRecordEffect';
 import { useFieldPreviewValue } from '@/settings/data-model/fields/preview/hooks/useFieldPreviewValue';
 import { usePreviewRecord } from '@/settings/data-model/fields/preview/hooks/usePreviewRecord';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
@@ -96,7 +96,7 @@ export const SettingsDataModelFieldPreview = ({
   return (
     <>
       {previewRecord ? (
-        <SettingsDataModelSetRecordEffect
+        <SettingsDataModelSetPreviewRecordEffect
           fieldName={fieldName}
           record={previewRecord}
         />
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect.tsx
index 050ecbd68c5e..110591d3e119 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect.tsx
@@ -1,7 +1,7 @@
 import { useSetRecordFieldValue } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
-import { previewRecordIdState } from '@/settings/data-model/fields/preview/states/previewRecordIdState';
+import { settingsPreviewRecordIdState } from '@/settings/data-model/fields/preview/states/settingsPreviewRecordIdState';
 import { useEffect } from 'react';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
 import { isDefined } from '~/utils/isDefined';
@@ -17,10 +17,10 @@ export const SettingsDataModelSetFieldValueEffect = ({
   fieldName,
   value,
 }: SettingsDataModelSetFieldValueEffectProps) => {
-  const previewRecordId = useRecoilValue(previewRecordIdState);
+  const settingsPreviewRecordId = useRecoilValue(settingsPreviewRecordIdState);
 
   const upsertedPreviewRecord = useRecoilValue(
-    recordStoreFamilyState(previewRecordId ?? ''),
+    recordStoreFamilyState(settingsPreviewRecordId ?? ''),
   );
 
   const setFieldValue = useSetRecoilState(
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetRecordEffect.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetRecordEffect.tsx
index e5ceaf22f831..331f06e19cf3 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetRecordEffect.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetRecordEffect.tsx
@@ -1,34 +1,36 @@
 import { useSetRecordFieldValue } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { previewRecordIdState } from '@/settings/data-model/fields/preview/states/previewRecordIdState';
+import { settingsPreviewRecordIdState } from '@/settings/data-model/fields/preview/states/settingsPreviewRecordIdState';
 import { useEffect } from 'react';
 import { useSetRecoilState } from 'recoil';
 
-type SettingsDataModelSetRecordEffectProps = {
+type SettingsDataModelSetPreviewRecordEffectProps = {
   record: ObjectRecord;
   fieldName: string;
 };
 
-export const SettingsDataModelSetRecordEffect = ({
+export const SettingsDataModelSetPreviewRecordEffect = ({
   record,
   fieldName,
-}: SettingsDataModelSetRecordEffectProps) => {
+}: SettingsDataModelSetPreviewRecordEffectProps) => {
   const { upsertRecords: upsertRecordsInStore } = useUpsertRecordsInStore();
   const setRecordFieldValue = useSetRecordFieldValue();
 
-  const setPreviewRecordId = useSetRecoilState(previewRecordIdState);
+  const setSettingsPreviewRecordId = useSetRecoilState(
+    settingsPreviewRecordIdState,
+  );
 
   useEffect(() => {
     upsertRecordsInStore([record]);
     setRecordFieldValue(record.id, fieldName, record[fieldName]);
-    setPreviewRecordId(record.id);
+    setSettingsPreviewRecordId(record.id);
   }, [
     record,
     upsertRecordsInStore,
     setRecordFieldValue,
     fieldName,
-    setPreviewRecordId,
+    setSettingsPreviewRecordId,
   ]);
 
   return null;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/states/previewRecordIdState.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/states/previewRecordIdState.ts
deleted file mode 100644
index 3d37a853a67a..000000000000
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/states/previewRecordIdState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createState } from 'twenty-ui';
-
-export const previewRecordIdState = createState<string | null>({
-  key: 'previewRecordId',
-  defaultValue: null,
-});
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/states/settingsPreviewRecordIdState.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/states/settingsPreviewRecordIdState.ts
new file mode 100644
index 000000000000..68a5bbff9608
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/states/settingsPreviewRecordIdState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const settingsPreviewRecordIdState = createState<string | null>({
+  key: 'settingsPreviewRecordIdState',
+  defaultValue: null,
+});

From 17a1760afd1fdc46765d191f8a851b7d76a07d3e Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Tue, 20 Aug 2024 19:42:02 +0200
Subject: [PATCH 7/8] Improve performance twenty orm (#6691)

## Context

As we grow, the messaging scripts are experiencing performance issues
forcing us to temporarily disable them on the cloud.
While investigating the performance, I have noticed that generating the
entity schema (for twentyORM) in the repository is taking ~500ms locally
on my Mac M2 so likely more on pods. Caching the entitySchema then!

I'm also clarifying naming around schemaVersion and cacheVersions ==>
both are renamed workspaceMetadataVersion and migrated to the workspace
table (the workspaceCacheVersion table is dropped).
---
 .../src/generated/graphql.tsx                 |   2 +-
 .../src/generated-metadata/graphql.ts         |   5 +-
 .../twenty-front/src/generated/graphql.tsx    |  14 +-
 .../modules/apollo/hooks/useApolloFactory.ts  |   8 +-
 .../auth/states/currentWorkspaceState.ts      |   2 +-
 .../graphql/fragments/userQueryFragment.ts    |   2 +-
 .../src/testing/mock-data/users.ts            |   4 +-
 packages/twenty-server/@types/express.d.ts    |   2 +-
 ...hql-yoga-nestjs-npm-2.1.0-cb509e6047.patch |  12 +-
 packages/twenty-server/src/app.module.ts      |  20 +--
 .../data-seed-dev-workspace.command.ts        |  10 +-
 .../commands/database-command.module.ts       |   4 +-
 ...essage-channel-sync-status-enum.command.ts |   8 +-
 ...user-vars-accounts-to-reconnect.command.ts |   8 +-
 ...set-workspace-activation-status.command.ts |   8 +-
 .../0-23/0-23-update-activities.command.ts    |   8 +-
 .../0-23/0-23-upgrade-version.module.ts       |   4 +-
 .../upgrade-version/upgrade-version.module.ts |   4 +-
 ...MetadataVersionAndDatasourceOnWorkspace.ts |  31 +++++
 .../1724173061204-deprecateCacheVersion.ts    |  15 ++
 .../__tests__/workspace.factory.spec.ts       |   9 +-
 .../api/graphql/core-graphql-api.module.ts    |   6 +-
 .../hooks/use-cached-metadata.ts              |   5 +-
 .../graphql/metadata-graphql-api.module.ts    |  16 +--
 .../api/graphql/metadata.module-factory.ts    |  10 +-
 .../api/graphql/workspace-schema.factory.ts   |  22 +--
 .../google-apis-auth.controller.ts            |  18 +--
 .../auth/services/google-apis.service.ts      |  16 ++-
 .../auth/strategies/google.auth.strategy.ts   |   6 +-
 .../strategies/microsoft.auth.strategy.ts     |   2 +-
 .../auth/types/google-api-request.type.ts     |   2 +-
 .../file/controllers/file.controller.ts       |   4 +
 .../hooks/use-graphql-error-handler.hook.ts   |   8 +-
 .../engine/core-modules/user/user.resolver.ts |   9 +-
 .../workspace/workspace.entity.ts             |  12 ++
 .../workspace/workspace.module.ts             |   4 +-
 .../workspace/workspace.resolver.ts           |  25 ++--
 .../types/cache-storage-namespace.enum.ts     |   6 +-
 .../field-metadata/field-metadata.module.ts   |   6 +-
 .../field-metadata/field-metadata.service.ts  |  16 ++-
 .../metadata-engine.module.ts                 |   6 +-
 .../object-metadata/object-metadata.module.ts |   4 +-
 .../object-metadata.service.ts                |  18 ++-
 .../relation-metadata.module.ts               |   4 +-
 .../relation-metadata.service.ts              |  10 +-
 .../foreign-table/foreign-table.module.ts     |   4 +-
 .../foreign-table/foreign-table.service.ts    |   8 +-
 .../remote-table/remote-table.module.ts       |   4 +-
 .../remote-table/remote-table.service.ts      |  60 ++++----
 .../workspace-cache-version.entity.ts         |  25 ----
 .../workspace-cache-version.module.ts         |  14 --
 .../workspace-cache-version.service.ts        |  42 ------
 .../workspace-metadata-version.module.ts      |  16 +++
 .../workspace-metadata-version.service.ts     |  79 +++++++++++
 ...l-hydrate-request-from-token.middleware.ts |  13 +-
 .../load-service-with-workspace.context.ts    |  44 ------
 .../scoped-workspace-context.factory.ts       |   8 +-
 .../factories/workspace-datasource.factory.ts |  77 +++++++---
 .../twenty-orm/twenty-orm-core.module.ts      |  13 +-
 .../engine/twenty-orm/twenty-orm.manager.ts   |  11 +-
 .../workspace-cache-storage.module.ts         |   2 -
 .../workspace-cache-storage.service.ts        | 131 +++++++++++-------
 .../commands/delete-workspaces.command.ts     |  22 ++-
 .../workspace-migration-runner.module.ts      |   7 +-
 .../workspace-sync-metadata.module.ts         |   4 +-
 .../workspace-sync-metadata.service.ts        |   6 +-
 .../calendar-event-list-fetch.cron.job.ts     |   4 +
 .../jobs/calendar-event-list-fetch.job.ts     |   3 +
 .../calendar-channel-sync-status.service.ts   |   2 +-
 .../messaging-channel-sync-status.service.ts  |   2 +-
 .../messaging-message-list-fetch.cron.job.ts  |   4 +
 .../messaging-messages-import.cron.job.ts     |   3 +
 ...-single-message-to-cache-for-import.job.ts |   2 +-
 .../jobs/messaging-clean-cache.ts             |  10 +-
 .../jobs/messaging-message-list-fetch.job.ts  |   4 +
 .../jobs/messaging-messages-import.job.ts     |   4 +
 ...ssaging-full-message-list-fetch.service.ts |   2 +-
 .../messaging-messages-import.service.ts      |   2 +-
 ...ging-partial-message-list-fetch.service.ts |   2 +-
 ...age-channel-sync-status-monitoring.cron.ts |   4 +
 80 files changed, 584 insertions(+), 469 deletions(-)
 create mode 100644 packages/twenty-server/src/database/typeorm/core/migrations/1724173430043-introduceMetadataVersionAndDatasourceOnWorkspace.ts
 create mode 100644 packages/twenty-server/src/database/typeorm/metadata/migrations/1724173061204-deprecateCacheVersion.ts
 delete mode 100644 packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity.ts
 delete mode 100644 packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module.ts
 delete mode 100644 packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module.ts
 create mode 100644 packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service.ts
 delete mode 100644 packages/twenty-server/src/engine/twenty-orm/context/load-service-with-workspace.context.ts

diff --git a/packages/twenty-chrome-extension/src/generated/graphql.tsx b/packages/twenty-chrome-extension/src/generated/graphql.tsx
index b63bc43e61dd..27d954014743 100644
--- a/packages/twenty-chrome-extension/src/generated/graphql.tsx
+++ b/packages/twenty-chrome-extension/src/generated/graphql.tsx
@@ -7455,7 +7455,7 @@ export type Workspace = {
   billingSubscriptions?: Maybe<Array<BillingSubscription>>;
   createdAt: Scalars['DateTime'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
-  currentCacheVersion?: Maybe<Scalars['String']>;
+  metadataVersion?: Maybe<Scalars['String']>;
   deletedAt?: Maybe<Scalars['DateTime']>;
   displayName?: Maybe<Scalars['String']>;
   domainName?: Maybe<Scalars['String']>;
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index f5e61e07afd5..ca9941fc60c4 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -1380,7 +1380,9 @@ export type Workspace = {
   billingSubscriptions?: Maybe<Array<BillingSubscription>>;
   createdAt: Scalars['DateTime']['output'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
-  currentCacheVersion?: Maybe<Scalars['String']['output']>;
+  currentMetadataVersion: Scalars['Float']['output'];
+  databaseSchema: Scalars['String']['output'];
+  databaseUrl: Scalars['String']['output'];
   deletedAt?: Maybe<Scalars['DateTime']['output']>;
   displayName?: Maybe<Scalars['String']['output']>;
   domainName?: Maybe<Scalars['String']['output']>;
@@ -1388,6 +1390,7 @@ export type Workspace = {
   id: Scalars['UUID']['output'];
   inviteHash?: Maybe<Scalars['String']['output']>;
   logo?: Maybe<Scalars['String']['output']>;
+  metadataVersion: Scalars['Float']['output'];
   updatedAt: Scalars['DateTime']['output'];
   workspaceMembersCount?: Maybe<Scalars['Float']['output']>;
 };
diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
index cb973a45cf52..45bff9ca173c 100644
--- a/packages/twenty-front/src/generated/graphql.tsx
+++ b/packages/twenty-front/src/generated/graphql.tsx
@@ -1067,7 +1067,8 @@ export type Workspace = {
   billingSubscriptions?: Maybe<Array<BillingSubscription>>;
   createdAt: Scalars['DateTime'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
-  currentCacheVersion?: Maybe<Scalars['String']>;
+  databaseSchema: Scalars['String'];
+  databaseUrl: Scalars['String'];
   deletedAt?: Maybe<Scalars['DateTime']>;
   displayName?: Maybe<Scalars['String']>;
   domainName?: Maybe<Scalars['String']>;
@@ -1075,6 +1076,7 @@ export type Workspace = {
   id: Scalars['UUID'];
   inviteHash?: Maybe<Scalars['String']>;
   logo?: Maybe<Scalars['String']>;
+  metadataVersion: Scalars['Float'];
   updatedAt: Scalars['DateTime'];
   workspaceMembersCount?: Maybe<Scalars['Float']>;
 };
@@ -1360,7 +1362,7 @@ export type ImpersonateMutationVariables = Exact<{
 }>;
 
 
-export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
+export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, metadataVersion: number, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
 
 export type RenewTokenMutationVariables = Exact<{
   appToken: Scalars['String'];
@@ -1392,7 +1394,7 @@ export type VerifyMutationVariables = Exact<{
 }>;
 
 
-export type VerifyMutation = { __typename?: 'Mutation', verify: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
+export type VerifyMutation = { __typename?: 'Mutation', verify: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, metadataVersion: number, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
 
 export type CheckUserExistsQueryVariables = Exact<{
   email: Scalars['String'];
@@ -1453,7 +1455,7 @@ export type GetAisqlQueryQueryVariables = Exact<{
 
 export type GetAisqlQueryQuery = { __typename?: 'Query', getAISQLQuery: { __typename?: 'AISQLQueryResult', sqlQuery: string, sqlQueryResult?: string | null, queryFailedErrorMessage?: string | null } };
 
-export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> };
+export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, metadataVersion: number, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> };
 
 export type DeleteUserAccountMutationVariables = Exact<{ [key: string]: never; }>;
 
@@ -1470,7 +1472,7 @@ export type UploadProfilePictureMutation = { __typename?: 'Mutation', uploadProf
 export type GetCurrentUserQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> } };
+export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, metadataVersion: number, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> } };
 
 export type WorkspaceMemberQueryFragmentFragment = { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } };
 
@@ -1652,7 +1654,7 @@ export const UserQueryFragmentFragmentDoc = gql`
       value
       workspaceId
     }
-    currentCacheVersion
+    metadataVersion
     currentBillingSubscription {
       id
       status
diff --git a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
index 351ac8289350..b70cbdd17cb8 100644
--- a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
+++ b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
@@ -1,6 +1,6 @@
+import { InMemoryCache, NormalizedCacheObject } from '@apollo/client';
 import { useMemo, useRef } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { InMemoryCache, NormalizedCacheObject } from '@apollo/client';
 import { useRecoilState, useSetRecoilState } from 'recoil';
 
 import { currentUserState } from '@/auth/states/currentUserState';
@@ -49,8 +49,8 @@ export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
         },
       }),
       headers: {
-        ...(currentWorkspace?.currentCacheVersion && {
-          'X-Schema-Version': currentWorkspace.currentCacheVersion,
+        ...(currentWorkspace?.metadataVersion && {
+          'X-Schema-Version': `${currentWorkspace.metadataVersion}`,
         }),
       },
       defaultOptions: {
@@ -95,7 +95,7 @@ export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
     setCurrentWorkspace,
     setWorkspaces,
     isDebugMode,
-    currentWorkspace?.currentCacheVersion,
+    currentWorkspace?.metadataVersion,
     setPreviousUrl,
   ]);
 
diff --git a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
index a66d7bd1cb06..8dd9ea7bc791 100644
--- a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
+++ b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
@@ -13,7 +13,7 @@ export type CurrentWorkspace = Pick<
   | 'activationStatus'
   | 'currentBillingSubscription'
   | 'workspaceMembersCount'
-  | 'currentCacheVersion'
+  | 'metadataVersion'
 >;
 
 export const currentWorkspaceState = createState<CurrentWorkspace | null>({
diff --git a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
index 0d1971e29744..76e5400c34e9 100644
--- a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
+++ b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
@@ -29,7 +29,7 @@ export const USER_QUERY_FRAGMENT = gql`
         value
         workspaceId
       }
-      currentCacheVersion
+      metadataVersion
       currentBillingSubscription {
         id
         status
diff --git a/packages/twenty-front/src/testing/mock-data/users.ts b/packages/twenty-front/src/testing/mock-data/users.ts
index 5d6514c42867..f7a4c2727e22 100644
--- a/packages/twenty-front/src/testing/mock-data/users.ts
+++ b/packages/twenty-front/src/testing/mock-data/users.ts
@@ -63,7 +63,7 @@ export const mockDefaultWorkspace: Workspace = {
   ],
   createdAt: '2023-04-26T10:23:42.33625+00:00',
   updatedAt: '2023-04-26T10:23:42.33625+00:00',
-  currentCacheVersion: '1',
+  metadataVersion: 1,
   currentBillingSubscription: {
     __typename: 'BillingSubscription',
     id: '7efbc3f7-6e5e-4128-957e-8d86808cdf6a',
@@ -71,6 +71,8 @@ export const mockDefaultWorkspace: Workspace = {
     status: SubscriptionStatus.Active,
   },
   workspaceMembersCount: 1,
+  databaseSchema: '',
+  databaseUrl: '',
 };
 
 export const mockedWorkspaceMemberData: WorkspaceMember = {
diff --git a/packages/twenty-server/@types/express.d.ts b/packages/twenty-server/@types/express.d.ts
index 89fea7d77c9f..1e45cf88d079 100644
--- a/packages/twenty-server/@types/express.d.ts
+++ b/packages/twenty-server/@types/express.d.ts
@@ -8,6 +8,6 @@ declare module 'express-serve-static-core' {
     apiKey?: ApiKeyWorkspaceEntity | null;
     workspace?: Workspace;
     workspaceId?: string;
-    cacheVersion?: string | null;
+    workspaceMetadataVersion?: number;
   }
 }
diff --git a/packages/twenty-server/patches/@graphql-yoga-nestjs-npm-2.1.0-cb509e6047.patch b/packages/twenty-server/patches/@graphql-yoga-nestjs-npm-2.1.0-cb509e6047.patch
index 70572a4907ee..b15363c16b86 100644
--- a/packages/twenty-server/patches/@graphql-yoga-nestjs-npm-2.1.0-cb509e6047.patch
+++ b/packages/twenty-server/patches/@graphql-yoga-nestjs-npm-2.1.0-cb509e6047.patch
@@ -32,7 +32,7 @@ index 16843949d8589a299d8195b0a349ac4dac0bacbf..21e7fe2bbcba36b04a274be9d2219fd3
              ...options,
 +            schema: async (request) => {
 +                const workspaceId = request.req.workspace?.id ?? 'anonymous'
-+                const workspaceCacheVersion = request.req.cacheVersion ?? '0'
++                const workspaceCacheVersion = request.req.workspaceMetadataVersion ?? '0'
 +                const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +                const url = request.req.baseUrl
 +
@@ -79,7 +79,7 @@ index 16843949d8589a299d8195b0a349ac4dac0bacbf..21e7fe2bbcba36b04a274be9d2219fd3
              ...options,
 +            schema: async (request) => {
 +                const workspaceId = request.req.workspace?.id ?? 'anonymous'
-+                const workspaceCacheVersion = request.req.cacheVersion ?? '0'
++                const workspaceCacheVersion = request.req.workspaceMetadataVersion ?? '0'
 +                const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +                const url = request.req.baseUrl
 +
@@ -146,7 +146,7 @@ index 7068c519320b379917c46763cd280b1cdd3e48f0..418e1030373fc1e0fb85a932ac8da9b3
              ...options,
 +            schema: async (request) => {
 +                const workspaceId = request.req.workspace?.id ?? 'anonymous'
-+                const workspaceCacheVersion = request.req.cacheVersion ?? '0'
++                const workspaceCacheVersion = request.req.workspaceMetadataVersion ?? '0'
 +                const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +                const url = request.req.baseUrl
 +
@@ -193,7 +193,7 @@ index 7068c519320b379917c46763cd280b1cdd3e48f0..418e1030373fc1e0fb85a932ac8da9b3
              ...options,
 +            schema: async (request) => {
 +                const workspaceId = request.req.workspace?.id ?? 'anonymous'
-+                const workspaceCacheVersion = request.req.cacheVersion ?? '0'
++                const workspaceCacheVersion = request.req.workspaceMetadataVersion ?? '0'
 +                const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +                const url = request.req.baseUrl
 +
@@ -387,7 +387,7 @@ index ce142f61ede52499485b19d8af057f4cb828d0f7..5888d31cae1b7aca57ed0819209812ac
        ...options,
 +      schema: async request => {
 +        const workspaceId = request.req.workspace.id
-+        const workspaceCacheVersion = request.req.cacheVersion
++        const workspaceCacheVersion = request.req.workspaceMetadataVersion
 +        const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +        const url = request.req.baseUrl
 +
@@ -448,7 +448,7 @@ index ce142f61ede52499485b19d8af057f4cb828d0f7..5888d31cae1b7aca57ed0819209812ac
        ...options,
 +      schema: async request => {
 +        const workspaceId = request.req.workspace.id
-+        const workspaceCacheVersion = request.req.cacheVersion
++        const workspaceCacheVersion = request.req.workspaceMetadataVersion
 +        const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +        const url = request.req.baseUrl
 +
diff --git a/packages/twenty-server/src/app.module.ts b/packages/twenty-server/src/app.module.ts
index 914b5b295f6c..6e7b5316e4ee 100644
--- a/packages/twenty-server/src/app.module.ts
+++ b/packages/twenty-server/src/app.module.ts
@@ -5,27 +5,27 @@ import {
   RequestMethod,
 } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { ServeStaticModule } from '@nestjs/serve-static';
 import { GraphQLModule } from '@nestjs/graphql';
+import { ServeStaticModule } from '@nestjs/serve-static';
 
 import { existsSync } from 'fs';
 import { join } from 'path';
 
-import { YogaDriverConfig, YogaDriver } from '@graphql-yoga/nestjs';
+import { YogaDriver, YogaDriverConfig } from '@graphql-yoga/nestjs';
 
-import { RestApiModule } from 'src/engine/api/rest/rest-api.module';
-import { ModulesModule } from 'src/modules/modules.module';
 import { CoreGraphQLApiModule } from 'src/engine/api/graphql/core-graphql-api.module';
-import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
 import { GraphQLConfigModule } from 'src/engine/api/graphql/graphql-config/graphql-config.module';
 import { GraphQLConfigService } from 'src/engine/api/graphql/graphql-config/graphql-config.service';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
-import { GraphQLHydrateRequestFromTokenMiddleware } from 'src/engine/middlewares/graphql-hydrate-request-from-token.middleware';
-import { MessageQueueModule } from 'src/engine/integrations/message-queue/message-queue.module';
+import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
+import { RestApiModule } from 'src/engine/api/rest/rest-api.module';
 import { MessageQueueDriverType } from 'src/engine/integrations/message-queue/interfaces';
+import { MessageQueueModule } from 'src/engine/integrations/message-queue/message-queue.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
+import { GraphQLHydrateRequestFromTokenMiddleware } from 'src/engine/middlewares/graphql-hydrate-request-from-token.middleware';
+import { ModulesModule } from 'src/modules/modules.module';
 
-import { IntegrationsModule } from './engine/integrations/integrations.module';
 import { CoreEngineModule } from './engine/core-modules/core-engine.module';
+import { IntegrationsModule } from './engine/integrations/integrations.module';
 
 @Module({
   imports: [
@@ -52,7 +52,7 @@ import { CoreEngineModule } from './engine/core-modules/core-engine.module';
     // Modules module, contains all business logic modules
     ModulesModule,
     // Needed for the user workspace middleware
-    WorkspaceCacheVersionModule,
+    WorkspaceMetadataVersionModule,
     // Api modules
     CoreGraphQLApiModule,
     MetadataGraphQLApiModule,
diff --git a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
index 2152c787807a..6e5fef348b0a 100644
--- a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
+++ b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
@@ -1,8 +1,7 @@
 import { Logger } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
 
 import { Command, CommandRunner } from 'nest-commander';
-import { EntityManager, Repository } from 'typeorm';
+import { EntityManager } from 'typeorm';
 
 import { seedCoreSchema } from 'src/database/typeorm-seeds/core';
 import {
@@ -39,7 +38,6 @@ import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-
 import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 import { viewPrefillData } from 'src/engine/workspace-manager/standard-objects-prefill-data/view';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
@@ -61,12 +59,9 @@ export class DataSeedWorkspaceCommand extends CommandRunner {
     private readonly workspaceSyncMetadataService: WorkspaceSyncMetadataService,
     private readonly workspaceDataSourceService: WorkspaceDataSourceService,
     private readonly fieldMetadataService: FieldMetadataService,
-    @InjectRepository(ObjectMetadataEntity, 'metadata')
-    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
     private readonly objectMetadataService: ObjectMetadataService,
-    @InjectCacheStorage(CacheStorageNamespace.WorkspaceSchema)
+    @InjectCacheStorage(CacheStorageNamespace.EngineWorkspace)
     private readonly workspaceSchemaCache: CacheStorageService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
   ) {
     super();
   }
@@ -75,7 +70,6 @@ export class DataSeedWorkspaceCommand extends CommandRunner {
     try {
       for (const workspaceId of this.workspaceIds) {
         await this.workspaceSchemaCache.flush();
-        await this.workspaceCacheVersionService.deleteVersion(workspaceId);
 
         await rawDataSource.initialize();
 
diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts
index 80d685c955a9..6bf31eb73c2a 100644
--- a/packages/twenty-server/src/database/commands/database-command.module.ts
+++ b/packages/twenty-server/src/database/commands/database-command.module.ts
@@ -19,7 +19,7 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/
 import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
 import { WorkspaceStatusModule } from 'src/engine/workspace-manager/workspace-status/workspace-manager.module';
@@ -45,7 +45,7 @@ import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/worksp
     ObjectMetadataModule,
     FieldMetadataModule,
     DataSeedDemoWorkspaceModule,
-    WorkspaceCacheVersionModule,
+    WorkspaceMetadataVersionModule,
     UpgradeTo0_23CommandModule,
     UpgradeVersionModule,
   ],
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-migrate-message-channel-sync-status-enum.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-migrate-message-channel-sync-status-enum.command.ts
index 47e45fc0a655..5e31d61c2b50 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-migrate-message-channel-sync-status-enum.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-migrate-message-channel-sync-status-enum.command.ts
@@ -10,7 +10,7 @@ import { TypeORMService } from 'src/database/typeorm/typeorm.service';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { WorkspaceStatusService } from 'src/engine/workspace-manager/workspace-status/services/workspace-status.service';
 import { MessageChannelSyncStatus } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 
@@ -34,7 +34,7 @@ export class MigrateMessageChannelSyncStatusEnumCommand extends CommandRunner {
     private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
     private readonly typeORMService: TypeORMService,
     private readonly dataSourceService: DataSourceService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
   ) {
     super();
   }
@@ -212,7 +212,9 @@ export class MigrateMessageChannelSyncStatusEnumCommand extends CommandRunner {
           options: newOptions,
         });
 
-        await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+        await this.workspaceMetadataVersionService.incrementMetadataVersion(
+          workspaceId,
+        );
 
         this.logger.log(
           chalk.green(`Running command on workspace ${workspaceId} done`),
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-set-user-vars-accounts-to-reconnect.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-set-user-vars-accounts-to-reconnect.command.ts
index 875a9fdaa603..726d698eac38 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-set-user-vars-accounts-to-reconnect.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-set-user-vars-accounts-to-reconnect.command.ts
@@ -13,7 +13,7 @@ import {
   Workspace,
   WorkspaceActivationStatus,
 } from 'src/engine/core-modules/workspace/workspace.entity';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { CalendarChannelSyncStatus } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
 import { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';
@@ -34,7 +34,7 @@ export class SetUserVarsAccountsToReconnectCommand extends CommandRunner {
     SetUserVarsAccountsToReconnectCommand.name,
   );
   constructor(
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
     private readonly accountsToReconnectService: AccountsToReconnectService,
     @InjectRepository(KeyValuePair, 'core')
@@ -149,7 +149,9 @@ export class SetUserVarsAccountsToReconnectCommand extends CommandRunner {
           throw error;
         }
 
-        await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+        await this.workspaceMetadataVersionService.incrementMetadataVersion(
+          workspaceId,
+        );
 
         this.logger.log(
           chalk.green(`Running command on workspace ${workspaceId} done`),
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-set-workspace-activation-status.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-set-workspace-activation-status.command.ts
index 7331b7fde219..8021a41830d3 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-set-workspace-activation-status.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-set-workspace-activation-status.command.ts
@@ -12,7 +12,7 @@ import {
   WorkspaceActivationStatus,
 } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 
 interface SetWorkspaceActivationStatusCommandOptions {
   workspaceId?: string;
@@ -31,7 +31,7 @@ export class SetWorkspaceActivationStatusCommand extends CommandRunner {
     private readonly workspaceRepository: Repository<Workspace>,
     private readonly typeORMService: TypeORMService,
     private readonly dataSourceService: DataSourceService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
     private readonly billingSubscriptionService: BillingSubscriptionService,
   ) {
     super();
@@ -97,7 +97,9 @@ export class SetWorkspaceActivationStatusCommand extends CommandRunner {
           }
         }
 
-        await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+        await this.workspaceMetadataVersionService.incrementMetadataVersion(
+          workspaceId,
+        );
 
         this.logger.log(
           chalk.green(`Running command on workspace ${workspaceId} done`),
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-update-activities.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-update-activities.command.ts
index fcc8b7b3cf0d..da4db435a295 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-update-activities.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-update-activities.command.ts
@@ -9,7 +9,7 @@ import { TypeORMService } from 'src/database/typeorm/typeorm.service';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { notesAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/notes-all.view';
 import { tasksAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/tasks-all.view';
@@ -44,7 +44,7 @@ export class UpdateActivitiesCommand extends CommandRunner {
     private readonly workspaceStatusService: WorkspaceStatusService,
     private readonly typeORMService: TypeORMService,
     private readonly dataSourceService: DataSourceService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
     private readonly objectMetadataService: ObjectMetadataService,
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {
@@ -400,7 +400,9 @@ export class UpdateActivitiesCommand extends CommandRunner {
           .execute();
       }
 
-      await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+      await this.workspaceMetadataVersionService.incrementMetadataVersion(
+        workspaceId,
+      );
     }
   }
 
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-upgrade-version.module.ts
index e62f15b65f15..09fbe2fb9f98 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-upgrade-version.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-upgrade-version.module.ts
@@ -21,7 +21,7 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/
 import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceStatusModule } from 'src/engine/workspace-manager/workspace-status/workspace-manager.module';
 import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
 import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';
@@ -35,7 +35,7 @@ import { ViewModule } from 'src/modules/view/view.module';
     OnboardingModule,
     TypeORMModule,
     DataSourceModule,
-    WorkspaceCacheVersionModule,
+    WorkspaceMetadataVersionModule,
     FieldMetadataModule,
     DataSourceModule,
     WorkspaceStatusModule,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/upgrade-version.module.ts
index d0d869b408ae..2cfefd9d0b0a 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/upgrade-version.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/upgrade-version.module.ts
@@ -21,7 +21,7 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/
 import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
 import { WorkspaceStatusModule } from 'src/engine/workspace-manager/workspace-status/workspace-manager.module';
@@ -48,7 +48,7 @@ import { ViewModule } from 'src/modules/view/view.module';
     WorkspaceStatusModule,
     ObjectMetadataModule,
     DataSeedDemoWorkspaceModule,
-    WorkspaceCacheVersionModule,
+    WorkspaceMetadataVersionModule,
     FieldMetadataModule,
     ViewModule,
     BillingModule,
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1724173430043-introduceMetadataVersionAndDatasourceOnWorkspace.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1724173430043-introduceMetadataVersionAndDatasourceOnWorkspace.ts
new file mode 100644
index 000000000000..f53ccd85f410
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/1724173430043-introduceMetadataVersionAndDatasourceOnWorkspace.ts
@@ -0,0 +1,31 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class IntroduceMetadataVersionAndDatasourceOnWorkspace1724173430043
+  implements MigrationInterface
+{
+  name = 'IntroduceMetadataVersionAndDatasourceOnWorkspace1724173430043';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ADD "metadataVersion" integer NOT NULL DEFAULT '1'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ADD "databaseUrl" character varying NOT NULL DEFAULT ''`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ADD "databaseSchema" character varying NOT NULL DEFAULT ''`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" DROP COLUMN "databaseSchema"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" DROP COLUMN "databaseUrl"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" DROP COLUMN "metadataVersion"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/metadata/migrations/1724173061204-deprecateCacheVersion.ts b/packages/twenty-server/src/database/typeorm/metadata/migrations/1724173061204-deprecateCacheVersion.ts
new file mode 100644
index 000000000000..37a5d6674a26
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/metadata/migrations/1724173061204-deprecateCacheVersion.ts
@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class DeprecateCacheVersion1724173061204 implements MigrationInterface {
+  name = 'DeprecateCacheVersion1724173061204';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE "metadata"."workspaceCacheVersion"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "metadata"."workspaceCacheVersion" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "workspaceId" uuid NOT NULL, "version" character varying NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "UQ_1a80ecf2638b477809403cc26ed" UNIQUE ("workspaceId"), CONSTRAINT "PK_5d502f8dbfb5b9a8bf2439320e9" PRIMARY KEY ("id"))`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/graphql/__tests__/workspace.factory.spec.ts b/packages/twenty-server/src/engine/api/graphql/__tests__/workspace.factory.spec.ts
index f3554cdde0ba..57d051363e3f 100644
--- a/packages/twenty-server/src/engine/api/graphql/__tests__/workspace.factory.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/__tests__/workspace.factory.spec.ts
@@ -1,11 +1,12 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
-import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
 import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';
 import { WorkspaceResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory';
 import { WorkspaceGraphQLSchemaFactory } from 'src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory';
 import { WorkspaceSchemaFactory } from 'src/engine/api/graphql/workspace-schema.factory';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
 
 describe('WorkspaceSchemaFactory', () => {
@@ -39,6 +40,10 @@ describe('WorkspaceSchemaFactory', () => {
           provide: WorkspaceCacheStorageService,
           useValue: {},
         },
+        {
+          provide: WorkspaceMetadataVersionService,
+          useValue: {},
+        },
       ],
     }).compile();
 
diff --git a/packages/twenty-server/src/engine/api/graphql/core-graphql-api.module.ts b/packages/twenty-server/src/engine/api/graphql/core-graphql-api.module.ts
index 33c24c621f78..c9b0aa852312 100644
--- a/packages/twenty-server/src/engine/api/graphql/core-graphql-api.module.ts
+++ b/packages/twenty-server/src/engine/api/graphql/core-graphql-api.module.ts
@@ -1,10 +1,11 @@
 import { Module } from '@nestjs/common';
 
-import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
 import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';
-import { WorkspaceSchemaBuilderModule } from 'src/engine/api/graphql/workspace-schema-builder/workspace-schema-builder.module';
 import { WorkspaceResolverBuilderModule } from 'src/engine/api/graphql/workspace-resolver-builder/workspace-resolver-builder.module';
+import { WorkspaceSchemaBuilderModule } from 'src/engine/api/graphql/workspace-schema-builder/workspace-schema-builder.module';
 import { MetadataEngineModule } from 'src/engine/metadata-modules/metadata-engine.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
+import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
 
 import { WorkspaceSchemaFactory } from './workspace-schema.factory';
 
@@ -21,6 +22,7 @@ import { WorkspaceSchemaFactory } from './workspace-schema.factory';
     WorkspaceSchemaBuilderModule,
     WorkspaceResolverBuilderModule,
     WorkspaceCacheStorageModule,
+    WorkspaceMetadataVersionModule,
   ],
   providers: [WorkspaceSchemaFactory, ScalarsExplorerService],
   exports: [WorkspaceSchemaFactory],
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-config/hooks/use-cached-metadata.ts b/packages/twenty-server/src/engine/api/graphql/graphql-config/hooks/use-cached-metadata.ts
index 3e3be6b1bef5..d8b7de5d67dc 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-config/hooks/use-cached-metadata.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-config/hooks/use-cached-metadata.ts
@@ -9,10 +9,11 @@ export type CacheMetadataPluginConfig = {
 export function useCachedMetadata(config: CacheMetadataPluginConfig): Plugin {
   const computeCacheKey = (serverContext: any) => {
     const workspaceId = serverContext.req.workspace?.id ?? 'anonymous';
-    const cacheVersion = serverContext.req.cacheVersion ?? '0';
+    const workspaceMetadataVersion =
+      serverContext.req.workspaceMetadataVersion ?? '0';
     const operationName = getOperationName(serverContext);
 
-    return `cachedOperations:${operationName}:${workspaceId}:${cacheVersion}`;
+    return `graphql:operations:${operationName}:${workspaceId}:${workspaceMetadataVersion}`;
   };
 
   const getOperationName = (serverContext: any) =>
diff --git a/packages/twenty-server/src/engine/api/graphql/metadata-graphql-api.module.ts b/packages/twenty-server/src/engine/api/graphql/metadata-graphql-api.module.ts
index cc41b6e742ff..3d0627ce7336 100644
--- a/packages/twenty-server/src/engine/api/graphql/metadata-graphql-api.module.ts
+++ b/packages/twenty-server/src/engine/api/graphql/metadata-graphql-api.module.ts
@@ -1,19 +1,18 @@
 import { Module } from '@nestjs/common';
 import { GraphQLModule } from '@nestjs/graphql';
 
-import { YogaDriverConfig, YogaDriver } from '@graphql-yoga/nestjs';
+import { YogaDriver, YogaDriverConfig } from '@graphql-yoga/nestjs';
 
-import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
-import { MetadataEngineModule } from 'src/engine/metadata-modules/metadata-engine.module';
 import { GraphQLConfigModule } from 'src/engine/api/graphql/graphql-config/graphql-config.module';
 import { metadataModuleFactory } from 'src/engine/api/graphql/metadata.module-factory';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
-import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
 import { DataloaderModule } from 'src/engine/dataloaders/dataloader.module';
 import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';
 import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
-import { CacheStorageModule } from 'src/engine/integrations/cache-storage/cache-storage.module';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { MetadataEngineModule } from 'src/engine/metadata-modules/metadata-engine.module';
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
+import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
 
 @Module({
   imports: [
@@ -25,13 +24,12 @@ import { CacheStorageModule } from 'src/engine/integrations/cache-storage/cache-
         EnvironmentService,
         ExceptionHandlerService,
         DataloaderService,
-        CacheStorageNamespace.WorkspaceSchema,
+        CacheStorageNamespace.EngineWorkspace,
       ],
     }),
     MetadataEngineModule,
     WorkspaceMigrationRunnerModule,
     WorkspaceMigrationModule,
-    CacheStorageModule,
   ],
 })
 export class MetadataGraphQLApiModule {}
diff --git a/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts b/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts
index 3d2e2b7e1584..5297b747b954 100644
--- a/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts
@@ -15,7 +15,7 @@ export const metadataModuleFactory = async (
   environmentService: EnvironmentService,
   exceptionHandlerService: ExceptionHandlerService,
   dataloaderService: DataloaderService,
-  workspaceSchemaCacheStorage: CacheStorageService,
+  cacheStorageService: CacheStorageService,
 ): Promise<YogaDriverConfig> => {
   const config: YogaDriverConfig = {
     autoSchemaFile: true,
@@ -36,12 +36,8 @@ export const metadataModuleFactory = async (
         exceptionHandlerService,
       }),
       useCachedMetadata({
-        cacheGetter: workspaceSchemaCacheStorage.get.bind(
-          workspaceSchemaCacheStorage,
-        ),
-        cacheSetter: workspaceSchemaCacheStorage.set.bind(
-          workspaceSchemaCacheStorage,
-        ),
+        cacheGetter: cacheStorageService.get.bind(cacheStorageService),
+        cacheSetter: cacheStorageService.set.bind(cacheStorageService),
         operationsToCache: ['ObjectMetadataItems'],
       }),
     ],
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
index f06c94c20167..c82f3d18fe1d 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
@@ -1,17 +1,18 @@
 import { Injectable } from '@nestjs/common';
 
-import { GraphQLSchema, printSchema } from 'graphql';
 import { makeExecutableSchema } from '@graphql-tools/schema';
+import { GraphQLSchema, printSchema } from 'graphql';
 import { gql } from 'graphql-tag';
 
-import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
-import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
-import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
 import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';
-import { WorkspaceGraphQLSchemaFactory } from 'src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory';
 import { workspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/factories/factories';
 import { WorkspaceResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory';
+import { WorkspaceGraphQLSchemaFactory } from 'src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory';
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
+import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
 
 @Injectable()
 export class WorkspaceSchemaFactory {
@@ -22,6 +23,7 @@ export class WorkspaceSchemaFactory {
     private readonly workspaceGraphQLSchemaFactory: WorkspaceGraphQLSchemaFactory,
     private readonly workspaceResolverFactory: WorkspaceResolverFactory,
     private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
   ) {}
 
   async createGraphQLSchema(authContext: AuthContext): Promise<GraphQLSchema> {
@@ -40,7 +42,7 @@ export class WorkspaceSchemaFactory {
     }
 
     // Validate cache version
-    await this.workspaceCacheStorageService.validateCacheVersion(
+    await this.workspaceMetadataVersionService.flushCacheIfMetadataVersionIsOutdated(
       authContext.workspace.id,
     );
 
@@ -64,11 +66,11 @@ export class WorkspaceSchemaFactory {
     }
 
     // Get typeDefs from cache
-    let typeDefs = await this.workspaceCacheStorageService.getTypeDefs(
+    let typeDefs = await this.workspaceCacheStorageService.getGraphQLTypeDefs(
       authContext.workspace.id,
     );
     let usedScalarNames =
-      await this.workspaceCacheStorageService.getUsedScalarNames(
+      await this.workspaceCacheStorageService.getGraphQLUsedScalarNames(
         authContext.workspace.id,
       );
 
@@ -84,11 +86,11 @@ export class WorkspaceSchemaFactory {
         this.scalarsExplorerService.getUsedScalarNames(autoGeneratedSchema);
       typeDefs = printSchema(autoGeneratedSchema);
 
-      await this.workspaceCacheStorageService.setTypeDefs(
+      await this.workspaceCacheStorageService.setGraphQLTypeDefs(
         authContext.workspace.id,
         typeDefs,
       );
-      await this.workspaceCacheStorageService.setUsedScalarNames(
+      await this.workspaceCacheStorageService.setGraphQLUsedScalarNames(
         authContext.workspace.id,
         usedScalarNames,
       );
diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts
index de2fe47504b4..a2fe6db4805a 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts
@@ -21,7 +21,6 @@ import { TokenService } from 'src/engine/core-modules/auth/services/token.servic
 import { GoogleAPIsRequest } from 'src/engine/core-modules/auth/types/google-api-request.type';
 import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding.service';
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
-import { LoadServiceWithWorkspaceContext } from 'src/engine/twenty-orm/context/load-service-with-workspace.context';
 
 @Controller('auth/google-apis')
 @UseFilters(AuthRestApiExceptionFilter)
@@ -31,7 +30,6 @@ export class GoogleAPIsAuthController {
     private readonly tokenService: TokenService,
     private readonly environmentService: EnvironmentService,
     private readonly onboardingService: OnboardingService,
-    private readonly loadServiceWithWorkspaceContext: LoadServiceWithWorkspaceContext,
   ) {}
 
   @Get()
@@ -80,13 +78,7 @@ export class GoogleAPIsAuthController {
 
     const handle = emails[0].value;
 
-    const googleAPIsServiceInstance =
-      await this.loadServiceWithWorkspaceContext.load(
-        this.googleAPIsService,
-        workspaceId,
-      );
-
-    await googleAPIsServiceInstance.refreshGoogleRefreshToken({
+    await this.googleAPIsService.refreshGoogleRefreshToken({
       handle,
       workspaceMemberId: workspaceMemberId,
       workspaceId: workspaceId,
@@ -97,13 +89,7 @@ export class GoogleAPIsAuthController {
     });
 
     if (userId) {
-      const onboardingServiceInstance =
-        await this.loadServiceWithWorkspaceContext.load(
-          this.onboardingService,
-          workspaceId,
-        );
-
-      await onboardingServiceInstance.setOnboardingConnectAccountPending({
+      await this.onboardingService.setOnboardingConnectAccountPending({
         userId,
         workspaceId,
         value: false,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
index 157c82ab7fd7..dcee921d280a 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
@@ -8,7 +8,7 @@ import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decora
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
-import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import {
   CalendarEventListFetchJob,
   CalendarEventsImportJobData,
@@ -39,7 +39,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
 @Injectable()
 export class GoogleAPIsService {
   constructor(
-    private readonly twentyORMManager: TwentyORMManager,
+    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
     @InjectMessageQueue(MessageQueue.messagingQueue)
     private readonly messageQueueService: MessageQueueService,
     @InjectMessageQueue(MessageQueue.calendarQueue)
@@ -82,16 +82,19 @@ export class GoogleAPIsService {
     const newOrExistingConnectedAccountId = existingAccountId ?? v4();
 
     const calendarChannelRepository =
-      await this.twentyORMManager.getRepository<CalendarChannelWorkspaceEntity>(
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace<CalendarChannelWorkspaceEntity>(
+        workspaceId,
         'calendarChannel',
       );
 
     const messageChannelRepository =
-      await this.twentyORMManager.getRepository<MessageChannelWorkspaceEntity>(
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace<MessageChannelWorkspaceEntity>(
+        workspaceId,
         'messageChannel',
       );
 
-    const workspaceDataSource = await this.twentyORMManager.getDatasource();
+    const workspaceDataSource =
+      await this.twentyORMGlobalManager.getDataSourceForWorkspace(workspaceId);
 
     await workspaceDataSource.transaction(async (manager: EntityManager) => {
       if (!existingAccountId) {
@@ -146,7 +149,8 @@ export class GoogleAPIsService {
         );
 
         const workspaceMemberRepository =
-          await this.twentyORMManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+          await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkspaceMemberWorkspaceEntity>(
+            workspaceId,
             'workspaceMember',
           );
 
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
index ec5669808cc2..6cf51366ffb7 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
@@ -1,14 +1,14 @@
-import { PassportStrategy } from '@nestjs/passport';
 import { Injectable } from '@nestjs/common';
+import { PassportStrategy } from '@nestjs/passport';
 
-import { Strategy, VerifyCallback } from 'passport-google-oauth20';
 import { Request } from 'express';
+import { Strategy, VerifyCallback } from 'passport-google-oauth20';
 
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 
 export type GoogleRequest = Omit<
   Request,
-  'user' | 'workspace' | 'cacheVersion'
+  'user' | 'workspace' | 'workspaceMetadataVersion'
 > & {
   user: {
     firstName?: string | null;
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
index f2d002a788c9..8eae65a81d44 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
@@ -12,7 +12,7 @@ import { EnvironmentService } from 'src/engine/integrations/environment/environm
 
 export type MicrosoftRequest = Omit<
   Request,
-  'user' | 'workspace' | 'cacheVersion'
+  'user' | 'workspace' | 'workspaceMetadataVersion'
 > & {
   user: {
     firstName?: string | null;
diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/google-api-request.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/google-api-request.type.ts
index f8d5f609d4d1..4df605ebafa0 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/types/google-api-request.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/types/google-api-request.type.ts
@@ -5,7 +5,7 @@ import { MessageChannelVisibility } from 'src/modules/messaging/common/standard-
 
 export type GoogleAPIsRequest = Omit<
   Request,
-  'user' | 'workspace' | 'cacheVersion'
+  'user' | 'workspace' | 'workspaceMetadataVersion'
 > & {
   user: {
     firstName?: string | null;
diff --git a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
index beb53c4d0407..2124c2b17969 100644
--- a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
@@ -44,6 +44,10 @@ export class FileController {
         workspaceId,
       );
 
+      fileStream.on('error', () => {
+        res.status(500).send({ error: 'Internal server error' });
+      });
+
       fileStream.pipe(res);
     } catch (error) {
       if (
diff --git a/packages/twenty-server/src/engine/core-modules/graphql/hooks/use-graphql-error-handler.hook.ts b/packages/twenty-server/src/engine/core-modules/graphql/hooks/use-graphql-error-handler.hook.ts
index ef47046fe5b8..9785cde8a2db 100644
--- a/packages/twenty-server/src/engine/core-modules/graphql/hooks/use-graphql-error-handler.hook.ts
+++ b/packages/twenty-server/src/engine/core-modules/graphql/hooks/use-graphql-error-handler.hook.ts
@@ -119,13 +119,13 @@ export const useGraphQLErrorHandlerHook = <
 
       if (Array.isArray(errors) && errors.length > 0) {
         const headers = context.req.headers;
-        const currentSchemaVersion = context.req.cacheVersion;
+        const currentMetadataVersion = context.req.workspaceMetadataVersion;
 
-        const requestSchemaVersion = headers['x-schema-version'];
+        const requestMetadataVersion = headers['x-schema-version'];
 
         if (
-          requestSchemaVersion &&
-          requestSchemaVersion !== currentSchemaVersion
+          requestMetadataVersion &&
+          requestMetadataVersion !== `${currentMetadataVersion}`
         ) {
           throw new GraphQLError(
             `Schema version mismatch, please refresh the page.`,
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
index 1d5fb30c5f77..c77bb690baf7 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -33,7 +33,6 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
 import { DemoEnvGuard } from 'src/engine/guards/demo.env.guard';
 import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
-import { LoadServiceWithWorkspaceContext } from 'src/engine/twenty-orm/context/load-service-with-workspace.context';
 import { streamToBuffer } from 'src/utils/stream-to-buffer';
 
 const getHMACKey = (email?: string, key?: string | null) => {
@@ -54,7 +53,6 @@ export class UserResolver {
     private readonly environmentService: EnvironmentService,
     private readonly fileUploadService: FileUploadService,
     private readonly onboardingService: OnboardingService,
-    private readonly loadServiceWithWorkspaceContext: LoadServiceWithWorkspaceContext,
     private readonly userVarService: UserVarsService,
     private readonly fileService: FileService,
   ) {}
@@ -189,11 +187,6 @@ export class UserResolver {
 
   @ResolveField(() => OnboardingStatus)
   async onboardingStatus(@Parent() user: User): Promise<OnboardingStatus> {
-    const contextInstance = await this.loadServiceWithWorkspaceContext.load(
-      this.onboardingService,
-      user.defaultWorkspaceId,
-    );
-
-    return contextInstance.getOnboardingStatus(user);
+    return this.onboardingService.getOnboardingStatus(user);
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
index 0b4a3e0488aa..b9948f623b2c 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
@@ -117,4 +117,16 @@ export class Workspace {
     (postgresCredentials) => postgresCredentials.workspace,
   )
   allPostgresCredentials: Relation<PostgresCredentials[]>;
+
+  @Field()
+  @Column({ default: 1 })
+  metadataVersion: number;
+
+  @Field()
+  @Column({ default: '' })
+  databaseUrl: string;
+
+  @Field()
+  @Column({ default: '' })
+  databaseSchema: string;
 }
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
index a8255d8996b8..5c8e832661ec 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
@@ -16,7 +16,7 @@ import { User } from 'src/engine/core-modules/user/user.entity';
 import { WorkspaceWorkspaceMemberListener } from 'src/engine/core-modules/workspace/workspace-workspace-member.listener';
 import { WorkspaceResolver } from 'src/engine/core-modules/workspace/workspace.resolver';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
 
 import { workspaceAutoResolverOpts } from './workspace.auto-resolver-opts';
@@ -32,7 +32,7 @@ import { WorkspaceService } from './services/workspace.service';
         BillingModule,
         FileModule,
         FileUploadModule,
-        WorkspaceCacheVersionModule,
+        WorkspaceMetadataVersionModule,
         NestjsQueryTypeOrmModule.forFeature(
           [User, Workspace, UserWorkspace, FeatureFlagEntity],
           'core',
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
index 1bb019344665..bc995017ba60 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
@@ -26,7 +26,7 @@ import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
 import { DemoEnvGuard } from 'src/engine/guards/demo.env.guard';
 import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { assert } from 'src/utils/assert';
 import { streamToBuffer } from 'src/utils/stream-to-buffer';
 
@@ -39,7 +39,7 @@ import { WorkspaceService } from './services/workspace.service';
 export class WorkspaceResolver {
   constructor(
     private readonly workspaceService: WorkspaceService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
     private readonly userWorkspaceService: UserWorkspaceService,
     private readonly fileUploadService: FileUploadService,
     private readonly fileService: FileService,
@@ -107,13 +107,6 @@ export class WorkspaceResolver {
     return this.workspaceService.deleteWorkspace(id);
   }
 
-  @ResolveField(() => String, { nullable: true })
-  async currentCacheVersion(
-    @Parent() workspace: Workspace,
-  ): Promise<string | null> {
-    return this.workspaceCacheVersionService.getVersion(workspace.id);
-  }
-
   @ResolveField(() => BillingSubscription, { nullable: true })
   async currentBillingSubscription(
     @Parent() workspace: Workspace,
@@ -133,11 +126,15 @@ export class WorkspaceResolver {
   @ResolveField(() => String)
   async logo(@Parent() workspace: Workspace): Promise<string> {
     if (workspace.logo) {
-      const workspaceLogoToken = await this.fileService.encodeFileToken({
-        workspace_id: workspace.id,
-      });
-
-      return `${workspace.logo}?token=${workspaceLogoToken}`;
+      try {
+        const workspaceLogoToken = await this.fileService.encodeFileToken({
+          workspace_id: workspace.id,
+        });
+
+        return `${workspace.logo}?token=${workspaceLogoToken}`;
+      } catch (e) {
+        return workspace.logo;
+      }
     }
 
     return workspace.logo ?? '';
diff --git a/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-namespace.enum.ts b/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-namespace.enum.ts
index e89fb00b0396..9296a629c9ec 100644
--- a/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-namespace.enum.ts
+++ b/packages/twenty-server/src/engine/integrations/cache-storage/types/cache-storage-namespace.enum.ts
@@ -1,5 +1,5 @@
 export enum CacheStorageNamespace {
-  Messaging = 'messaging',
-  Calendar = 'calendar',
-  WorkspaceSchema = 'workspaceSchema',
+  ModuleMessaging = 'module:messaging',
+  ModuleCalendar = 'module:calendar',
+  EngineWorkspace = 'engine:workspace',
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts
index 7eac8874448d..c8797101d6b6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts
@@ -13,15 +13,15 @@ import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-s
 import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
 import { FieldMetadataResolver } from 'src/engine/metadata-modules/field-metadata/field-metadata.resolver';
 import { FieldMetadataGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/field-metadata/interceptors/field-metadata-graphql-api-exception.interceptor';
+import { CreatedByPreQueryHook } from 'src/engine/metadata-modules/field-metadata/query-hooks/created-by.pre-query-hook';
 import { IsFieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator';
 import { IsFieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
 import { WorkspaceStatusModule } from 'src/engine/workspace-manager/workspace-status/workspace-manager.module';
-import { CreatedByPreQueryHook } from 'src/engine/metadata-modules/field-metadata/query-hooks/created-by.pre-query-hook';
 
 import { FieldMetadataEntity } from './field-metadata.entity';
 import { FieldMetadataService } from './field-metadata.service';
@@ -38,7 +38,7 @@ import { UpdateFieldInput } from './dtos/update-field.input';
         WorkspaceStatusModule,
         TwentyORMModule,
         WorkspaceMigrationRunnerModule,
-        WorkspaceCacheVersionModule,
+        WorkspaceMetadataVersionModule,
         ObjectMetadataModule,
         DataSourceModule,
         TypeORMModule,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
index 9dfe1415c059..8b26733dcc1a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
@@ -40,7 +40,7 @@ import {
   NameTooLongException,
   validateMetadataNameOrThrow,
 } from 'src/engine/metadata-modules/utils/validate-metadata-name.utils';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
 import {
   WorkspaceMigrationColumnActionType,
@@ -76,7 +76,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
     private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
     private readonly dataSourceService: DataSourceService,
     private readonly typeORMService: TypeORMService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
   ) {
     super(fieldMetadataRepository);
   }
@@ -274,7 +274,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
       throw error;
     } finally {
       await queryRunner.release();
-      await this.workspaceCacheVersionService.incrementVersion(
+      await this.workspaceMetadataVersionService.getMetadataVersion(
         fieldMetadataInput.workspaceId,
       );
     }
@@ -426,7 +426,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
       throw error;
     } finally {
       await queryRunner.release();
-      await this.workspaceCacheVersionService.incrementVersion(
+      await this.workspaceMetadataVersionService.incrementMetadataVersion(
         fieldMetadataInput.workspaceId,
       );
     }
@@ -545,7 +545,9 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
       throw error;
     } finally {
       await queryRunner.release();
-      await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+      await this.workspaceMetadataVersionService.incrementMetadataVersion(
+        workspaceId,
+      );
     }
   }
 
@@ -586,7 +588,9 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
 
   public async deleteFieldsMetadata(workspaceId: string) {
     await this.fieldMetadataRepository.delete({ workspaceId });
-    await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+    await this.workspaceMetadataVersionService.incrementMetadataVersion(
+      workspaceId,
+    );
   }
 
   private buildUpdatableStandardFieldInput(
diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
index 4db423a60287..1a75c4a4a88d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-engine.module.ts
@@ -5,9 +5,9 @@ import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
 import { RelationMetadataModule } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.module';
 import { RemoteServerModule } from 'src/engine/metadata-modules/remote-server/remote-server.module';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
-import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { ServerlessFunctionModule } from 'src/engine/metadata-modules/serverless-function/serverless-function.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
+import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 
 @Module({
   imports: [
@@ -16,7 +16,7 @@ import { ServerlessFunctionModule } from 'src/engine/metadata-modules/serverless
     ObjectMetadataModule,
     RelationMetadataModule,
     ServerlessFunctionModule,
-    WorkspaceCacheVersionModule,
+    WorkspaceMetadataVersionModule,
     WorkspaceMigrationModule,
     RemoteServerModule,
   ],
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts
index efd5aeccb44b..b0d60f7593ab 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts
@@ -19,7 +19,7 @@ import { ObjectMetadataGraphqlApiExceptionInterceptor } from 'src/engine/metadat
 import { ObjectMetadataResolver } from 'src/engine/metadata-modules/object-metadata/object-metadata.resolver';
 import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { RemoteTableRelationsModule } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.module';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
 
@@ -43,7 +43,7 @@ import { UpdateObjectPayload } from './dtos/update-object.input';
         DataSourceModule,
         WorkspaceMigrationModule,
         WorkspaceMigrationRunnerModule,
-        WorkspaceCacheVersionModule,
+        WorkspaceMetadataVersionModule,
         FeatureFlagModule,
         RemoteTableRelationsModule,
       ],
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
index 141ed5f18fb4..973a5cf35be5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
@@ -32,7 +32,7 @@ import {
 import { RelationToDelete } from 'src/engine/metadata-modules/relation-metadata/types/relation-to-delete';
 import { RemoteTableRelationsService } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.service';
 import { mapUdtNameToFieldType } from 'src/engine/metadata-modules/remote-server/remote-table/utils/udt-name-mapper.util';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
 import {
   WorkspaceMigrationColumnActionType,
@@ -80,7 +80,7 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
     private readonly typeORMService: TypeORMService,
     private readonly workspaceMigrationService: WorkspaceMigrationService,
     private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
   ) {
     super(objectMetadataRepository);
   }
@@ -144,7 +144,9 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
       workspaceId,
     );
 
-    await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+    await this.workspaceMetadataVersionService.incrementMetadataVersion(
+      workspaceId,
+    );
 
     return objectMetadata;
   }
@@ -352,7 +354,7 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
       );
     });
 
-    await this.workspaceCacheVersionService.incrementVersion(
+    await this.workspaceMetadataVersionService.incrementMetadataVersion(
       objectMetadataInput.workspaceId,
     );
 
@@ -367,7 +369,9 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
 
     const updatedObject = await super.updateOne(input.id, input.update);
 
-    await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+    await this.workspaceMetadataVersionService.incrementMetadataVersion(
+      workspaceId,
+    );
 
     return updatedObject;
   }
@@ -452,7 +456,9 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
 
   public async deleteObjectsMetadata(workspaceId: string) {
     await this.objectMetadataRepository.delete({ workspaceId });
-    await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+    await this.workspaceMetadataVersionService.incrementMetadataVersion(
+      workspaceId,
+    );
   }
 
   private async createObjectRelationsMetadataAndMigrations(
diff --git a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.module.ts
index f706eb898d57..345ec66d762b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.module.ts
@@ -12,7 +12,7 @@ import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
 import { RelationMetadataGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/relation-metadata/interceptors/relation-metadata-graphql-api-exception.interceptor';
 import { RelationMetadataResolver } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.resolver';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
 
@@ -34,7 +34,7 @@ import { RelationMetadataDTO } from './dtos/relation-metadata.dto';
         FieldMetadataModule,
         WorkspaceMigrationRunnerModule,
         WorkspaceMigrationModule,
-        WorkspaceCacheVersionModule,
+        WorkspaceMetadataVersionModule,
       ],
       services: [RelationMetadataService],
       resolvers: [
diff --git a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts
index 3f45268706b9..4e01a8a0ebaf 100644
--- a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts
@@ -22,7 +22,7 @@ import {
   InvalidStringException,
   validateMetadataNameOrThrow,
 } from 'src/engine/metadata-modules/utils/validate-metadata-name.utils';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
 import {
   WorkspaceMigrationColumnActionType,
@@ -50,7 +50,7 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
     private readonly fieldMetadataService: FieldMetadataService,
     private readonly workspaceMigrationService: WorkspaceMigrationService,
     private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
   ) {
     super(relationMetadataRepository);
   }
@@ -120,7 +120,7 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
       relationMetadataInput.workspaceId,
     );
 
-    await this.workspaceCacheVersionService.incrementVersion(
+    await this.workspaceMetadataVersionService.incrementMetadataVersion(
       relationMetadataInput.workspaceId,
     );
 
@@ -394,7 +394,9 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
       relationMetadata.workspaceId,
     );
 
-    await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+    await this.workspaceMetadataVersionService.incrementMetadataVersion(
+      workspaceId,
+    );
 
     // TODO: Return id for delete endpoints
     return relationMetadata;
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.module.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.module.ts
index bcfc2e109258..7168d9c12591 100644
--- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.module.ts
@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
 import { ForeignTableService } from 'src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.service';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
@@ -11,7 +11,7 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor
     WorkspaceMigrationModule,
     WorkspaceMigrationRunnerModule,
     WorkspaceDataSourceModule,
-    WorkspaceCacheVersionModule,
+    WorkspaceMetadataVersionModule,
   ],
   providers: [ForeignTableService],
   exports: [ForeignTableService],
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.service.ts
index a9957685aa67..4fed42713f6a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.service.ts
@@ -11,7 +11,7 @@ import {
 } from 'src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.exception';
 import { getForeignTableColumnName } from 'src/engine/metadata-modules/remote-server/remote-table/foreign-table/utils/get-foreign-table-column-name.util';
 import { PostgresTableSchemaColumn } from 'src/engine/metadata-modules/remote-server/types/postgres-table-schema-column';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
 import {
   ReferencedTable,
@@ -30,7 +30,7 @@ export class ForeignTableService {
     private readonly workspaceMigrationService: WorkspaceMigrationService,
     private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
     private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
   ) {}
 
   public async fetchForeignTableNamesWithinWorkspace(
@@ -127,7 +127,9 @@ export class ForeignTableService {
         workspaceId,
       );
 
-      await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+      await this.workspaceMetadataVersionService.incrementMetadataVersion(
+        workspaceId,
+      );
 
       return {
         name: foreignTableName,
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts
index 720b8a466b47..9b560f5eb4d4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts
@@ -11,7 +11,7 @@ import { RemoteTableSchemaUpdateModule } from 'src/engine/metadata-modules/remot
 import { RemoteTableEntity } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.entity';
 import { RemoteTableResolver } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.resolver';
 import { RemoteTableService } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.service';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 
 @Module({
@@ -24,7 +24,7 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works
     DataSourceModule,
     ObjectMetadataModule,
     FieldMetadataModule,
-    WorkspaceCacheVersionModule,
+    WorkspaceMetadataVersionModule,
     WorkspaceDataSourceModule,
     ForeignTableModule,
     RemoteTableSchemaUpdateModule,
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts
index 9102839eddac..9f29b99ca15b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts
@@ -1,49 +1,49 @@
 import { Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
-import { Repository } from 'typeorm';
-import { plural } from 'pluralize';
 import isEmpty from 'lodash.isempty';
+import { plural } from 'pluralize';
+import { Repository } from 'typeorm';
 
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { CreateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
+import { CreateObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/create-object.input';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
 import {
-  RemoteServerType,
   RemoteServerEntity,
+  RemoteServerType,
 } from 'src/engine/metadata-modules/remote-server/remote-server.entity';
+import { DistantTableService } from 'src/engine/metadata-modules/remote-server/remote-table/distant-table/distant-table.service';
+import { sortDistantTables } from 'src/engine/metadata-modules/remote-server/remote-table/distant-table/utils/sort-distant-tables.util';
+import { RemoteTableInput } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table-input';
 import {
   DistantTableUpdate,
   RemoteTableStatus,
 } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table.dto';
+import { ForeignTableService } from 'src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.service';
+import { RemoteTableSchemaUpdateService } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table-schema-update/remote-table-schema-update.service';
+import { RemoteTableEntity } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.entity';
+import {
+  RemoteTableException,
+  RemoteTableExceptionCode,
+} from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.exception';
+import { fetchTableColumns } from 'src/engine/metadata-modules/remote-server/remote-table/utils/fetch-table-columns.util';
+import { getRemoteTableLocalName } from 'src/engine/metadata-modules/remote-server/remote-table/utils/get-remote-table-local-name.util';
 import {
   mapUdtNameToFieldSettings,
   mapUdtNameToFieldType,
 } from 'src/engine/metadata-modules/remote-server/remote-table/utils/udt-name-mapper.util';
-import { RemoteTableInput } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table-input';
-import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
-import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
-import { CreateObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/create-object.input';
-import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
-import { camelCase } from 'src/utils/camel-case';
-import { camelToTitleCase } from 'src/utils/camel-to-title-case';
-import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
-import { RemoteTableEntity } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.entity';
-import { getRemoteTableLocalName } from 'src/engine/metadata-modules/remote-server/remote-table/utils/get-remote-table-local-name.util';
-import { DistantTableService } from 'src/engine/metadata-modules/remote-server/remote-table/distant-table/distant-table.service';
 import { PostgresTableSchemaColumn } from 'src/engine/metadata-modules/remote-server/types/postgres-table-schema-column';
-import { fetchTableColumns } from 'src/engine/metadata-modules/remote-server/remote-table/utils/fetch-table-columns.util';
-import { ForeignTableService } from 'src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.service';
-import { RemoteTableSchemaUpdateService } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table-schema-update/remote-table-schema-update.service';
-import { sortDistantTables } from 'src/engine/metadata-modules/remote-server/remote-table/distant-table/utils/sort-distant-tables.util';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import {
   WorkspaceMigrationColumnAction,
   WorkspaceMigrationColumnActionType,
 } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
-import { CreateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import {
-  RemoteTableException,
-  RemoteTableExceptionCode,
-} from 'src/engine/metadata-modules/remote-server/remote-table/remote-table.exception';
+import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { camelCase } from 'src/utils/camel-case';
+import { camelToTitleCase } from 'src/utils/camel-to-title-case';
 
 export class RemoteTableService {
   private readonly logger = new Logger(RemoteTableService.name);
@@ -55,7 +55,7 @@ export class RemoteTableService {
     private readonly remoteServerRepository: Repository<
       RemoteServerEntity<RemoteServerType>
     >,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
     private readonly dataSourceService: DataSourceService,
     private readonly objectMetadataService: ObjectMetadataService,
     private readonly fieldMetadataService: FieldMetadataService,
@@ -250,7 +250,9 @@ export class RemoteTableService {
 
     await this.remoteTableRepository.save(remoteTableEntity);
 
-    await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+    await this.workspaceMetadataVersionService.incrementMetadataVersion(
+      workspaceId,
+    );
 
     return {
       id: remoteTableEntity.id,
@@ -435,7 +437,9 @@ export class RemoteTableService {
 
     await this.remoteTableRepository.delete(remoteTable.id);
 
-    await this.workspaceCacheVersionService.incrementVersion(workspaceId);
+    await this.workspaceMetadataVersionService.incrementMetadataVersion(
+      workspaceId,
+    );
   }
 
   private async createRemoteTableMetadata(
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity.ts
deleted file mode 100644
index fab0a85d5fb8..000000000000
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
-
-@Entity('workspaceCacheVersion')
-export class WorkspaceCacheVersionEntity {
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Column({ unique: true, nullable: false, type: 'uuid' })
-  workspaceId: string;
-
-  @Column()
-  version: string;
-
-  @CreateDateColumn({ type: 'timestamptz' })
-  createdAt: Date;
-
-  @UpdateDateColumn({ type: 'timestamptz' })
-  updatedAt: Date;
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module.ts
deleted file mode 100644
index a0df038e4ee6..000000000000
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { WorkspaceCacheVersionEntity } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([WorkspaceCacheVersionEntity], 'metadata'),
-  ],
-  exports: [WorkspaceCacheVersionService],
-  providers: [WorkspaceCacheVersionService],
-})
-export class WorkspaceCacheVersionModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service.ts
deleted file mode 100644
index 8b0bfb8c2a10..000000000000
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-
-import { WorkspaceCacheVersionEntity } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.entity';
-
-@Injectable()
-export class WorkspaceCacheVersionService {
-  constructor(
-    @InjectRepository(WorkspaceCacheVersionEntity, 'metadata')
-    private readonly workspaceCacheVersionRepository: Repository<WorkspaceCacheVersionEntity>,
-  ) {}
-
-  async incrementVersion(workspaceId: string): Promise<string> {
-    const workspaceCacheVersion = (await this.getVersion(workspaceId)) ?? '0';
-    const newVersion = `${+workspaceCacheVersion + 1}`;
-
-    await this.workspaceCacheVersionRepository.upsert(
-      {
-        workspaceId,
-        version: `${+workspaceCacheVersion + 1}`,
-      },
-      ['workspaceId'],
-    );
-
-    return newVersion;
-  }
-
-  async getVersion(workspaceId: string): Promise<string | null> {
-    const workspaceCacheVersion =
-      await this.workspaceCacheVersionRepository.findOne({
-        where: { workspaceId },
-      });
-
-    return workspaceCacheVersion?.version ?? null;
-  }
-
-  async deleteVersion(workspaceId: string): Promise<void> {
-    await this.workspaceCacheVersionRepository.delete({ workspaceId });
-  }
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module.ts
new file mode 100644
index 000000000000..4064872a17e2
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module.ts
@@ -0,0 +1,16 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
+import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([Workspace], 'core'),
+    WorkspaceCacheStorageModule,
+  ],
+  exports: [WorkspaceMetadataVersionService],
+  providers: [WorkspaceMetadataVersionService],
+})
+export class WorkspaceMetadataVersionModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service.ts
new file mode 100644
index 000000000000..8e5c5deaaa6e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service.ts
@@ -0,0 +1,79 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
+
+@Injectable()
+export class WorkspaceMetadataVersionService {
+  logger = new Logger(WorkspaceMetadataVersionService.name);
+
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+    private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
+  ) {}
+
+  async flushCacheIfMetadataVersionIsOutdated(
+    workspaceId: string,
+  ): Promise<void> {
+    const currentVersion =
+      (await this.workspaceCacheStorageService.getMetadataVersion(
+        workspaceId,
+      )) ?? 1;
+
+    let latestVersion = await this.getMetadataVersion(workspaceId);
+
+    if (latestVersion === undefined || currentVersion !== latestVersion) {
+      this.logger.log(
+        `Metadata version mismatch detected for workspace ${workspaceId}. Current version: ${currentVersion}. Latest version: ${latestVersion}. Invalidating cache...`,
+      );
+
+      await this.workspaceCacheStorageService.flush(workspaceId);
+
+      latestVersion = await this.incrementMetadataVersion(workspaceId);
+
+      await this.workspaceCacheStorageService.setMetadataVersion(
+        workspaceId,
+        latestVersion,
+      );
+    }
+  }
+
+  async incrementMetadataVersion(workspaceId: string): Promise<number> {
+    const metadataVersion = (await this.getMetadataVersion(workspaceId)) ?? 0;
+    const newMetadataVersion = metadataVersion + 1;
+
+    await this.workspaceRepository.update(
+      { id: workspaceId },
+      { metadataVersion: newMetadataVersion },
+    );
+
+    await this.workspaceCacheStorageService.setMetadataVersion(
+      workspaceId,
+      newMetadataVersion,
+    );
+
+    return newMetadataVersion;
+  }
+
+  async getMetadataVersion(workspaceId: string): Promise<number | undefined> {
+    const workspace = await this.workspaceRepository.findOne({
+      where: { id: workspaceId },
+    });
+
+    return workspace?.metadataVersion;
+  }
+
+  async resetMetadataVersion(workspaceId: string): Promise<void> {
+    await this.workspaceRepository.update(
+      { id: workspaceId },
+      { metadataVersion: 1 },
+    );
+
+    await this.workspaceCacheStorageService.flush(workspaceId);
+    await this.workspaceCacheStorageService.setMetadataVersion(workspaceId, 1);
+  }
+}
diff --git a/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts b/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts
index a756b8cef472..509e58bb31c7 100644
--- a/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts
+++ b/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts
@@ -6,7 +6,7 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
 import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { handleExceptionAndConvertToGraphQLError } from 'src/engine/utils/global-exception-handler.util';
 
 class GraphqlTokenValidationProxy {
@@ -33,7 +33,7 @@ export class GraphQLHydrateRequestFromTokenMiddleware
 {
   constructor(
     private readonly tokenService: TokenService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
     private readonly exceptionHandlerService: ExceptionHandlerService,
   ) {}
 
@@ -72,15 +72,16 @@ export class GraphQLHydrateRequestFromTokenMiddleware
       );
 
       data = await graphqlTokenValidationProxy.validateToken(req);
-      const cacheVersion = await this.workspaceCacheVersionService.getVersion(
-        data.workspace.id,
-      );
+      const metadataVersion =
+        await this.workspaceMetadataVersionService.getMetadataVersion(
+          data.workspace.id,
+        );
 
       req.user = data.user;
       req.apiKey = data.apiKey;
       req.workspace = data.workspace;
       req.workspaceId = data.workspace.id;
-      req.cacheVersion = cacheVersion;
+      req.workspaceMetadataVersion = metadataVersion;
     } catch (error) {
       res.writeHead(200, { 'Content-Type': 'application/json' });
       res.write(
diff --git a/packages/twenty-server/src/engine/twenty-orm/context/load-service-with-workspace.context.ts b/packages/twenty-server/src/engine/twenty-orm/context/load-service-with-workspace.context.ts
deleted file mode 100644
index 144f47598fa7..000000000000
--- a/packages/twenty-server/src/engine/twenty-orm/context/load-service-with-workspace.context.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Inject, Type } from '@nestjs/common';
-import { ModuleRef, createContextId } from '@nestjs/core';
-import { Injector } from '@nestjs/core/injector/injector';
-
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
-
-export class LoadServiceWithWorkspaceContext {
-  private readonly injector = new Injector();
-
-  constructor(
-    @Inject(ModuleRef)
-    private readonly moduleRef: ModuleRef,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
-  ) {}
-
-  async load<T>(service: T, workspaceId: string): Promise<T> {
-    const modules = this.moduleRef['container'].getModules();
-    const host = [...modules.values()].find((module) =>
-      module.providers.has((service as Type<T>).constructor),
-    );
-
-    if (!host) {
-      throw new Error('Host module not found for the service');
-    }
-
-    const contextId = createContextId();
-    const cacheVersion =
-      await this.workspaceCacheVersionService.getVersion(workspaceId);
-
-    if (this.moduleRef.registerRequestByContextId) {
-      this.moduleRef.registerRequestByContextId(
-        { req: { workspaceId, cacheVersion } },
-        contextId,
-      );
-    }
-
-    return this.injector.loadPerContext(
-      service,
-      host,
-      new Map(host.providers),
-      contextId,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/scoped-workspace-context.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/scoped-workspace-context.factory.ts
index 88603807a329..bf70156a94e0 100644
--- a/packages/twenty-server/src/engine/twenty-orm/factories/scoped-workspace-context.factory.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/factories/scoped-workspace-context.factory.ts
@@ -11,16 +11,16 @@ export class ScopedWorkspaceContextFactory {
 
   public create(): {
     workspaceId: string | null;
-    cacheVersion: string | null;
+    workspaceMetadataVersion: string | null;
   } {
     const workspaceId: string | undefined =
       this.request?.['req']?.['workspaceId'];
-    const cacheVersion: string | undefined =
-      this.request?.['req']?.['cacheVersion'];
+    const workspaceMetadataVersion: string | undefined =
+      this.request?.['req']?.['workspaceMetadataVersion'];
 
     return {
       workspaceId: workspaceId ?? null,
-      cacheVersion: cacheVersion ?? null,
+      workspaceMetadataVersion: workspaceMetadataVersion ?? null,
     };
   }
 }
diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts
index 1ee50a0b44a3..10daedc7dd77 100644
--- a/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts
@@ -1,12 +1,12 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
-import { Repository } from 'typeorm';
+import { EntitySchema, Repository } from 'typeorm';
 
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { WorkspaceDataSource } from 'src/engine/twenty-orm/datasource/workspace.datasource';
 import { EntitySchemaFactory } from 'src/engine/twenty-orm/factories/entity-schema.factory';
 import { workspaceDataSourceCacheInstance } from 'src/engine/twenty-orm/twenty-orm-core.module';
@@ -18,7 +18,7 @@ export class WorkspaceDatasourceFactory {
     private readonly dataSourceService: DataSourceService,
     private readonly environmentService: EnvironmentService,
     private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
     @InjectRepository(ObjectMetadataEntity, 'metadata')
     private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
     private readonly entitySchemaFactory: EntitySchemaFactory,
@@ -26,21 +26,29 @@ export class WorkspaceDatasourceFactory {
 
   public async create(
     workspaceId: string,
-    workspaceSchemaVersion: string | null,
+    workspaceMetadataVersion: string | null,
   ): Promise<WorkspaceDataSource> {
-    const desiredWorkspaceSchemaVersion =
-      workspaceSchemaVersion ??
-      (await this.workspaceCacheVersionService.getVersion(workspaceId));
+    const desiredWorkspaceMetadataVersion =
+      workspaceMetadataVersion ??
+      (await this.workspaceMetadataVersionService.getMetadataVersion(
+        workspaceId,
+      ));
 
-    if (!desiredWorkspaceSchemaVersion) {
-      throw new Error('Cache version not found');
+    if (!desiredWorkspaceMetadataVersion) {
+      throw new Error(
+        `Desired workspace metadata version not found while creating workspace data source for workspace ${workspaceId}`,
+      );
     }
 
-    const latestWorkspaceSchemaVersion =
-      await this.workspaceCacheVersionService.getVersion(workspaceId);
+    const latestWorkspaceMetadataVersion =
+      await this.workspaceMetadataVersionService.getMetadataVersion(
+        workspaceId,
+      );
 
-    if (latestWorkspaceSchemaVersion !== desiredWorkspaceSchemaVersion) {
-      throw new Error('Cache version mismatch');
+    if (latestWorkspaceMetadataVersion !== desiredWorkspaceMetadataVersion) {
+      throw new Error(
+        `Workspace metadata version mismatch detected for workspace ${workspaceId}. Current version: ${latestWorkspaceMetadataVersion}. Desired version: ${desiredWorkspaceMetadataVersion}`,
+      );
     }
 
     let cachedObjectMetadataCollection =
@@ -70,7 +78,7 @@ export class WorkspaceDatasourceFactory {
     }
 
     const workspaceDataSource = await workspaceDataSourceCacheInstance.execute(
-      `${workspaceId}-${latestWorkspaceSchemaVersion}`,
+      `${workspaceId}-${latestWorkspaceMetadataVersion}`,
       async () => {
         const dataSourceMetadata =
           await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceId(
@@ -78,18 +86,43 @@ export class WorkspaceDatasourceFactory {
           );
 
         if (!dataSourceMetadata) {
-          throw new Error('Data source metadata not found');
+          throw new Error(
+            `Data source metadata not found for workspace ${workspaceId}`,
+          );
         }
 
         if (!cachedObjectMetadataCollection) {
-          throw new Error('Object metadata collection not found');
+          throw new Error(
+            `Object metadata collection not found for workspace ${workspaceId}`,
+          );
+        }
+
+        const cachedEntitySchemaOptions =
+          await this.workspaceCacheStorageService.getORMEntitySchema(
+            workspaceId,
+          );
+
+        let cachedEntitySchemas: EntitySchema[];
+
+        if (cachedEntitySchemaOptions) {
+          cachedEntitySchemas = cachedEntitySchemaOptions.map(
+            (option) => new EntitySchema(option),
+          );
+        } else {
+          const entitySchemas = await Promise.all(
+            cachedObjectMetadataCollection.map((objectMetadata) =>
+              this.entitySchemaFactory.create(workspaceId, objectMetadata),
+            ),
+          );
+
+          await this.workspaceCacheStorageService.setORMEntitySchema(
+            workspaceId,
+            entitySchemas.map((entitySchema) => entitySchema.options),
+          );
+
+          cachedEntitySchemas = entitySchemas;
         }
 
-        const entities = await Promise.all(
-          cachedObjectMetadataCollection.map((objectMetadata) =>
-            this.entitySchemaFactory.create(workspaceId, objectMetadata),
-          ),
-        );
         const workspaceDataSource = new WorkspaceDataSource(
           {
             workspaceId,
@@ -104,7 +137,7 @@ export class WorkspaceDatasourceFactory {
               ? ['query', 'error']
               : ['error'],
             schema: dataSourceMetadata.schema,
-            entities,
+            entities: cachedEntitySchemas,
             ssl: this.environmentService.get('PG_SSL_ALLOW_SELF_SIGNED')
               ? {
                   rejectUnauthorized: false,
diff --git a/packages/twenty-server/src/engine/twenty-orm/twenty-orm-core.module.ts b/packages/twenty-server/src/engine/twenty-orm/twenty-orm-core.module.ts
index ebb929a641d1..122ae0c52c4b 100644
--- a/packages/twenty-server/src/engine/twenty-orm/twenty-orm-core.module.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/twenty-orm-core.module.ts
@@ -14,8 +14,7 @@ import {
 
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
-import { LoadServiceWithWorkspaceContext } from 'src/engine/twenty-orm/context/load-service-with-workspace.context';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceDataSource } from 'src/engine/twenty-orm/datasource/workspace.datasource';
 import { entitySchemaFactories } from 'src/engine/twenty-orm/factories';
 import { EntitySchemaFactory } from 'src/engine/twenty-orm/factories/entity-schema.factory';
@@ -33,21 +32,15 @@ export const workspaceDataSourceCacheInstance =
   imports: [
     TypeOrmModule.forFeature([ObjectMetadataEntity], 'metadata'),
     DataSourceModule,
-    WorkspaceCacheVersionModule,
     WorkspaceCacheStorageModule,
+    WorkspaceMetadataVersionModule,
   ],
   providers: [
     ...entitySchemaFactories,
     TwentyORMManager,
     TwentyORMGlobalManager,
-    LoadServiceWithWorkspaceContext,
-  ],
-  exports: [
-    EntitySchemaFactory,
-    TwentyORMManager,
-    LoadServiceWithWorkspaceContext,
-    TwentyORMGlobalManager,
   ],
+  exports: [EntitySchemaFactory, TwentyORMManager, TwentyORMGlobalManager],
 })
 export class TwentyORMCoreModule
   extends ConfigurableModuleClass
diff --git a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.manager.ts b/packages/twenty-server/src/engine/twenty-orm/twenty-orm.manager.ts
index 5ebd65a3c108..6855c705678b 100644
--- a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.manager.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/twenty-orm.manager.ts
@@ -25,7 +25,7 @@ export class TwentyORMManager {
   async getRepository<T extends ObjectLiteral>(
     workspaceEntityOrobjectMetadataName: Type<T> | string,
   ): Promise<WorkspaceRepository<T>> {
-    const { workspaceId, cacheVersion } =
+    const { workspaceId, workspaceMetadataVersion } =
       this.scopedWorkspaceContextFactory.create();
 
     let objectMetadataName: string;
@@ -44,20 +44,23 @@ export class TwentyORMManager {
 
     const workspaceDataSource = await this.workspaceDataSourceFactory.create(
       workspaceId,
-      cacheVersion,
+      workspaceMetadataVersion,
     );
 
     return workspaceDataSource.getRepository<T>(objectMetadataName);
   }
 
   async getDatasource() {
-    const { workspaceId, cacheVersion } =
+    const { workspaceId, workspaceMetadataVersion } =
       this.scopedWorkspaceContextFactory.create();
 
     if (!workspaceId) {
       throw new Error('Workspace not found');
     }
 
-    return this.workspaceDataSourceFactory.create(workspaceId, cacheVersion);
+    return this.workspaceDataSourceFactory.create(
+      workspaceId,
+      workspaceMetadataVersion,
+    );
   }
 }
diff --git a/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.module.ts b/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.module.ts
index 62d8be6fd6ba..fec5215284bb 100644
--- a/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.module.ts
+++ b/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.module.ts
@@ -1,10 +1,8 @@
 import { Module } from '@nestjs/common';
 
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
 import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
 
 @Module({
-  imports: [WorkspaceCacheVersionModule],
   providers: [WorkspaceCacheStorageService],
   exports: [WorkspaceCacheStorageService],
 })
diff --git a/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.service.ts b/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.service.ts
index 6160847023a9..18426da5a7bf 100644
--- a/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.service.ts
+++ b/packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.service.ts
@@ -1,56 +1,67 @@
 import { Injectable, Logger } from '@nestjs/common';
 
+import { EntitySchemaOptions } from 'typeorm';
+
 import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
 import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
 import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+
+enum WorkspaceCacheKeys {
+  GraphQLTypeDefs = 'graphql:type-defs',
+  GraphQLUsedScalarNames = 'graphql:used-scalar-names',
+  GraphQLOperations = 'graphql:operations',
+  ORMEntitySchemas = 'orm:entity-schemas',
+  MetadataObjectMetadataCollection = 'metadata:object-metadata-collection',
+  MetadataVersion = 'metadata:workspace-metadata-version',
+}
 
 @Injectable()
 export class WorkspaceCacheStorageService {
   private readonly logger = new Logger(WorkspaceCacheStorageService.name);
 
   constructor(
-    @InjectCacheStorage(CacheStorageNamespace.WorkspaceSchema)
-    private readonly workspaceSchemaCache: CacheStorageService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
+    @InjectCacheStorage(CacheStorageNamespace.EngineWorkspace)
+    private readonly cacheStorageService: CacheStorageService,
   ) {}
 
-  async validateCacheVersion(workspaceId: string): Promise<void> {
-    const currentVersion =
-      (await this.workspaceSchemaCache.get<string>(
-        `cacheVersion:${workspaceId}`,
-      )) ?? '0';
-
-    let latestVersion =
-      await this.workspaceCacheVersionService.getVersion(workspaceId);
-
-    if (!latestVersion || currentVersion !== latestVersion) {
-      // Invalidate cache if version mismatch is detected"
-      this.logger.log(
-        `Cache version mismatch detected for workspace ${workspaceId}. Current version: ${currentVersion}. Latest version: ${latestVersion}. Invalidating cache...`,
-      );
-
-      await this.invalidateCache(workspaceId);
-
-      // If the latest version is not found, increment the version
-      latestVersion ??=
-        await this.workspaceCacheVersionService.incrementVersion(workspaceId);
-
-      // Update the cache version after invalidation
-      await this.workspaceSchemaCache.set<string>(
-        `cacheVersion:${workspaceId}`,
-        latestVersion,
-      );
-    }
+  setORMEntitySchema(
+    workspaceId: string,
+    entitySchemas: EntitySchemaOptions<any>[],
+  ) {
+    return this.cacheStorageService.set<EntitySchemaOptions<any>[]>(
+      `${WorkspaceCacheKeys.ORMEntitySchemas}:${workspaceId}`,
+      entitySchemas,
+    );
+  }
+
+  getORMEntitySchema(
+    workspaceId: string,
+  ): Promise<EntitySchemaOptions<any>[] | undefined> {
+    return this.cacheStorageService.get<EntitySchemaOptions<any>[]>(
+      `${WorkspaceCacheKeys.ORMEntitySchemas}:${workspaceId}`,
+    );
+  }
+
+  setMetadataVersion(workspaceId: string, version: number): Promise<void> {
+    return this.cacheStorageService.set<number>(
+      `${WorkspaceCacheKeys.MetadataVersion}:${workspaceId}`,
+      version,
+    );
+  }
+
+  getMetadataVersion(workspaceId: string): Promise<number | undefined> {
+    return this.cacheStorageService.get<number>(
+      `${WorkspaceCacheKeys.MetadataVersion}:${workspaceId}`,
+    );
   }
 
   setObjectMetadataCollection(
     workspaceId: string,
     objectMetadataCollection: ObjectMetadataEntity[],
   ) {
-    return this.workspaceSchemaCache.set<ObjectMetadataEntity[]>(
-      `objectMetadataCollection:${workspaceId}`,
+    return this.cacheStorageService.set<ObjectMetadataEntity[]>(
+      `${WorkspaceCacheKeys.MetadataObjectMetadataCollection}:${workspaceId}`,
       objectMetadataCollection,
     );
   }
@@ -58,43 +69,57 @@ export class WorkspaceCacheStorageService {
   getObjectMetadataCollection(
     workspaceId: string,
   ): Promise<ObjectMetadataEntity[] | undefined> {
-    return this.workspaceSchemaCache.get<ObjectMetadataEntity[]>(
-      `objectMetadataCollection:${workspaceId}`,
+    return this.cacheStorageService.get<ObjectMetadataEntity[]>(
+      `${WorkspaceCacheKeys.MetadataObjectMetadataCollection}:${workspaceId}`,
     );
   }
 
-  setTypeDefs(workspaceId: string, typeDefs: string): Promise<void> {
-    return this.workspaceSchemaCache.set<string>(
-      `typeDefs:${workspaceId}`,
+  setGraphQLTypeDefs(workspaceId: string, typeDefs: string): Promise<void> {
+    return this.cacheStorageService.set<string>(
+      `${WorkspaceCacheKeys.GraphQLTypeDefs}:${workspaceId}`,
       typeDefs,
     );
   }
 
-  getTypeDefs(workspaceId: string): Promise<string | undefined> {
-    return this.workspaceSchemaCache.get<string>(`typeDefs:${workspaceId}`);
+  getGraphQLTypeDefs(workspaceId: string): Promise<string | undefined> {
+    return this.cacheStorageService.get<string>(
+      `${WorkspaceCacheKeys.GraphQLTypeDefs}:${workspaceId}`,
+    );
   }
 
-  setUsedScalarNames(
+  setGraphQLUsedScalarNames(
     workspaceId: string,
-    scalarsUsed: string[],
+    usedScalarNames: string[],
   ): Promise<void> {
-    return this.workspaceSchemaCache.set<string[]>(
-      `usedScalarNames:${workspaceId}`,
-      scalarsUsed,
+    return this.cacheStorageService.set<string[]>(
+      `${WorkspaceCacheKeys.GraphQLUsedScalarNames}:${workspaceId}`,
+      usedScalarNames,
     );
   }
 
-  getUsedScalarNames(workspaceId: string): Promise<string[] | undefined> {
-    return this.workspaceSchemaCache.get<string[]>(
-      `usedScalarNames:${workspaceId}`,
+  getGraphQLUsedScalarNames(
+    workspaceId: string,
+  ): Promise<string[] | undefined> {
+    return this.cacheStorageService.get<string[]>(
+      `${WorkspaceCacheKeys.GraphQLUsedScalarNames}:${workspaceId}`,
     );
   }
 
-  async invalidateCache(workspaceId: string): Promise<void> {
-    await this.workspaceSchemaCache.del(
-      `objectMetadataCollection:${workspaceId}`,
+  async flush(workspaceId: string): Promise<void> {
+    await this.cacheStorageService.del(
+      `${WorkspaceCacheKeys.MetadataObjectMetadataCollection}:${workspaceId}`,
+    );
+    await this.cacheStorageService.del(
+      `${WorkspaceCacheKeys.MetadataVersion}:${workspaceId}`,
+    );
+    await this.cacheStorageService.del(
+      `${WorkspaceCacheKeys.GraphQLTypeDefs}:${workspaceId}`,
+    );
+    await this.cacheStorageService.del(
+      `${WorkspaceCacheKeys.GraphQLUsedScalarNames}:${workspaceId}`,
+    );
+    await this.cacheStorageService.del(
+      `${WorkspaceCacheKeys.ORMEntitySchemas}:${workspaceId}`,
     );
-    await this.workspaceSchemaCache.del(`typeDefs:${workspaceId}`);
-    await this.workspaceSchemaCache.del(`usedScalarNames:${workspaceId}`);
   }
 }
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command.ts
index 2bbc17b75878..ffa4c387d925 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command.ts
@@ -1,14 +1,13 @@
-import { InjectRepository } from '@nestjs/typeorm';
 import { Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
 
 import { Command, CommandRunner, Option } from 'nest-commander';
 import { In, Repository } from 'typeorm';
 
+import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { getDryRunLogHeader } from 'src/utils/get-dry-run-log-header';
-import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
-import { LoadServiceWithWorkspaceContext } from 'src/engine/twenty-orm/context/load-service-with-workspace.context';
 
 type DeleteWorkspacesCommandOptions = {
   dryRun?: boolean;
@@ -24,7 +23,6 @@ export class DeleteWorkspacesCommand extends CommandRunner {
 
   constructor(
     private readonly workspaceService: WorkspaceService,
-    private readonly loadServiceWithWorkspaceContext: LoadServiceWithWorkspaceContext,
     @InjectRepository(Workspace, 'core')
     private readonly workspaceRepository: Repository<Workspace>,
     private readonly dataSourceService: DataSourceService,
@@ -81,15 +79,15 @@ export class DeleteWorkspacesCommand extends CommandRunner {
           workspace.id
         } name: '${workspace.displayName}'`,
       );
-      const workspaceServiceInstance =
-        await this.loadServiceWithWorkspaceContext.load(
-          this.workspaceService,
-          workspace.id,
-        );
+      // const workspaceServiceInstance =
+      //   await this.loadServiceWithWorkspaceContext.load(
+      //     this.workspaceService,
+      //     workspace.id,
+      //   );
 
-      if (!options.dryRun) {
-        await workspaceServiceInstance.softDeleteWorkspace(workspace.id);
-      }
+      // if (!options.dryRun) {
+      //   await workspaceServiceInstance.softDeleteWorkspace(workspace.id);
+      // }
     }
   }
 }
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module.ts
index 59f0bec2e661..40f6e5d92205 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module.ts
@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
 
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
 import { WorkspaceMigrationEnumService } from 'src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service';
 
 import { WorkspaceMigrationRunnerService } from './workspace-migration-runner.service';
@@ -10,11 +9,7 @@ import { WorkspaceMigrationRunnerService } from './workspace-migration-runner.se
 import { WorkspaceMigrationTypeService } from './services/workspace-migration-type.service';
 
 @Module({
-  imports: [
-    WorkspaceDataSourceModule,
-    WorkspaceMigrationModule,
-    WorkspaceCacheVersionModule,
-  ],
+  imports: [WorkspaceDataSourceModule, WorkspaceMigrationModule],
   providers: [
     WorkspaceMigrationRunnerService,
     WorkspaceMigrationEnumService,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts
index 447f60e0cf71..76cd7bfe9033 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts
@@ -6,7 +6,7 @@ import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
 import { WorkspaceMigrationBuilderModule } from 'src/engine/workspace-manager/workspace-migration-builder/workspace-migration-builder.module';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
@@ -35,7 +35,7 @@ import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/works
       'metadata',
     ),
     TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
-    WorkspaceCacheVersionModule,
+    WorkspaceMetadataVersionModule,
   ],
   providers: [
     ...workspaceSyncMetadataFactories,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts
index 2a22bac5965f..6dfeb5557823 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts
@@ -6,7 +6,7 @@ import { DataSource, QueryFailedError } from 'typeorm';
 import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
 
 import { FeatureFlagFactory } from 'src/engine/core-modules/feature-flag/services/feature-flags.factory';
-import { WorkspaceCacheVersionService } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.service';
+import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.service';
 import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
 import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
 import { WorkspaceSyncFieldMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-field-metadata.service';
@@ -32,9 +32,9 @@ export class WorkspaceSyncMetadataService {
     private readonly workspaceSyncObjectMetadataService: WorkspaceSyncObjectMetadataService,
     private readonly workspaceSyncRelationMetadataService: WorkspaceSyncRelationMetadataService,
     private readonly workspaceSyncFieldMetadataService: WorkspaceSyncFieldMetadataService,
-    private readonly workspaceCacheVersionService: WorkspaceCacheVersionService,
     private readonly workspaceSyncIndexMetadataService: WorkspaceSyncIndexMetadataService,
     private readonly workspaceSyncObjectMetadataIdentifiersService: WorkspaceSyncObjectMetadataIdentifiersService,
+    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
   ) {}
 
   /**
@@ -157,7 +157,7 @@ export class WorkspaceSyncMetadataService {
       await queryRunner.rollbackTransaction();
     } finally {
       await queryRunner.release();
-      await this.workspaceCacheVersionService.incrementVersion(
+      await this.workspaceMetadataVersionService.incrementMetadataVersion(
         context.workspaceId,
       );
     }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts
index 87d58c3f6009..56f9af21099f 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts
@@ -32,6 +32,8 @@ export class CalendarEventListFetchCronJob {
 
   @Process(CalendarEventListFetchCronJob.name)
   async handle(): Promise<void> {
+    console.time('CalendarEventListFetchCronJob time');
+
     const activeWorkspaces = await this.workspaceRepository.find({
       where: {
         activationStatus: WorkspaceActivationStatus.ACTIVE,
@@ -65,5 +67,7 @@ export class CalendarEventListFetchCronJob {
         );
       }
     }
+
+    console.timeEnd('CalendarEventListFetchCronJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job.ts
index 9006872acc63..402661b93981 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job.ts
@@ -33,6 +33,8 @@ export class CalendarEventListFetchJob {
 
   @Process(CalendarEventListFetchJob.name)
   async handle(data: CalendarEventsImportJobData): Promise<void> {
+    console.time('CalendarEventListFetchJob time');
+
     const { workspaceId, calendarChannelId } = data;
 
     const calendarChannelRepository =
@@ -91,5 +93,6 @@ export class CalendarEventListFetchJob {
       default:
         break;
     }
+    console.timeEnd('CalendarEventListFetchJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-channel-sync-status.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-channel-sync-status.service.ts
index 28306cea884b..21ccdaafc047 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-channel-sync-status.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-channel-sync-status.service.ts
@@ -16,7 +16,7 @@ import { AccountsToReconnectKeys } from 'src/modules/connected-account/types/acc
 export class CalendarChannelSyncStatusService {
   constructor(
     private readonly twentyORMManager: TwentyORMManager,
-    @InjectCacheStorage(CacheStorageNamespace.Calendar)
+    @InjectCacheStorage(CacheStorageNamespace.ModuleCalendar)
     private readonly cacheStorage: CacheStorageService,
     private readonly accountsToReconnectService: AccountsToReconnectService,
   ) {}
diff --git a/packages/twenty-server/src/modules/messaging/common/services/messaging-channel-sync-status.service.ts b/packages/twenty-server/src/modules/messaging/common/services/messaging-channel-sync-status.service.ts
index 49c52cb8333a..43025a021fb0 100644
--- a/packages/twenty-server/src/modules/messaging/common/services/messaging-channel-sync-status.service.ts
+++ b/packages/twenty-server/src/modules/messaging/common/services/messaging-channel-sync-status.service.ts
@@ -15,7 +15,7 @@ import {
 @Injectable()
 export class MessagingChannelSyncStatusService {
   constructor(
-    @InjectCacheStorage(CacheStorageNamespace.Messaging)
+    @InjectCacheStorage(CacheStorageNamespace.ModuleMessaging)
     private readonly cacheStorage: CacheStorageService,
     private readonly twentyORMManager: TwentyORMManager,
     private readonly accountsToReconnectService: AccountsToReconnectService,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
index 3f7334cf7c19..2f464188209d 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
@@ -33,6 +33,8 @@ export class MessagingMessageListFetchCronJob {
 
   @Process(MessagingMessageListFetchCronJob.name)
   async handle(): Promise<void> {
+    console.time('MessagingMessageListFetchCronJob time');
+
     const activeWorkspaces = await this.workspaceRepository.find({
       where: {
         activationStatus: WorkspaceActivationStatus.ACTIVE,
@@ -66,5 +68,7 @@ export class MessagingMessageListFetchCronJob {
         }
       }
     }
+
+    console.timeEnd('MessagingMessageListFetchCronJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
index e3da8b05bbc9..daef69dfa03d 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
@@ -36,6 +36,7 @@ export class MessagingMessagesImportCronJob {
 
   @Process(MessagingMessagesImportCronJob.name)
   async handle(): Promise<void> {
+    console.time('MessagingMessagesImportCronJob time');
     const activeWorkspaces = await this.workspaceRepository.find({
       where: {
         activationStatus: WorkspaceActivationStatus.ACTIVE,
@@ -69,5 +70,7 @@ export class MessagingMessagesImportCronJob {
         }
       }
     }
+
+    console.timeEnd('MessagingMessagesImportCronJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-add-single-message-to-cache-for-import.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-add-single-message-to-cache-for-import.job.ts
index d81bba9cd096..3f2c2a537901 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-add-single-message-to-cache-for-import.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-add-single-message-to-cache-for-import.job.ts
@@ -14,7 +14,7 @@ export type MessagingAddSingleMessageToCacheForImportJobData = {
 @Processor(MessageQueue.messagingQueue)
 export class MessagingAddSingleMessageToCacheForImportJob {
   constructor(
-    @InjectCacheStorage(CacheStorageNamespace.Messaging)
+    @InjectCacheStorage(CacheStorageNamespace.ModuleMessaging)
     private readonly cacheStorage: CacheStorageService,
   ) {}
 
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-clean-cache.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-clean-cache.ts
index 8c2bc681f240..24e048ce01b3 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-clean-cache.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-clean-cache.ts
@@ -1,11 +1,11 @@
 import { Logger } from '@nestjs/common';
 
-import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
-import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
 import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
 import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
-import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 
 export type MessagingCleanCacheJobData = {
   workspaceId: string;
@@ -17,7 +17,7 @@ export class MessagingCleanCacheJob {
   private readonly logger = new Logger(MessagingCleanCacheJob.name);
 
   constructor(
-    @InjectCacheStorage(CacheStorageNamespace.Messaging)
+    @InjectCacheStorage(CacheStorageNamespace.ModuleMessaging)
     private readonly cacheStorage: CacheStorageService,
   ) {}
 
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts
index 09854fbf4f3a..fc0d37413dfd 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts
@@ -39,6 +39,8 @@ export class MessagingMessageListFetchJob {
 
   @Process(MessagingMessageListFetchJob.name)
   async handle(data: MessagingMessageListFetchJobData): Promise<void> {
+    console.time('MessagingMessageListFetchJob time');
+
     const { messageChannelId, workspaceId } = data;
 
     await this.messagingTelemetryService.track({
@@ -145,5 +147,7 @@ export class MessagingMessageListFetchJob {
       default:
         break;
     }
+
+    console.timeEnd('MessagingMessageListFetchJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts
index 935be741e363..c35243f8e29e 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts
@@ -35,6 +35,8 @@ export class MessagingMessagesImportJob {
 
   @Process(MessagingMessagesImportJob.name)
   async handle(data: MessagingMessagesImportJobData): Promise<void> {
+    console.time('MessagingMessagesImportJob time');
+
     const { messageChannelId, workspaceId } = data;
 
     await this.messagingTelemetryService.track({
@@ -95,5 +97,7 @@ export class MessagingMessagesImportJob {
       connectedAccount,
       workspaceId,
     );
+
+    console.timeEnd('MessagingMessagesImportJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-full-message-list-fetch.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-full-message-list-fetch.service.ts
index dde37698e9c8..eca0aaedf873 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-full-message-list-fetch.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-full-message-list-fetch.service.ts
@@ -29,7 +29,7 @@ export class MessagingFullMessageListFetchService {
 
   constructor(
     private readonly gmailClientProvider: MessagingGmailClientProvider,
-    @InjectCacheStorage(CacheStorageNamespace.Messaging)
+    @InjectCacheStorage(CacheStorageNamespace.ModuleMessaging)
     private readonly cacheStorage: CacheStorageService,
     private readonly messagingChannelSyncStatusService: MessagingChannelSyncStatusService,
     private readonly gmailErrorHandlingService: MessagingErrorHandlingService,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts
index 89fcedb6d874..968140bc138f 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts
@@ -31,7 +31,7 @@ export class MessagingMessagesImportService {
 
   constructor(
     private readonly fetchMessagesByBatchesService: MessagingGmailFetchMessagesByBatchesService,
-    @InjectCacheStorage(CacheStorageNamespace.Messaging)
+    @InjectCacheStorage(CacheStorageNamespace.ModuleMessaging)
     private readonly cacheStorage: CacheStorageService,
     private readonly messagingChannelSyncStatusService: MessagingChannelSyncStatusService,
     private readonly saveMessagesAndEnqueueContactCreationService: MessagingSaveMessagesAndEnqueueContactCreationService,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-partial-message-list-fetch.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-partial-message-list-fetch.service.ts
index 7ab5f5c65250..05189ded170a 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-partial-message-list-fetch.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-partial-message-list-fetch.service.ts
@@ -24,7 +24,7 @@ export class MessagingPartialMessageListFetchService {
 
   constructor(
     private readonly gmailClientProvider: MessagingGmailClientProvider,
-    @InjectCacheStorage(CacheStorageNamespace.Messaging)
+    @InjectCacheStorage(CacheStorageNamespace.ModuleMessaging)
     private readonly cacheStorage: CacheStorageService,
     private readonly gmailErrorHandlingService: MessagingErrorHandlingService,
     private readonly gmailGetHistoryService: MessagingGmailHistoryService,
diff --git a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts
index e3a3b5e06c63..94ac094ffb24 100644
--- a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts
+++ b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.ts
@@ -32,6 +32,8 @@ export class MessagingMessageChannelSyncStatusMonitoringCronJob {
   async handle(): Promise<void> {
     this.logger.log('Starting message channel sync status monitoring...');
 
+    console.time('MessagingMessageChannelSyncStatusMonitoringCronJob time');
+
     await this.messagingTelemetryService.track({
       eventName: 'message_channel.monitoring.sync_status.start',
       message: 'Starting message channel sync status monitoring',
@@ -68,5 +70,7 @@ export class MessagingMessageChannelSyncStatusMonitoringCronJob {
         });
       }
     }
+
+    console.timeEnd('MessagingMessageChannelSyncStatusMonitoringCronJob time');
   }
 }

From 091c0f83be7bac60f1f5b89bedf000d896d74e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Bosi?=
 <71827178+bosiraphael@users.noreply.github.com>
Date: Tue, 20 Aug 2024 19:44:29 +0200
Subject: [PATCH 8/8] 6619 modify event emitter to emit an array of events
 (#6625)

Closes #6619

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
---
 .../listeners/entity-events-to-db.listener.ts |  49 +++--
 .../listeners/telemetry.listener.ts           |  65 +++---
 .../workspace-query-runner.service.ts         | 192 ++++++++++--------
 .../billing-workspace-member.listener.ts      |   5 +-
 .../engine/core-modules/core-engine.module.ts |   2 +
 .../user-workspace/user-workspace.service.ts  |  16 +-
 .../services/__tests__/user.service.spec.ts   |  10 +-
 .../user/services/user.service.ts             |  13 +-
 .../workspace-workspace-member.listener.ts    |  63 +++---
 .../types/object-record-job-data.ts           |  11 -
 .../types/object-record.base.event.ts         |   7 +-
 .../workspace-event-emitter.module.ts         |  11 +
 .../workspace-event-emitter.ts                |  21 ++
 .../workspace-event.type.ts                   |   5 +
 .../listeners/calendar-blocklist.listener.ts  |  83 +++++---
 .../calendar-event-cleaner.module.ts          |   6 +-
 ...vent-cleaner-connected-account.listener.ts |  40 ++++
 .../services/calendar-save-events.service.ts  |  13 +-
 ...endar-event-participant-person.listener.ts |  85 ++++----
 ...t-participant-workspace-member.listener.ts |  81 ++++----
 .../calendar-event-participant.listener.ts    |  83 ++++----
 .../calendar-event-participant.service.ts     |   2 +-
 .../listeners/connected-account.listener.ts   |  41 ++--
 ...ected-account-delete-one.pre-query.hook.ts |  28 +--
 .../connected-account-query-hook.module.ts    |   4 +-
 ...acts-creation-calendar-channel.listener.ts |  41 ++--
 ...tacts-creation-message-channel.listener.ts |  41 ++--
 .../create-company-and-contact.service.ts     |  31 +--
 .../match-participant.service.ts              |  41 +++-
 .../listeners/messaging-blocklist.listener.ts | 144 +++++++------
 ...sage-cleaner-connected-account.listener.ts |  37 ++--
 .../messaging-message-cleaner.module.ts       |  10 +-
 ...import-manager-message-channel.listener.ts |  23 ++-
 .../message-participant-person.listener.ts    |  83 ++++----
 ...e-participant-workspace-member.listener.ts |  79 +++----
 .../listeners/message-participant.listener.ts |  83 ++++----
 .../create-audit-log-from-internal-event.ts   |  59 +++---
 ...meline-activity-from-internal-event.job.ts |  57 +++---
 .../services/timeline-activity.service.ts     |  16 +-
 .../database-event-trigger.listener.ts        |  38 ++--
 .../src/queue-worker/queue-worker.module.ts   |   6 +-
 41 files changed, 1004 insertions(+), 721 deletions(-)
 delete mode 100644 packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-job-data.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.module.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.ts
 create mode 100644 packages/twenty-server/src/engine/workspace-event-emitter/workspace-event.type.ts
 create mode 100644 packages/twenty-server/src/modules/calendar/calendar-event-cleaner/listeners/calendar-event-cleaner-connected-account.listener.ts

diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
index 6c7d6e066d24..1804901ac1d5 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
@@ -8,6 +8,7 @@ import { objectRecordChangedValues } from 'src/engine/integrations/event-emitter
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { CreateAuditLogFromInternalEvent } from 'src/modules/timeline/jobs/create-audit-log-from-internal-event';
 import { UpsertTimelineActivityFromInternalEvent } from 'src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job';
 
@@ -19,40 +20,46 @@ export class EntityEventsToDbListener {
   ) {}
 
   @OnEvent('*.created')
-  async handleCreate(payload: ObjectRecordCreateEvent<any>) {
+  async handleCreate(
+    payload: WorkspaceEventBatch<ObjectRecordCreateEvent<any>>,
+  ) {
     return this.handle(payload);
   }
 
   @OnEvent('*.updated')
-  async handleUpdate(payload: ObjectRecordUpdateEvent<any>) {
-    payload.properties.diff = objectRecordChangedValues(
-      payload.properties.before,
-      payload.properties.after,
-      payload.properties.updatedFields,
-      payload.objectMetadata,
-    );
+  async handleUpdate(
+    payload: WorkspaceEventBatch<ObjectRecordUpdateEvent<any>>,
+  ) {
+    for (const eventPayload of payload.events) {
+      eventPayload.properties.diff = objectRecordChangedValues(
+        eventPayload.properties.before,
+        eventPayload.properties.after,
+        eventPayload.properties.updatedFields,
+        eventPayload.objectMetadata,
+      );
+    }
 
     return this.handle(payload);
   }
 
   @OnEvent('*.deleted')
-  async handleDelete(payload: ObjectRecordUpdateEvent<any>) {
+  async handleDelete(
+    payload: WorkspaceEventBatch<ObjectRecordUpdateEvent<any>>,
+  ) {
     return this.handle(payload);
   }
 
-  private async handle(payload: ObjectRecordBaseEvent) {
-    if (!payload.objectMetadata?.isAuditLogged) {
-      return;
-    }
-
-    this.messageQueueService.add<ObjectRecordBaseEvent>(
-      CreateAuditLogFromInternalEvent.name,
-      payload,
+  private async handle(payload: WorkspaceEventBatch<ObjectRecordBaseEvent>) {
+    payload.events = payload.events.filter(
+      (event) => event.objectMetadata?.isAuditLogged,
     );
 
-    this.messageQueueService.add<ObjectRecordBaseEvent>(
-      UpsertTimelineActivityFromInternalEvent.name,
-      payload,
-    );
+    await this.messageQueueService.add<
+      WorkspaceEventBatch<ObjectRecordBaseEvent>
+    >(CreateAuditLogFromInternalEvent.name, payload);
+
+    await this.messageQueueService.add<
+      WorkspaceEventBatch<ObjectRecordBaseEvent>
+    >(UpsertTimelineActivityFromInternalEvent.name, payload);
   }
 }
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener.ts
index 8550a39632b7..f9609794d7ac 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener.ts
@@ -4,6 +4,7 @@ import { OnEvent } from '@nestjs/event-emitter';
 import { AnalyticsService } from 'src/engine/core-modules/analytics/analytics.service';
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 
 @Injectable()
 export class TelemetryListener {
@@ -13,36 +14,48 @@ export class TelemetryListener {
   ) {}
 
   @OnEvent('*.created')
-  async handleAllCreate(payload: ObjectRecordCreateEvent<any>) {
-    await this.analyticsService.create(
-      {
-        type: 'track',
-        data: {
-          eventName: payload.name,
-        },
-      },
-      payload.userId,
-      payload.workspaceId,
-      '', // voluntarely not retrieving this
-      '', // to avoid slowing down
-      this.environmentService.get('SERVER_URL'),
+  async handleAllCreate(
+    payload: WorkspaceEventBatch<ObjectRecordCreateEvent<any>>,
+  ) {
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        this.analyticsService.create(
+          {
+            type: 'track',
+            data: {
+              eventName: payload.name,
+            },
+          },
+          eventPayload.userId,
+          payload.workspaceId,
+          '', // voluntarily not retrieving this
+          '', // to avoid slowing down
+          this.environmentService.get('SERVER_URL'),
+        ),
+      ),
     );
   }
 
   @OnEvent('user.signup')
-  async handleUserSignup(payload: ObjectRecordCreateEvent<any>) {
-    await this.analyticsService.create(
-      {
-        type: 'track',
-        data: {
-          eventName: 'user.signup',
-        },
-      },
-      payload.userId,
-      payload.workspaceId,
-      '',
-      '',
-      this.environmentService.get('SERVER_URL'),
+  async handleUserSignup(
+    payload: WorkspaceEventBatch<ObjectRecordCreateEvent<any>>,
+  ) {
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        this.analyticsService.create(
+          {
+            type: 'track',
+            data: {
+              eventName: 'user.signup',
+            },
+          },
+          eventPayload.userId,
+          payload.workspaceId,
+          '',
+          '',
+          this.environmentService.get('SERVER_URL'),
+        ),
+      ),
     );
   }
 }
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
index 30f526a345ef..eb91900aea53 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
@@ -1,5 +1,4 @@
 import { Injectable, Logger } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 
 import isEmpty from 'lodash.isempty';
 import { DataSource } from 'typeorm';
@@ -55,6 +54,8 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.
 import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
 import { isQueryTimeoutError } from 'src/engine/utils/query-timeout.util';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
+import { isDefined } from 'src/utils/is-defined';
 
 import {
   PGGraphQLMutation,
@@ -78,7 +79,7 @@ export class WorkspaceQueryRunnerService {
     private readonly queryResultGettersFactory: QueryResultGettersFactory,
     @InjectMessageQueue(MessageQueue.webhookQueue)
     private readonly messageQueueService: MessageQueueService,
-    private readonly eventEmitter: EventEmitter2,
+    private readonly workspaceEventEmitter: WorkspaceEventEmitter,
     private readonly workspaceQueryHookService: WorkspaceQueryHookService,
     private readonly environmentService: EnvironmentService,
     private readonly duplicateService: DuplicateService,
@@ -304,18 +305,21 @@ export class WorkspaceQueryRunnerService {
       options,
     );
 
-    parsedResults.forEach((record) => {
-      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.created`, {
-        name: `${objectMetadataItem.nameSingular}.created`,
-        workspaceId: authContext.workspace.id,
-        userId: authContext.user?.id,
-        recordId: record.id,
-        objectMetadata: objectMetadataItem,
-        properties: {
-          after: record,
-        },
-      } satisfies ObjectRecordCreateEvent<any>);
-    });
+    this.workspaceEventEmitter.emit(
+      `${objectMetadataItem.nameSingular}.created`,
+      parsedResults.map(
+        (record) =>
+          ({
+            userId: authContext.user?.id,
+            recordId: record.id,
+            objectMetadata: objectMetadataItem,
+            properties: {
+              after: record,
+            },
+          }) satisfies ObjectRecordCreateEvent<any>,
+      ),
+      authContext.workspace.id,
+    );
 
     return parsedResults;
   }
@@ -440,18 +444,22 @@ export class WorkspaceQueryRunnerService {
       options,
     );
 
-    this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.updated`, {
-      name: `${objectMetadataItem.nameSingular}.updated`,
-      workspaceId: authContext.workspace.id,
-      userId: authContext.user?.id,
-      recordId: existingRecord.id,
-      objectMetadata: objectMetadataItem,
-      properties: {
-        updatedFields: Object.keys(args.data),
-        before: this.removeNestedProperties(existingRecord as Record),
-        after: this.removeNestedProperties(parsedResults?.[0]),
-      },
-    } satisfies ObjectRecordUpdateEvent<any>);
+    this.workspaceEventEmitter.emit(
+      `${objectMetadataItem.nameSingular}.updated`,
+      [
+        {
+          userId: authContext.user?.id,
+          recordId: existingRecord.id,
+          objectMetadata: objectMetadataItem,
+          properties: {
+            updatedFields: Object.keys(args.data),
+            before: this.removeNestedProperties(existingRecord as Record),
+            after: this.removeNestedProperties(parsedResults?.[0]),
+          },
+        } satisfies ObjectRecordUpdateEvent<any>,
+      ],
+      authContext.workspace.id,
+    );
 
     return parsedResults?.[0];
   }
@@ -513,30 +521,36 @@ export class WorkspaceQueryRunnerService {
       options,
     );
 
-    parsedResults.forEach((record) => {
-      const existingRecord = mappedRecords.get(record.id);
+    const eventsToEmit: ObjectRecordUpdateEvent<any>[] = parsedResults
+      .map((record) => {
+        const existingRecord = mappedRecords.get(record.id);
 
-      if (!existingRecord) {
-        this.logger.warn(
-          `Record with id ${record.id} not found in the database`,
-        );
+        if (!existingRecord) {
+          this.logger.warn(
+            `Record with id ${record.id} not found in the database`,
+          );
 
-        return;
-      }
+          return;
+        }
 
-      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.updated`, {
-        name: `${objectMetadataItem.nameSingular}.updated`,
-        workspaceId: authContext.workspace.id,
-        userId: authContext.user?.id,
-        recordId: existingRecord.id,
-        objectMetadata: objectMetadataItem,
-        properties: {
-          updatedFields: Object.keys(args.data),
-          before: this.removeNestedProperties(existingRecord as Record),
-          after: this.removeNestedProperties(record),
-        },
-      } satisfies ObjectRecordUpdateEvent<any>);
-    });
+        return {
+          userId: authContext.user?.id,
+          recordId: existingRecord.id,
+          objectMetadata: objectMetadataItem,
+          properties: {
+            updatedFields: Object.keys(args.data),
+            before: this.removeNestedProperties(existingRecord as Record),
+            after: this.removeNestedProperties(record),
+          },
+        };
+      })
+      .filter(isDefined);
+
+    this.workspaceEventEmitter.emit(
+      `${objectMetadataItem.nameSingular}.updated`,
+      eventsToEmit,
+      authContext.workspace.id,
+    );
 
     return parsedResults;
   }
@@ -602,18 +616,21 @@ export class WorkspaceQueryRunnerService {
       options,
     );
 
-    parsedResults.forEach((record) => {
-      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
-        name: `${objectMetadataItem.nameSingular}.deleted`,
-        workspaceId: authContext.workspace.id,
-        userId: authContext.user?.id,
-        recordId: record.id,
-        objectMetadata: objectMetadataItem,
-        properties: {
-          before: this.removeNestedProperties(record),
-        },
-      } satisfies ObjectRecordDeleteEvent<any>);
-    });
+    this.workspaceEventEmitter.emit(
+      `${objectMetadataItem.nameSingular}.deleted`,
+      parsedResults.map(
+        (record) =>
+          ({
+            userId: authContext.user?.id,
+            recordId: record.id,
+            objectMetadata: objectMetadataItem,
+            properties: {
+              before: this.removeNestedProperties(record),
+            },
+          }) satisfies ObjectRecordDeleteEvent<any>,
+      ),
+      authContext.workspace.id,
+    );
 
     return parsedResults;
   }
@@ -744,18 +761,21 @@ export class WorkspaceQueryRunnerService {
       options,
     );
 
-    parsedResults.forEach((record) => {
-      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.created`, {
-        name: `${objectMetadataItem.nameSingular}.created`,
-        workspaceId: authContext.workspace.id,
-        userId: authContext.user?.id,
-        recordId: record.id,
-        objectMetadata: objectMetadataItem,
-        properties: {
-          after: this.removeNestedProperties(record),
-        },
-      } satisfies ObjectRecordCreateEvent<any>);
-    });
+    this.workspaceEventEmitter.emit(
+      `${objectMetadataItem.nameSingular}.created`,
+      parsedResults.map(
+        (record) =>
+          ({
+            userId: authContext.user?.id,
+            recordId: record.id,
+            objectMetadata: objectMetadataItem,
+            properties: {
+              after: this.removeNestedProperties(record),
+            },
+          }) satisfies ObjectRecordCreateEvent<any>,
+      ),
+      authContext.workspace.id,
+    );
 
     return parsedResults;
   }
@@ -821,19 +841,23 @@ export class WorkspaceQueryRunnerService {
       options,
     );
 
-    this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
-      name: `${objectMetadataItem.nameSingular}.deleted`,
-      workspaceId: authContext.workspace.id,
-      userId: authContext.user?.id,
-      recordId: args.id,
-      objectMetadata: objectMetadataItem,
-      properties: {
-        before: {
-          ...(existingRecord ?? {}),
-          ...this.removeNestedProperties(parsedResults?.[0]),
-        },
-      },
-    } satisfies ObjectRecordDeleteEvent<any>);
+    this.workspaceEventEmitter.emit(
+      `${objectMetadataItem.nameSingular}.deleted`,
+      [
+        {
+          userId: authContext.user?.id,
+          recordId: args.id,
+          objectMetadata: objectMetadataItem,
+          properties: {
+            before: {
+              ...(existingRecord ?? {}),
+              ...this.removeNestedProperties(parsedResults?.[0]),
+            },
+          },
+        } satisfies ObjectRecordDeleteEvent<any>,
+      ],
+      authContext.workspace.id,
+    );
 
     return parsedResults?.[0];
   }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts b/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts
index d318b7277da7..0d6f03ef49a8 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts
@@ -10,6 +10,7 @@ import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/t
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 
 @Injectable()
@@ -23,7 +24,9 @@ export class BillingWorkspaceMemberListener {
   @OnEvent('workspaceMember.created')
   @OnEvent('workspaceMember.deleted')
   async handleCreateOrDeleteEvent(
-    payload: ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>
+    >,
   ) {
     if (!this.environmentService.get('IS_BILLING_ENABLED')) {
       return;
diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
index 11e07c91da4d..37b9ac882052 100644
--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
@@ -13,6 +13,7 @@ import { PostgresCredentialsModule } from 'src/engine/core-modules/postgres-cred
 import { UserModule } from 'src/engine/core-modules/user/user.module';
 import { WorkflowTriggerCoreModule } from 'src/engine/core-modules/workflow/core-workflow-trigger.module';
 import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
+import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
 
 import { AnalyticsModule } from './analytics/analytics.module';
 import { ClientConfigModule } from './client-config/client-config.module';
@@ -36,6 +37,7 @@ import { FileModule } from './file/file.module';
     AISQLQueryModule,
     PostgresCredentialsModule,
     WorkflowTriggerCoreModule,
+    WorkspaceEventEmitterModule,
   ],
   exports: [
     AnalyticsModule,
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 671977148d15..cc2727b3a118 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -1,5 +1,4 @@
 /* eslint-disable @nx/workspace-inject-workspace-repository */
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
@@ -11,6 +10,7 @@ import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 import { assert } from 'src/utils/assert';
 
@@ -22,7 +22,7 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
     private readonly userRepository: Repository<User>,
     private readonly dataSourceService: DataSourceService,
     private readonly typeORMService: TypeORMService,
-    private eventEmitter: EventEmitter2,
+    private workspaceEventEmitter: WorkspaceEventEmitter,
   ) {
     super(userWorkspaceRepository);
   }
@@ -35,11 +35,9 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
 
     const payload = new ObjectRecordCreateEvent<UserWorkspace>();
 
-    payload.workspaceId = workspaceId;
     payload.userId = userId;
-    payload.name = 'user.signup';
 
-    this.eventEmitter.emit('user.signup', payload);
+    this.workspaceEventEmitter.emit('user.signup', [payload], workspaceId);
 
     return this.userWorkspaceRepository.save(userWorkspace);
   }
@@ -76,14 +74,16 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
     const payload =
       new ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>();
 
-    payload.workspaceId = workspaceId;
     payload.properties = {
       after: workspaceMember[0],
     };
     payload.recordId = workspaceMember[0].id;
-    payload.name = 'workspaceMember.created';
 
-    this.eventEmitter.emit('workspaceMember.created', payload);
+    this.workspaceEventEmitter.emit(
+      'workspaceMember.created',
+      [payload],
+      workspaceId,
+    );
   }
 
   async addUserToWorkspace(user: User, workspace: Workspace) {
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/__tests__/user.service.spec.ts b/packages/twenty-server/src/engine/core-modules/user/services/__tests__/user.service.spec.ts
index 1773f249c7e4..24b5b23bfed9 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/__tests__/user.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/__tests__/user.service.spec.ts
@@ -1,14 +1,14 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 
-import { UserService } from 'src/engine/core-modules/user/services/user.service';
-import { User } from 'src/engine/core-modules/user/user.entity';
-import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
 import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
 
 describe('UserService', () => {
   let service: UserService;
@@ -34,7 +34,7 @@ describe('UserService', () => {
           useValue: {},
         },
         {
-          provide: EventEmitter2,
+          provide: WorkspaceEventEmitter,
           useValue: {},
         },
         {
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
index e8aef7fe899b..3ee3636ee270 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
@@ -1,4 +1,3 @@
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import assert from 'assert';
@@ -16,6 +15,7 @@ import {
 import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 
 // eslint-disable-next-line @nx/workspace-inject-workspace-repository
@@ -25,7 +25,7 @@ export class UserService extends TypeOrmQueryService<User> {
     private readonly userRepository: Repository<User>,
     private readonly dataSourceService: DataSourceService,
     private readonly typeORMService: TypeORMService,
-    private readonly eventEmitter: EventEmitter2,
+    private readonly workspaceEventEmitter: WorkspaceEventEmitter,
     private readonly workspaceService: WorkspaceService,
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {
@@ -110,15 +110,16 @@ export class UserService extends TypeOrmQueryService<User> {
     const payload =
       new ObjectRecordDeleteEvent<WorkspaceMemberWorkspaceEntity>();
 
-    payload.workspaceId = workspaceId;
     payload.properties = {
       before: workspaceMember,
     };
-    payload.name = 'workspaceMember.deleted';
     payload.recordId = workspaceMember.id;
-    payload.name = 'workspaceMember.deleted';
 
-    this.eventEmitter.emit('workspaceMember.deleted', payload);
+    this.workspaceEventEmitter.emit(
+      'workspaceMember.deleted',
+      [payload],
+      workspaceId,
+    );
 
     return user;
   }
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts
index 4236e3a3fb79..fbc01935d467 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts
@@ -11,6 +11,7 @@ import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/t
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 
 @Injectable()
@@ -23,39 +24,51 @@ export class WorkspaceWorkspaceMemberListener {
 
   @OnEvent('workspaceMember.updated')
   async handleUpdateEvent(
-    payload: ObjectRecordUpdateEvent<WorkspaceMemberWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordUpdateEvent<WorkspaceMemberWorkspaceEntity>
+    >,
   ) {
-    const { firstName: firstNameAfter, lastName: lastNameAfter } =
-      payload.properties.after.name;
-
-    if (firstNameAfter === '' && lastNameAfter === '') {
-      return;
-    }
-
-    if (!payload.userId) {
-      return;
-    }
-
-    await this.onboardingService.setOnboardingCreateProfilePending({
-      userId: payload.userId,
-      workspaceId: payload.workspaceId,
-      value: false,
-    });
+    await Promise.all(
+      payload.events.map((eventPayload) => {
+        const { firstName: firstNameAfter, lastName: lastNameAfter } =
+          eventPayload.properties.after.name;
+
+        if (firstNameAfter === '' && lastNameAfter === '') {
+          return;
+        }
+
+        if (!eventPayload.userId) {
+          return;
+        }
+
+        return this.onboardingService.setOnboardingCreateProfilePending({
+          userId: eventPayload.userId,
+          workspaceId: payload.workspaceId,
+          value: false,
+        });
+      }),
+    );
   }
 
   @OnEvent('workspaceMember.deleted')
   async handleDeleteEvent(
-    payload: ObjectRecordDeleteEvent<WorkspaceMemberWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordDeleteEvent<WorkspaceMemberWorkspaceEntity>
+    >,
   ) {
-    const userId = payload.properties.before.userId;
+    await Promise.all(
+      payload.events.map((eventPayload) => {
+        const userId = eventPayload.properties.before.userId;
 
-    if (!userId) {
-      return;
-    }
+        if (!userId) {
+          return;
+        }
 
-    await this.messageQueueService.add<HandleWorkspaceMemberDeletedJobData>(
-      HandleWorkspaceMemberDeletedJob.name,
-      { workspaceId: payload.workspaceId, userId },
+        return this.messageQueueService.add<HandleWorkspaceMemberDeletedJobData>(
+          HandleWorkspaceMemberDeletedJob.name,
+          { workspaceId: payload.workspaceId, userId },
+        );
+      }),
     );
   }
 }
diff --git a/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-job-data.ts b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-job-data.ts
deleted file mode 100644
index d1f7aa5ec0ef..000000000000
--- a/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record-job-data.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ObjectRecordBaseEvent } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
-
-export class ObjectRecordJobData extends ObjectRecordBaseEvent {
-  getOperation() {
-    return this.name.split('.')[1];
-  }
-
-  getObjectName() {
-    return this.name.split('.')[0];
-  }
-}
diff --git a/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record.base.event.ts b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record.base.event.ts
index d34fbd1afcc5..e515c130928f 100644
--- a/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record.base.event.ts
+++ b/packages/twenty-server/src/engine/integrations/event-emitter/types/object-record.base.event.ts
@@ -1,11 +1,14 @@
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 export class ObjectRecordBaseEvent {
-  name: string;
-  workspaceId: string;
   recordId: string;
   userId?: string;
   workspaceMemberId?: string;
   objectMetadata: ObjectMetadataInterface;
   properties: any;
 }
+
+export class ObjectRecordBaseEventWithNameAndWorkspaceId extends ObjectRecordBaseEvent {
+  name: string;
+  workspaceId: string;
+}
diff --git a/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.module.ts b/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.module.ts
new file mode 100644
index 000000000000..f81fe0fee4ad
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.module.ts
@@ -0,0 +1,11 @@
+import { Global, Module } from '@nestjs/common';
+
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
+
+@Global()
+@Module({
+  imports: [],
+  providers: [WorkspaceEventEmitter],
+  exports: [WorkspaceEventEmitter],
+})
+export class WorkspaceEventEmitterModule {}
diff --git a/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.ts b/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.ts
new file mode 100644
index 000000000000..374bc07c54cb
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event-emitter.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
+
+@Injectable()
+export class WorkspaceEventEmitter {
+  constructor(private readonly eventEmitter: EventEmitter2) {}
+
+  public emit(eventName: string, events: any[], workspaceId: string) {
+    if (!events.length) {
+      return;
+    }
+
+    return this.eventEmitter.emit(eventName, {
+      name: eventName,
+      workspaceId,
+      events,
+    } satisfies WorkspaceEventBatch<any>);
+  }
+}
diff --git a/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event.type.ts b/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event.type.ts
new file mode 100644
index 000000000000..623c523f280c
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-event-emitter/workspace-event.type.ts
@@ -0,0 +1,5 @@
+export type WorkspaceEventBatch<WorkspaceEvent> = {
+  name: string;
+  workspaceId: string;
+  events: WorkspaceEvent[];
+};
diff --git a/packages/twenty-server/src/modules/calendar/blocklist-manager/listeners/calendar-blocklist.listener.ts b/packages/twenty-server/src/modules/calendar/blocklist-manager/listeners/calendar-blocklist.listener.ts
index 9c1c54c5fab3..7a2b7e0e8389 100644
--- a/packages/twenty-server/src/modules/calendar/blocklist-manager/listeners/calendar-blocklist.listener.ts
+++ b/packages/twenty-server/src/modules/calendar/blocklist-manager/listeners/calendar-blocklist.listener.ts
@@ -7,6 +7,7 @@ import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/t
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { BlocklistWorkspaceEntity } from 'src/modules/blocklist/standard-objects/blocklist.workspace-entity';
 import {
   BlocklistItemDeleteCalendarEventsJob,
@@ -26,48 +27,74 @@ export class CalendarBlocklistListener {
 
   @OnEvent('blocklist.created')
   async handleCreatedEvent(
-    payload: ObjectRecordCreateEvent<BlocklistWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordCreateEvent<BlocklistWorkspaceEntity>
+    >,
   ) {
-    await this.messageQueueService.add<BlocklistItemDeleteCalendarEventsJobData>(
-      BlocklistItemDeleteCalendarEventsJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        blocklistItemId: payload.recordId,
-      },
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        this.messageQueueService.add<BlocklistItemDeleteCalendarEventsJobData>(
+          BlocklistItemDeleteCalendarEventsJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            blocklistItemId: eventPayload.recordId,
+          },
+        ),
+      ),
     );
   }
 
   @OnEvent('blocklist.deleted')
   async handleDeletedEvent(
-    payload: ObjectRecordDeleteEvent<BlocklistWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordDeleteEvent<BlocklistWorkspaceEntity>
+    >,
   ) {
-    await this.messageQueueService.add<BlocklistReimportCalendarEventsJobData>(
-      BlocklistReimportCalendarEventsJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        workspaceMemberId: payload.properties.before.workspaceMember.id,
-      },
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        this.messageQueueService.add<BlocklistReimportCalendarEventsJobData>(
+          BlocklistReimportCalendarEventsJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            workspaceMemberId:
+              eventPayload.properties.before.workspaceMember.id,
+          },
+        ),
+      ),
     );
   }
 
   @OnEvent('blocklist.updated')
   async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<BlocklistWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordUpdateEvent<BlocklistWorkspaceEntity>
+    >,
   ) {
-    await this.messageQueueService.add<BlocklistItemDeleteCalendarEventsJobData>(
-      BlocklistItemDeleteCalendarEventsJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        blocklistItemId: payload.recordId,
-      },
-    );
+    await Promise.all(
+      payload.events.reduce((acc: Promise<void>[], eventPayload) => {
+        acc.push(
+          this.messageQueueService.add<BlocklistItemDeleteCalendarEventsJobData>(
+            BlocklistItemDeleteCalendarEventsJob.name,
+            {
+              workspaceId: payload.workspaceId,
+              blocklistItemId: eventPayload.recordId,
+            },
+          ),
+        );
+
+        acc.push(
+          this.messageQueueService.add<BlocklistReimportCalendarEventsJobData>(
+            BlocklistReimportCalendarEventsJob.name,
+            {
+              workspaceId: payload.workspaceId,
+              workspaceMemberId:
+                eventPayload.properties.after.workspaceMember.id,
+            },
+          ),
+        );
 
-    await this.messageQueueService.add<BlocklistReimportCalendarEventsJobData>(
-      BlocklistReimportCalendarEventsJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        workspaceMemberId: payload.properties.after.workspaceMember.id,
-      },
+        return acc;
+      }, []),
     );
   }
 }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/calendar-event-cleaner.module.ts b/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/calendar-event-cleaner.module.ts
index 50da2766148f..bb9af960eb44 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/calendar-event-cleaner.module.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/calendar-event-cleaner.module.ts
@@ -1,15 +1,15 @@
 import { Module } from '@nestjs/common';
 
-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
 import { DeleteConnectedAccountAssociatedCalendarDataJob } from 'src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job';
+import { CalendarEventCleanerConnectedAccountListener } from 'src/modules/calendar/calendar-event-cleaner/listeners/calendar-event-cleaner-connected-account.listener';
 import { CalendarEventCleanerService } from 'src/modules/calendar/calendar-event-cleaner/services/calendar-event-cleaner.service';
-import { CalendarEventWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event.workspace-entity';
 
 @Module({
-  imports: [TwentyORMModule.forFeature([CalendarEventWorkspaceEntity])],
+  imports: [],
   providers: [
     CalendarEventCleanerService,
     DeleteConnectedAccountAssociatedCalendarDataJob,
+    CalendarEventCleanerConnectedAccountListener,
   ],
   exports: [CalendarEventCleanerService],
 })
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/listeners/calendar-event-cleaner-connected-account.listener.ts b/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/listeners/calendar-event-cleaner-connected-account.listener.ts
new file mode 100644
index 000000000000..0c14b6b60655
--- /dev/null
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/listeners/calendar-event-cleaner-connected-account.listener.ts
@@ -0,0 +1,40 @@
+import { Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
+import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
+import {
+  DeleteConnectedAccountAssociatedCalendarDataJob,
+  DeleteConnectedAccountAssociatedCalendarDataJobData,
+} from 'src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job';
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+
+@Injectable()
+export class CalendarEventCleanerConnectedAccountListener {
+  constructor(
+    @InjectMessageQueue(MessageQueue.calendarQueue)
+    private readonly calendarQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('connectedAccount.deleted')
+  async handleDeletedEvent(
+    payload: WorkspaceEventBatch<
+      ObjectRecordDeleteEvent<ConnectedAccountWorkspaceEntity>
+    >,
+  ) {
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        this.calendarQueueService.add<DeleteConnectedAccountAssociatedCalendarDataJobData>(
+          DeleteConnectedAccountAssociatedCalendarDataJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            connectedAccountId: eventPayload.recordId,
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts
index e67d2c498394..3f22e0c781ac 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service.ts
@@ -1,12 +1,13 @@
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 
 import { Any } from 'typeorm';
 
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
 import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
 import { injectIdsInCalendarEvents } from 'src/modules/calendar/calendar-event-import-manager/utils/inject-ids-in-calendar-events.util';
 import { CalendarEventParticipantService } from 'src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service';
 import { CalendarChannelEventAssociationWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity';
@@ -19,7 +20,6 @@ import {
   CreateCompanyAndContactJob,
   CreateCompanyAndContactJobData,
 } from 'src/modules/contact-creation-manager/jobs/create-company-and-contact.job';
-import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
 
 @Injectable()
 export class CalendarSaveEventsService {
@@ -28,7 +28,7 @@ export class CalendarSaveEventsService {
     private readonly calendarEventParticipantService: CalendarEventParticipantService,
     @InjectMessageQueue(MessageQueue.contactCreationQueue)
     private readonly messageQueueService: MessageQueueService,
-    private readonly eventEmitter: EventEmitter2,
+    private readonly workspaceEventEmitter: WorkspaceEventEmitter,
   ) {}
 
   public async saveCalendarEventsAndEnqueueContactCreationJob(
@@ -140,13 +140,6 @@ export class CalendarSaveEventsService {
       );
     });
 
-    this.eventEmitter.emit(`calendarEventParticipant.matched`, {
-      workspaceId,
-      name: 'calendarEventParticipant.matched',
-      workspaceMemberId: connectedAccount.accountOwnerId,
-      calendarEventParticipants: savedCalendarEventParticipantsToEmit,
-    });
-
     if (calendarChannel.isContactAutoCreationEnabled) {
       await this.messageQueueService.add<CreateCompanyAndContactJobData>(
         CreateCompanyAndContactJob.name,
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-person.listener.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-person.listener.ts
index 7b369af572d6..a48b842b94cd 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-person.listener.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-person.listener.ts
@@ -7,13 +7,14 @@ import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperti
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import {
-  CalendarEventParticipantMatchParticipantJobData,
   CalendarEventParticipantMatchParticipantJob,
+  CalendarEventParticipantMatchParticipantJobData,
 } from 'src/modules/calendar/calendar-event-participant-manager/jobs/calendar-event-participant-match-participant.job';
 import {
-  CalendarEventParticipantUnmatchParticipantJobData,
   CalendarEventParticipantUnmatchParticipantJob,
+  CalendarEventParticipantUnmatchParticipantJobData,
 } from 'src/modules/calendar/calendar-event-participant-manager/jobs/calendar-event-participant-unmatch-participant.job';
 import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
 
@@ -26,49 +27,59 @@ export class CalendarEventParticipantPersonListener {
 
   @OnEvent('person.created')
   async handleCreatedEvent(
-    payload: ObjectRecordCreateEvent<PersonWorkspaceEntity>,
-  ) {
-    if (payload.properties.after.email === null) {
-      return;
-    }
-
-    await this.messageQueueService.add<CalendarEventParticipantMatchParticipantJobData>(
-      CalendarEventParticipantMatchParticipantJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        email: payload.properties.after.email,
-        personId: payload.recordId,
-      },
-    );
-  }
-
-  @OnEvent('person.updated')
-  async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<PersonWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordCreateEvent<PersonWorkspaceEntity>
+    >,
   ) {
-    if (
-      objectRecordUpdateEventChangedProperties(
-        payload.properties.before,
-        payload.properties.after,
-      ).includes('email')
-    ) {
-      await this.messageQueueService.add<CalendarEventParticipantUnmatchParticipantJobData>(
-        CalendarEventParticipantUnmatchParticipantJob.name,
-        {
-          workspaceId: payload.workspaceId,
-          email: payload.properties.before.email,
-          personId: payload.recordId,
-        },
-      );
+    for (const eventPayload of payload.events) {
+      if (eventPayload.properties.after.email === null) {
+        continue;
+      }
 
+      // TODO: modify this job to take an array of participants to match
       await this.messageQueueService.add<CalendarEventParticipantMatchParticipantJobData>(
         CalendarEventParticipantMatchParticipantJob.name,
         {
           workspaceId: payload.workspaceId,
-          email: payload.properties.after.email,
-          personId: payload.recordId,
+          email: eventPayload.properties.after.email,
+          personId: eventPayload.recordId,
         },
       );
     }
   }
+
+  @OnEvent('person.updated')
+  async handleUpdatedEvent(
+    payload: WorkspaceEventBatch<
+      ObjectRecordUpdateEvent<PersonWorkspaceEntity>
+    >,
+  ) {
+    for (const eventPayload of payload.events) {
+      if (
+        objectRecordUpdateEventChangedProperties(
+          eventPayload.properties.before,
+          eventPayload.properties.after,
+        ).includes('email')
+      ) {
+        // TODO: modify this job to take an array of participants to match
+        await this.messageQueueService.add<CalendarEventParticipantUnmatchParticipantJobData>(
+          CalendarEventParticipantUnmatchParticipantJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            email: eventPayload.properties.before.email,
+            personId: eventPayload.recordId,
+          },
+        );
+
+        await this.messageQueueService.add<CalendarEventParticipantMatchParticipantJobData>(
+          CalendarEventParticipantMatchParticipantJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            email: eventPayload.properties.after.email,
+            personId: eventPayload.recordId,
+          },
+        );
+      }
+    }
+  }
 }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-workspace-member.listener.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-workspace-member.listener.ts
index 1f84fce0dc2f..ab02392c52c5 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-workspace-member.listener.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-workspace-member.listener.ts
@@ -7,13 +7,14 @@ import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperti
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import {
   CalendarEventParticipantMatchParticipantJob,
   CalendarEventParticipantMatchParticipantJobData,
 } from 'src/modules/calendar/calendar-event-participant-manager/jobs/calendar-event-participant-match-participant.job';
 import {
-  CalendarEventParticipantUnmatchParticipantJobData,
   CalendarEventParticipantUnmatchParticipantJob,
+  CalendarEventParticipantUnmatchParticipantJobData,
 } from 'src/modules/calendar/calendar-event-participant-manager/jobs/calendar-event-participant-unmatch-participant.job';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 
@@ -26,49 +27,57 @@ export class CalendarEventParticipantWorkspaceMemberListener {
 
   @OnEvent('workspaceMember.created')
   async handleCreatedEvent(
-    payload: ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>,
-  ) {
-    if (payload.properties.after.userEmail === null) {
-      return;
-    }
-
-    await this.messageQueueService.add<CalendarEventParticipantMatchParticipantJobData>(
-      CalendarEventParticipantMatchParticipantJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        email: payload.properties.after.userEmail,
-        workspaceMemberId: payload.properties.after.id,
-      },
-    );
-  }
-
-  @OnEvent('workspaceMember.updated')
-  async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<WorkspaceMemberWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>
+    >,
   ) {
-    if (
-      objectRecordUpdateEventChangedProperties<WorkspaceMemberWorkspaceEntity>(
-        payload.properties.before,
-        payload.properties.after,
-      ).includes('userEmail')
-    ) {
-      await this.messageQueueService.add<CalendarEventParticipantUnmatchParticipantJobData>(
-        CalendarEventParticipantUnmatchParticipantJob.name,
-        {
-          workspaceId: payload.workspaceId,
-          email: payload.properties.before.userEmail,
-          personId: payload.recordId,
-        },
-      );
+    for (const eventPayload of payload.events) {
+      if (eventPayload.properties.after.userEmail === null) {
+        continue;
+      }
 
       await this.messageQueueService.add<CalendarEventParticipantMatchParticipantJobData>(
         CalendarEventParticipantMatchParticipantJob.name,
         {
           workspaceId: payload.workspaceId,
-          email: payload.properties.after.userEmail,
-          workspaceMemberId: payload.recordId,
+          email: eventPayload.properties.after.userEmail,
+          workspaceMemberId: eventPayload.recordId,
         },
       );
     }
   }
+
+  @OnEvent('workspaceMember.updated')
+  async handleUpdatedEvent(
+    payload: WorkspaceEventBatch<
+      ObjectRecordUpdateEvent<WorkspaceMemberWorkspaceEntity>
+    >,
+  ) {
+    for (const eventPayload of payload.events) {
+      if (
+        objectRecordUpdateEventChangedProperties<WorkspaceMemberWorkspaceEntity>(
+          eventPayload.properties.before,
+          eventPayload.properties.after,
+        ).includes('userEmail')
+      ) {
+        await this.messageQueueService.add<CalendarEventParticipantUnmatchParticipantJobData>(
+          CalendarEventParticipantUnmatchParticipantJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            email: eventPayload.properties.before.userEmail,
+            personId: eventPayload.recordId,
+          },
+        );
+
+        await this.messageQueueService.add<CalendarEventParticipantMatchParticipantJobData>(
+          CalendarEventParticipantMatchParticipantJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            email: eventPayload.properties.after.userEmail,
+            workspaceMemberId: eventPayload.recordId,
+          },
+        );
+      }
+    }
+  }
 }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts
index d75d400ecee6..72152cdc36f2 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts
@@ -7,6 +7,7 @@ import { Repository } from 'typeorm';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { CalendarEventParticipantWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
 import { TimelineActivityRepository } from 'src/modules/timeline/repositiories/timeline-activity.repository';
 import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
@@ -22,49 +23,55 @@ export class CalendarEventParticipantListener {
   ) {}
 
   @OnEvent('calendarEventParticipant.matched')
-  public async handleCalendarEventParticipantMatchedEvent(payload: {
-    workspaceId: string;
-    workspaceMemberId: string;
-    participants: CalendarEventParticipantWorkspaceEntity[];
-  }): Promise<void> {
-    const calendarEventParticipants = payload.participants ?? [];
+  public async handleCalendarEventParticipantMatchedEvent(
+    payload: WorkspaceEventBatch<{
+      workspaceMemberId: string;
+      participants: CalendarEventParticipantWorkspaceEntity[];
+    }>,
+  ): Promise<void> {
+    const workspaceId = payload.workspaceId;
 
-    // TODO: move to a job?
+    // TODO: Refactor to insertTimelineActivitiesForObject once
+    for (const eventPayload of payload.events) {
+      const calendarEventParticipants = eventPayload.participants;
+      const workspaceMemberId = eventPayload.workspaceMemberId;
 
-    const dataSourceSchema = this.workspaceDataSourceService.getSchemaName(
-      payload.workspaceId,
-    );
+      // TODO: move to a job?
 
-    const calendarEventObjectMetadata =
-      await this.objectMetadataRepository.findOneOrFail({
-        where: {
-          nameSingular: 'calendarEvent',
-          workspaceId: payload.workspaceId,
-        },
-      });
+      const dataSourceSchema =
+        this.workspaceDataSourceService.getSchemaName(workspaceId);
 
-    const calendarEventParticipantsWithPersonId =
-      calendarEventParticipants.filter((participant) => participant.personId);
+      const calendarEventObjectMetadata =
+        await this.objectMetadataRepository.findOneOrFail({
+          where: {
+            nameSingular: 'calendarEvent',
+            workspaceId,
+          },
+        });
 
-    if (calendarEventParticipantsWithPersonId.length === 0) {
-      return;
-    }
+      const calendarEventParticipantsWithPersonId =
+        calendarEventParticipants.filter((participant) => participant.personId);
+
+      if (calendarEventParticipantsWithPersonId.length === 0) {
+        continue;
+      }
 
-    await this.timelineActivityRepository.insertTimelineActivitiesForObject(
-      'person',
-      calendarEventParticipantsWithPersonId.map((participant) => ({
-        dataSourceSchema,
-        name: 'calendarEvent.linked',
-        properties: null,
-        objectName: 'calendarEvent',
-        recordId: participant.personId,
-        workspaceMemberId: payload.workspaceMemberId,
-        workspaceId: payload.workspaceId,
-        linkedObjectMetadataId: calendarEventObjectMetadata.id,
-        linkedRecordId: participant.calendarEventId,
-        linkedRecordCachedName: '',
-      })),
-      payload.workspaceId,
-    );
+      await this.timelineActivityRepository.insertTimelineActivitiesForObject(
+        'person',
+        calendarEventParticipantsWithPersonId.map((participant) => ({
+          dataSourceSchema,
+          name: 'calendarEvent.linked',
+          properties: null,
+          objectName: 'calendarEvent',
+          recordId: participant.personId,
+          workspaceMemberId,
+          workspaceId,
+          linkedObjectMetadataId: calendarEventObjectMetadata.id,
+          linkedRecordId: participant.calendarEventId,
+          linkedRecordCachedName: '',
+        })),
+        workspaceId,
+      );
+    }
   }
 }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service.ts
index a704e6d29295..cc71ebf8282a 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service.ts
@@ -111,7 +111,7 @@ export class CalendarEventParticipantService {
 
     await this.matchParticipantService.matchParticipants(
       savedParticipants,
-      'messageParticipant',
+      'calendarEventParticipant',
       transactionManager,
     );
   }
diff --git a/packages/twenty-server/src/modules/connected-account/listeners/connected-account.listener.ts b/packages/twenty-server/src/modules/connected-account/listeners/connected-account.listener.ts
index 0c9b78843ce1..455721d817f6 100644
--- a/packages/twenty-server/src/modules/connected-account/listeners/connected-account.listener.ts
+++ b/packages/twenty-server/src/modules/connected-account/listeners/connected-account.listener.ts
@@ -3,6 +3,7 @@ import { OnEvent } from '@nestjs/event-emitter';
 
 import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
@@ -16,27 +17,31 @@ export class ConnectedAccountListener {
 
   @OnEvent('connectedAccount.deleted')
   async handleDeletedEvent(
-    payload: ObjectRecordDeleteEvent<ConnectedAccountWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordDeleteEvent<ConnectedAccountWorkspaceEntity>
+    >,
   ) {
-    const workspaceMemberId = payload.properties.before.accountOwnerId;
-    const workspaceId = payload.workspaceId;
-    const workspaceMemberRepository =
-      await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkspaceMemberWorkspaceEntity>(
-        workspaceId,
-        'workspaceMember',
-      );
-    const workspaceMember = await workspaceMemberRepository.findOneOrFail({
-      where: { id: workspaceMemberId },
-    });
+    for (const eventPayload of payload.events) {
+      const workspaceMemberId = eventPayload.properties.before.accountOwnerId;
+      const workspaceId = payload.workspaceId;
+      const workspaceMemberRepository =
+        await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkspaceMemberWorkspaceEntity>(
+          workspaceId,
+          'workspaceMember',
+        );
+      const workspaceMember = await workspaceMemberRepository.findOneOrFail({
+        where: { id: workspaceMemberId },
+      });
 
-    const userId = workspaceMember.userId;
+      const userId = workspaceMember.userId;
 
-    const connectedAccountId = payload.properties.before.id;
+      const connectedAccountId = eventPayload.properties.before.id;
 
-    await this.accountsToReconnectService.removeAccountToReconnect(
-      userId,
-      workspaceId,
-      connectedAccountId,
-    );
+      await this.accountsToReconnectService.removeAccountToReconnect(
+        userId,
+        workspaceId,
+        connectedAccountId,
+      );
+    }
   }
 }
diff --git a/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook.ts b/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook.ts
index 7a730431acf7..0812c0e33ea0 100644
--- a/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook.ts
+++ b/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook.ts
@@ -1,5 +1,3 @@
-import { EventEmitter2 } from '@nestjs/event-emitter';
-
 import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
@@ -7,6 +5,7 @@ import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runne
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
 import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 
 @WorkspaceQueryHook(`connectedAccount.deleteOne`)
@@ -15,7 +14,7 @@ export class ConnectedAccountDeleteOnePreQueryHook
 {
   constructor(
     private readonly twentyORMManager: TwentyORMManager,
-    private eventEmitter: EventEmitter2,
+    private readonly workspaceEventEmitter: WorkspaceEventEmitter,
   ) {}
 
   async execute(
@@ -34,16 +33,19 @@ export class ConnectedAccountDeleteOnePreQueryHook
       connectedAccountId,
     });
 
-    messageChannels.forEach((messageChannel) => {
-      this.eventEmitter.emit('messageChannel.deleted', {
-        workspaceId: authContext.workspace.id,
-        name: 'messageChannel.deleted',
-        recordId: messageChannel.id,
-      } satisfies Pick<
-        ObjectRecordDeleteEvent<MessageChannelWorkspaceEntity>,
-        'workspaceId' | 'recordId' | 'name'
-      >);
-    });
+    this.workspaceEventEmitter.emit(
+      'messageChannel.deleted',
+      messageChannels.map(
+        (messageChannel) =>
+          ({
+            recordId: messageChannel.id,
+          }) satisfies Pick<
+            ObjectRecordDeleteEvent<MessageChannelWorkspaceEntity>,
+            'recordId'
+          >,
+      ),
+      authContext.workspace.id,
+    );
 
     return payload;
   }
diff --git a/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-query-hook.module.ts b/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-query-hook.module.ts
index 57aaa6408be0..225a1c3bebbf 100644
--- a/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-query-hook.module.ts
+++ b/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-query-hook.module.ts
@@ -1,11 +1,9 @@
 import { Module } from '@nestjs/common';
 
-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
 import { ConnectedAccountDeleteOnePreQueryHook } from 'src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook';
-import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 
 @Module({
-  imports: [TwentyORMModule.forFeature([MessageChannelWorkspaceEntity])],
+  imports: [],
   providers: [ConnectedAccountDeleteOnePreQueryHook],
 })
 export class ConnectedAccountQueryHookModule {}
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/listeners/auto-companies-and-contacts-creation-calendar-channel.listener.ts b/packages/twenty-server/src/modules/contact-creation-manager/listeners/auto-companies-and-contacts-creation-calendar-channel.listener.ts
index 51104de273c4..5dd7497d009b 100644
--- a/packages/twenty-server/src/modules/contact-creation-manager/listeners/auto-companies-and-contacts-creation-calendar-channel.listener.ts
+++ b/packages/twenty-server/src/modules/contact-creation-manager/listeners/auto-companies-and-contacts-creation-calendar-channel.listener.ts
@@ -6,9 +6,10 @@ import { objectRecordChangedProperties } from 'src/engine/integrations/event-emi
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import {
-  CalendarCreateCompanyAndContactAfterSyncJobData,
   CalendarCreateCompanyAndContactAfterSyncJob,
+  CalendarCreateCompanyAndContactAfterSyncJobData,
 } from 'src/modules/calendar/calendar-event-participant-manager/jobs/calendar-create-company-and-contact-after-sync.job';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 
@@ -21,22 +22,28 @@ export class AutoCompaniesAndContactsCreationCalendarChannelListener {
 
   @OnEvent('calendarChannel.updated')
   async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<MessageChannelWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordUpdateEvent<MessageChannelWorkspaceEntity>
+    >,
   ) {
-    if (
-      objectRecordChangedProperties(
-        payload.properties.before,
-        payload.properties.after,
-      ).includes('isContactAutoCreationEnabled') &&
-      payload.properties.after.isContactAutoCreationEnabled
-    ) {
-      await this.messageQueueService.add<CalendarCreateCompanyAndContactAfterSyncJobData>(
-        CalendarCreateCompanyAndContactAfterSyncJob.name,
-        {
-          workspaceId: payload.workspaceId,
-          calendarChannelId: payload.recordId,
-        },
-      );
-    }
+    await Promise.all(
+      payload.events.map((eventPayload) => {
+        if (
+          objectRecordChangedProperties(
+            eventPayload.properties.before,
+            eventPayload.properties.after,
+          ).includes('isContactAutoCreationEnabled') &&
+          eventPayload.properties.after.isContactAutoCreationEnabled
+        ) {
+          return this.messageQueueService.add<CalendarCreateCompanyAndContactAfterSyncJobData>(
+            CalendarCreateCompanyAndContactAfterSyncJob.name,
+            {
+              workspaceId: payload.workspaceId,
+              calendarChannelId: eventPayload.recordId,
+            },
+          );
+        }
+      }),
+    );
   }
 }
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/listeners/auto-companies-and-contacts-creation-message-channel.listener.ts b/packages/twenty-server/src/modules/contact-creation-manager/listeners/auto-companies-and-contacts-creation-message-channel.listener.ts
index f1d6362d45a9..ac2511f745c0 100644
--- a/packages/twenty-server/src/modules/contact-creation-manager/listeners/auto-companies-and-contacts-creation-message-channel.listener.ts
+++ b/packages/twenty-server/src/modules/contact-creation-manager/listeners/auto-companies-and-contacts-creation-message-channel.listener.ts
@@ -6,10 +6,11 @@ import { objectRecordChangedProperties } from 'src/engine/integrations/event-emi
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 import {
-  MessagingCreateCompanyAndContactAfterSyncJobData,
   MessagingCreateCompanyAndContactAfterSyncJob,
+  MessagingCreateCompanyAndContactAfterSyncJobData,
 } from 'src/modules/messaging/message-participant-manager/jobs/messaging-create-company-and-contact-after-sync.job';
 
 @Injectable()
@@ -21,22 +22,28 @@ export class AutoCompaniesAndContactsCreationMessageChannelListener {
 
   @OnEvent('messageChannel.updated')
   async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<MessageChannelWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordUpdateEvent<MessageChannelWorkspaceEntity>
+    >,
   ) {
-    if (
-      objectRecordChangedProperties(
-        payload.properties.before,
-        payload.properties.after,
-      ).includes('isContactAutoCreationEnabled') &&
-      payload.properties.after.isContactAutoCreationEnabled
-    ) {
-      await this.messageQueueService.add<MessagingCreateCompanyAndContactAfterSyncJobData>(
-        MessagingCreateCompanyAndContactAfterSyncJob.name,
-        {
-          workspaceId: payload.workspaceId,
-          messageChannelId: payload.recordId,
-        },
-      );
-    }
+    await Promise.all(
+      payload.events.map((eventPayload) => {
+        if (
+          objectRecordChangedProperties(
+            eventPayload.properties.before,
+            eventPayload.properties.after,
+          ).includes('isContactAutoCreationEnabled') &&
+          eventPayload.properties.after.isContactAutoCreationEnabled
+        ) {
+          return this.messageQueueService.add<MessagingCreateCompanyAndContactAfterSyncJobData>(
+            MessagingCreateCompanyAndContactAfterSyncJob.name,
+            {
+              workspaceId: payload.workspaceId,
+              messageChannelId: eventPayload.recordId,
+            },
+          );
+        }
+      }),
+    );
   }
 }
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts
index 6435f0d65327..db6a6328bb29 100644
--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts
+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import chunk from 'lodash.chunk';
@@ -11,6 +10,7 @@ import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/com
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { CONTACTS_CREATION_BATCH_SIZE } from 'src/modules/contact-creation-manager/constants/contacts-creation-batch-size.constant';
@@ -32,7 +32,7 @@ export class CreateCompanyAndContactService {
     private readonly createCompaniesService: CreateCompanyService,
     @InjectObjectMetadataRepository(WorkspaceMemberWorkspaceEntity)
     private readonly workspaceMemberRepository: WorkspaceMemberRepository,
-    private readonly eventEmitter: EventEmitter2,
+    private readonly workspaceEventEmitter: WorkspaceEventEmitter,
     @InjectRepository(ObjectMetadataEntity, 'metadata')
     private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
@@ -191,18 +191,21 @@ export class CreateCompanyAndContactService {
         source,
       );
 
-      for (const createdPerson of createdPeople) {
-        this.eventEmitter.emit('person.created', {
-          name: 'person.created',
-          workspaceId,
-          // FixMe: TypeORM typing issue... id is always returned when using save
-          recordId: createdPerson.id as string,
-          objectMetadata,
-          properties: {
-            after: createdPerson,
-          },
-        } satisfies ObjectRecordCreateEvent<any>);
-      }
+      this.workspaceEventEmitter.emit(
+        'person.created',
+        createdPeople.map(
+          (createdPerson) =>
+            ({
+              // FixMe: TypeORM typing issue... id is always returned when using save
+              recordId: createdPerson.id as string,
+              objectMetadata,
+              properties: {
+                after: createdPerson,
+              },
+            }) satisfies ObjectRecordCreateEvent<any>,
+        ),
+        workspaceId,
+      );
     }
   }
 }
diff --git a/packages/twenty-server/src/modules/match-participant/match-participant.service.ts b/packages/twenty-server/src/modules/match-participant/match-participant.service.ts
index d7bba2e4b8e2..c5cd06f301f9 100644
--- a/packages/twenty-server/src/modules/match-participant/match-participant.service.ts
+++ b/packages/twenty-server/src/modules/match-participant/match-participant.service.ts
@@ -1,10 +1,10 @@
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 
 import { Any } from 'typeorm';
 
 import { ScopedWorkspaceContextFactory } from 'src/engine/twenty-orm/factories/scoped-workspace-context.factory';
 import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
 import { CalendarEventParticipantWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
 import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
 import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
@@ -17,7 +17,7 @@ export class MatchParticipantService<
     | MessageParticipantWorkspaceEntity,
 > {
   constructor(
-    private readonly eventEmitter: EventEmitter2,
+    private readonly workspaceEventEmitter: WorkspaceEventEmitter,
     private readonly twentyORMManager: TwentyORMManager,
     private readonly scopedWorkspaceContextFactory: ScopedWorkspaceContextFactory,
   ) {}
@@ -46,6 +46,10 @@ export class MatchParticipantService<
 
     const workspaceId = this.scopedWorkspaceContextFactory.create().workspaceId;
 
+    if (!workspaceId) {
+      throw new Error('Workspace ID is required');
+    }
+
     const participantIds = participants.map((participant) => participant.id);
     const uniqueParticipantsHandles = [
       ...new Set(participants.map((participant) => participant.handle)),
@@ -109,11 +113,16 @@ export class MatchParticipantService<
       transactionManager,
     );
 
-    this.eventEmitter.emit(`${objectMetadataName}.matched`, {
+    this.workspaceEventEmitter.emit(
+      `${objectMetadataName}.matched`,
+      [
+        {
+          workspaceMemberId: null,
+          participants: matchedParticipants,
+        },
+      ],
       workspaceId,
-      workspaceMemberId: null,
-      participants: matchedParticipants,
-    });
+    );
   }
 
   public async matchParticipantsAfterPersonOrWorkspaceMemberCreation(
@@ -127,6 +136,10 @@ export class MatchParticipantService<
 
     const workspaceId = this.scopedWorkspaceContextFactory.create().workspaceId;
 
+    if (!workspaceId) {
+      throw new Error('Workspace ID is required');
+    }
+
     const participantsToUpdate = await participantRepository.find({
       where: {
         handle,
@@ -155,12 +168,18 @@ export class MatchParticipantService<
         },
       });
 
-      this.eventEmitter.emit(`${objectMetadataName}.matched`, {
+      this.workspaceEventEmitter.emit(
+        `${objectMetadataName}.matched`,
+        [
+          {
+            workspaceId,
+            name: `${objectMetadataName}.matched`,
+            workspaceMemberId: null,
+            participants: updatedParticipants,
+          },
+        ],
         workspaceId,
-        name: `${objectMetadataName}.matched`,
-        workspaceMemberId: null,
-        participants: updatedParticipants,
-      });
+      );
     }
 
     if (workspaceMemberId) {
diff --git a/packages/twenty-server/src/modules/messaging/blocklist-manager/listeners/messaging-blocklist.listener.ts b/packages/twenty-server/src/modules/messaging/blocklist-manager/listeners/messaging-blocklist.listener.ts
index 996aca092466..c34bbe192f12 100644
--- a/packages/twenty-server/src/modules/messaging/blocklist-manager/listeners/messaging-blocklist.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/blocklist-manager/listeners/messaging-blocklist.listener.ts
@@ -9,6 +9,7 @@ import { MessageQueue } from 'src/engine/integrations/message-queue/message-queu
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { BlocklistWorkspaceEntity } from 'src/modules/blocklist/standard-objects/blocklist.workspace-entity';
 import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
@@ -32,90 +33,109 @@ export class MessagingBlocklistListener {
 
   @OnEvent('blocklist.created')
   async handleCreatedEvent(
-    payload: ObjectRecordCreateEvent<BlocklistWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordCreateEvent<BlocklistWorkspaceEntity>
+    >,
   ) {
-    await this.messageQueueService.add<BlocklistItemDeleteMessagesJobData>(
-      BlocklistItemDeleteMessagesJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        blocklistItemId: payload.recordId,
-      },
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        // TODO: modify to pass an array of blocklist items
+        this.messageQueueService.add<BlocklistItemDeleteMessagesJobData>(
+          BlocklistItemDeleteMessagesJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            blocklistItemId: eventPayload.recordId,
+          },
+        ),
+      ),
     );
   }
 
   @OnEvent('blocklist.deleted')
   async handleDeletedEvent(
-    payload: ObjectRecordDeleteEvent<BlocklistWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordDeleteEvent<BlocklistWorkspaceEntity>
+    >,
   ) {
-    const workspaceMemberId = payload.properties.before.workspaceMember.id;
     const workspaceId = payload.workspaceId;
 
-    const connectedAccount =
-      await this.connectedAccountRepository.getAllByWorkspaceMemberId(
-        workspaceMemberId,
+    for (const eventPayload of payload.events) {
+      const workspaceMemberId =
+        eventPayload.properties.before.workspaceMember.id;
+
+      const connectedAccount =
+        await this.connectedAccountRepository.getAllByWorkspaceMemberId(
+          workspaceMemberId,
+          workspaceId,
+        );
+
+      if (!connectedAccount || connectedAccount.length === 0) {
+        return;
+      }
+
+      const messageChannelRepository =
+        await this.twentyORMManager.getRepository<MessageChannelWorkspaceEntity>(
+          'messageChannel',
+        );
+
+      const messageChannel = await messageChannelRepository.findOneOrFail({
+        where: {
+          connectedAccountId: connectedAccount[0].id,
+        },
+      });
+
+      await this.messagingChannelSyncStatusService.resetAndScheduleFullMessageListFetch(
+        messageChannel.id,
         workspaceId,
       );
-
-    if (!connectedAccount || connectedAccount.length === 0) {
-      return;
     }
-
-    const messageChannelRepository =
-      await this.twentyORMManager.getRepository<MessageChannelWorkspaceEntity>(
-        'messageChannel',
-      );
-
-    const messageChannel = await messageChannelRepository.findOneOrFail({
-      where: {
-        connectedAccountId: connectedAccount[0].id,
-      },
-    });
-
-    await this.messagingChannelSyncStatusService.resetAndScheduleFullMessageListFetch(
-      messageChannel.id,
-      workspaceId,
-    );
   }
 
   @OnEvent('blocklist.updated')
   async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<BlocklistWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordUpdateEvent<BlocklistWorkspaceEntity>
+    >,
   ) {
-    const workspaceMemberId = payload.properties.before.workspaceMember.id;
     const workspaceId = payload.workspaceId;
 
-    await this.messageQueueService.add<BlocklistItemDeleteMessagesJobData>(
-      BlocklistItemDeleteMessagesJob.name,
-      {
-        workspaceId,
-        blocklistItemId: payload.recordId,
-      },
-    );
+    for (const eventPayload of payload.events) {
+      const workspaceMemberId =
+        eventPayload.properties.before.workspaceMember.id;
 
-    const connectedAccount =
-      await this.connectedAccountRepository.getAllByWorkspaceMemberId(
-        workspaceMemberId,
-        workspaceId,
+      await this.messageQueueService.add<BlocklistItemDeleteMessagesJobData>(
+        BlocklistItemDeleteMessagesJob.name,
+        {
+          workspaceId,
+          blocklistItemId: eventPayload.recordId,
+        },
       );
 
-    if (!connectedAccount || connectedAccount.length === 0) {
-      return;
-    }
-
-    const messageChannelRepository =
-      await this.twentyORMManager.getRepository<MessageChannelWorkspaceEntity>(
-        'messageChannel',
+      const connectedAccount =
+        await this.connectedAccountRepository.getAllByWorkspaceMemberId(
+          workspaceMemberId,
+          workspaceId,
+        );
+
+      if (!connectedAccount || connectedAccount.length === 0) {
+        continue;
+      }
+
+      const messageChannelRepository =
+        await this.twentyORMManager.getRepository<MessageChannelWorkspaceEntity>(
+          'messageChannel',
+        );
+
+      const messageChannel = await messageChannelRepository.findOneOrFail({
+        where: {
+          connectedAccountId: connectedAccount[0].id,
+        },
+      });
+
+      await this.messagingChannelSyncStatusService.resetAndScheduleFullMessageListFetch(
+        messageChannel.id,
+        workspaceId,
       );
-
-    const messageChannel = await messageChannelRepository.findOneOrFail({
-      where: {
-        connectedAccountId: connectedAccount[0].id,
-      },
-    });
-
-    await this.messagingChannelSyncStatusService.resetAndScheduleFullMessageListFetch(
-      messageChannel.id,
-      workspaceId,
-    );
+    }
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-cleaner/listeners/messaging-message-cleaner-connected-account.listener.ts b/packages/twenty-server/src/modules/messaging/message-cleaner/listeners/messaging-message-cleaner-connected-account.listener.ts
index 8880ad5d10d4..8caf65c58857 100644
--- a/packages/twenty-server/src/modules/messaging/message-cleaner/listeners/messaging-message-cleaner-connected-account.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/message-cleaner/listeners/messaging-message-cleaner-connected-account.listener.ts
@@ -2,46 +2,39 @@ import { Injectable } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
 
 import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
+import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import {
   MessagingConnectedAccountDeletionCleanupJob,
   MessagingConnectedAccountDeletionCleanupJobData,
 } from 'src/modules/messaging/message-cleaner/jobs/messaging-connected-account-deletion-cleanup.job';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
-import {
-  DeleteConnectedAccountAssociatedCalendarDataJobData,
-  DeleteConnectedAccountAssociatedCalendarDataJob,
-} from 'src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job';
 
 @Injectable()
 export class MessagingMessageCleanerConnectedAccountListener {
   constructor(
     @InjectMessageQueue(MessageQueue.messagingQueue)
     private readonly messageQueueService: MessageQueueService,
-    @InjectMessageQueue(MessageQueue.calendarQueue)
-    private readonly calendarQueueService: MessageQueueService,
   ) {}
 
   @OnEvent('connectedAccount.deleted')
   async handleDeletedEvent(
-    payload: ObjectRecordDeleteEvent<ConnectedAccountWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordDeleteEvent<ConnectedAccountWorkspaceEntity>
+    >,
   ) {
-    await this.messageQueueService.add<MessagingConnectedAccountDeletionCleanupJobData>(
-      MessagingConnectedAccountDeletionCleanupJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        connectedAccountId: payload.recordId,
-      },
-    );
-
-    await this.calendarQueueService.add<DeleteConnectedAccountAssociatedCalendarDataJobData>(
-      DeleteConnectedAccountAssociatedCalendarDataJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        connectedAccountId: payload.recordId,
-      },
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        this.messageQueueService.add<MessagingConnectedAccountDeletionCleanupJobData>(
+          MessagingConnectedAccountDeletionCleanupJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            connectedAccountId: eventPayload.recordId,
+          },
+        ),
+      ),
     );
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts b/packages/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts
index ae4221a85e85..7b25fa456ae3 100644
--- a/packages/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts
+++ b/packages/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts
@@ -1,19 +1,11 @@
 import { Module } from '@nestjs/common';
 
-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
-import { MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';
-import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
 import { MessagingConnectedAccountDeletionCleanupJob } from 'src/modules/messaging/message-cleaner/jobs/messaging-connected-account-deletion-cleanup.job';
 import { MessagingMessageCleanerConnectedAccountListener } from 'src/modules/messaging/message-cleaner/listeners/messaging-message-cleaner-connected-account.listener';
 import { MessagingMessageCleanerService } from 'src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service';
 
 @Module({
-  imports: [
-    TwentyORMModule.forFeature([
-      MessageWorkspaceEntity,
-      MessageThreadWorkspaceEntity,
-    ]),
-  ],
+  imports: [],
   providers: [
     MessagingMessageCleanerService,
     MessagingConnectedAccountDeletionCleanupJob,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/listeners/messaging-import-manager-message-channel.listener.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/listeners/messaging-import-manager-message-channel.listener.ts
index d3f00c95fc42..b81118d3a20f 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/listeners/messaging-import-manager-message-channel.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/listeners/messaging-import-manager-message-channel.listener.ts
@@ -2,9 +2,10 @@ import { Injectable } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
 
 import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
+import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 import {
   MessagingCleanCacheJob,
@@ -20,14 +21,20 @@ export class MessagingMessageImportManagerMessageChannelListener {
 
   @OnEvent('messageChannel.deleted')
   async handleDeletedEvent(
-    payload: ObjectRecordDeleteEvent<MessageChannelWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordDeleteEvent<MessageChannelWorkspaceEntity>
+    >,
   ) {
-    await this.messageQueueService.add<MessagingCleanCacheJobData>(
-      MessagingCleanCacheJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        messageChannelId: payload.recordId,
-      },
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        this.messageQueueService.add<MessagingCleanCacheJobData>(
+          MessagingCleanCacheJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            messageChannelId: eventPayload.recordId,
+          },
+        ),
+      ),
     );
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts
index 521c92585054..2765c661129d 100644
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts
@@ -7,13 +7,14 @@ import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperti
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import {
-  MessageParticipantMatchParticipantJobData,
   MessageParticipantMatchParticipantJob,
+  MessageParticipantMatchParticipantJobData,
 } from 'src/modules/messaging/message-participant-manager/jobs/message-participant-match-participant.job';
 import {
-  MessageParticipantUnmatchParticipantJobData,
   MessageParticipantUnmatchParticipantJob,
+  MessageParticipantUnmatchParticipantJobData,
 } from 'src/modules/messaging/message-participant-manager/jobs/message-participant-unmatch-participant.job';
 import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
 
@@ -26,49 +27,57 @@ export class MessageParticipantPersonListener {
 
   @OnEvent('person.created')
   async handleCreatedEvent(
-    payload: ObjectRecordCreateEvent<PersonWorkspaceEntity>,
-  ) {
-    if (payload.properties.after.email === null) {
-      return;
-    }
-
-    await this.messageQueueService.add<MessageParticipantMatchParticipantJobData>(
-      MessageParticipantMatchParticipantJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        email: payload.properties.after.email,
-        personId: payload.recordId,
-      },
-    );
-  }
-
-  @OnEvent('person.updated')
-  async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<PersonWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordCreateEvent<PersonWorkspaceEntity>
+    >,
   ) {
-    if (
-      objectRecordUpdateEventChangedProperties(
-        payload.properties.before,
-        payload.properties.after,
-      ).includes('email')
-    ) {
-      await this.messageQueueService.add<MessageParticipantUnmatchParticipantJobData>(
-        MessageParticipantUnmatchParticipantJob.name,
-        {
-          workspaceId: payload.workspaceId,
-          email: payload.properties.before.email,
-          personId: payload.recordId,
-        },
-      );
+    for (const eventPayload of payload.events) {
+      if (eventPayload.properties.after.email === null) {
+        continue;
+      }
 
       await this.messageQueueService.add<MessageParticipantMatchParticipantJobData>(
         MessageParticipantMatchParticipantJob.name,
         {
           workspaceId: payload.workspaceId,
-          email: payload.properties.after.email,
-          personId: payload.recordId,
+          email: eventPayload.properties.after.email,
+          personId: eventPayload.recordId,
         },
       );
     }
   }
+
+  @OnEvent('person.updated')
+  async handleUpdatedEvent(
+    payload: WorkspaceEventBatch<
+      ObjectRecordUpdateEvent<PersonWorkspaceEntity>
+    >,
+  ) {
+    for (const eventPayload of payload.events) {
+      if (
+        objectRecordUpdateEventChangedProperties(
+          eventPayload.properties.before,
+          eventPayload.properties.after,
+        ).includes('email')
+      ) {
+        await this.messageQueueService.add<MessageParticipantUnmatchParticipantJobData>(
+          MessageParticipantUnmatchParticipantJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            email: eventPayload.properties.before.email,
+            personId: eventPayload.recordId,
+          },
+        );
+
+        await this.messageQueueService.add<MessageParticipantMatchParticipantJobData>(
+          MessageParticipantMatchParticipantJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            email: eventPayload.properties.after.email,
+            personId: eventPayload.recordId,
+          },
+        );
+      }
+    }
+  }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts
index 506bf3d5aa18..07968f379cec 100644
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts
@@ -14,6 +14,7 @@ import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperti
 import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import {
   MessageParticipantMatchParticipantJob,
   MessageParticipantMatchParticipantJobData,
@@ -35,7 +36,9 @@ export class MessageParticipantWorkspaceMemberListener {
 
   @OnEvent('workspaceMember.created')
   async handleCreatedEvent(
-    payload: ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>,
+    payload: WorkspaceEventBatch<
+      ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>
+    >,
   ) {
     const workspace = await this.workspaceRepository.findOneBy({
       id: payload.workspaceId,
@@ -48,47 +51,53 @@ export class MessageParticipantWorkspaceMemberListener {
       return;
     }
 
-    if (payload.properties.after.userEmail === null) {
-      return;
-    }
-
-    await this.messageQueueService.add<MessageParticipantMatchParticipantJobData>(
-      MessageParticipantMatchParticipantJob.name,
-      {
-        workspaceId: payload.workspaceId,
-        email: payload.properties.after.userEmail,
-        workspaceMemberId: payload.properties.after.id,
-      },
-    );
-  }
-
-  @OnEvent('workspaceMember.updated')
-  async handleUpdatedEvent(
-    payload: ObjectRecordUpdateEvent<WorkspaceMemberWorkspaceEntity>,
-  ) {
-    if (
-      objectRecordUpdateEventChangedProperties<WorkspaceMemberWorkspaceEntity>(
-        payload.properties.before,
-        payload.properties.after,
-      ).includes('userEmail')
-    ) {
-      await this.messageQueueService.add<MessageParticipantUnmatchParticipantJobData>(
-        MessageParticipantUnmatchParticipantJob.name,
-        {
-          workspaceId: payload.workspaceId,
-          email: payload.properties.before.userEmail,
-          personId: payload.recordId,
-        },
-      );
+    for (const eventPayload of payload.events) {
+      if (eventPayload.properties.after.userEmail === null) {
+        continue;
+      }
 
       await this.messageQueueService.add<MessageParticipantMatchParticipantJobData>(
         MessageParticipantMatchParticipantJob.name,
         {
           workspaceId: payload.workspaceId,
-          email: payload.properties.after.userEmail,
-          workspaceMemberId: payload.recordId,
+          email: eventPayload.properties.after.userEmail,
+          workspaceMemberId: eventPayload.recordId,
         },
       );
     }
   }
+
+  @OnEvent('workspaceMember.updated')
+  async handleUpdatedEvent(
+    payload: WorkspaceEventBatch<
+      ObjectRecordUpdateEvent<WorkspaceMemberWorkspaceEntity>
+    >,
+  ) {
+    for (const eventPayload of payload.events) {
+      if (
+        objectRecordUpdateEventChangedProperties<WorkspaceMemberWorkspaceEntity>(
+          eventPayload.properties.before,
+          eventPayload.properties.after,
+        ).includes('userEmail')
+      ) {
+        await this.messageQueueService.add<MessageParticipantUnmatchParticipantJobData>(
+          MessageParticipantUnmatchParticipantJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            email: eventPayload.properties.before.userEmail,
+            personId: eventPayload.recordId,
+          },
+        );
+
+        await this.messageQueueService.add<MessageParticipantMatchParticipantJobData>(
+          MessageParticipantMatchParticipantJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            email: eventPayload.properties.after.userEmail,
+            workspaceMemberId: eventPayload.recordId,
+          },
+        );
+      }
+    }
+  }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts
index f7a21ae898b3..d57ebdc4d513 100644
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts
@@ -7,6 +7,7 @@ import { Repository } from 'typeorm';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
 import { TimelineActivityRepository } from 'src/modules/timeline/repositiories/timeline-activity.repository';
 import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
@@ -22,50 +23,54 @@ export class MessageParticipantListener {
   ) {}
 
   @OnEvent('messageParticipant.matched')
-  public async handleMessageParticipantMatched(payload: {
-    workspaceId: string;
-    workspaceMemberId: string;
-    participants: MessageParticipantWorkspaceEntity[];
-  }): Promise<void> {
-    const messageParticipants = payload.participants ?? [];
+  public async handleMessageParticipantMatched(
+    payload: WorkspaceEventBatch<{
+      workspaceMemberId: string;
+      participants: MessageParticipantWorkspaceEntity[];
+    }>,
+  ): Promise<void> {
+    // TODO: Refactor to insertTimelineActivitiesForObject once
+    for (const eventPayload of payload.events) {
+      const messageParticipants = eventPayload.participants ?? [];
 
-    // TODO: move to a job?
+      // TODO: move to a job?
 
-    const dataSourceSchema = this.workspaceDataSourceService.getSchemaName(
-      payload.workspaceId,
-    );
+      const dataSourceSchema = this.workspaceDataSourceService.getSchemaName(
+        payload.workspaceId,
+      );
 
-    const messageObjectMetadata =
-      await this.objectMetadataRepository.findOneOrFail({
-        where: {
-          nameSingular: 'message',
-          workspaceId: payload.workspaceId,
-        },
-      });
+      const messageObjectMetadata =
+        await this.objectMetadataRepository.findOneOrFail({
+          where: {
+            nameSingular: 'message',
+            workspaceId: payload.workspaceId,
+          },
+        });
 
-    const messageParticipantsWithPersonId = messageParticipants.filter(
-      (participant) => participant.personId,
-    );
+      const messageParticipantsWithPersonId = messageParticipants.filter(
+        (participant) => participant.personId,
+      );
 
-    if (messageParticipantsWithPersonId.length === 0) {
-      return;
-    }
+      if (messageParticipantsWithPersonId.length === 0) {
+        return;
+      }
 
-    await this.timelineActivityRepository.insertTimelineActivitiesForObject(
-      'person',
-      messageParticipantsWithPersonId.map((participant) => ({
-        dataSourceSchema,
-        name: 'message.linked',
-        properties: null,
-        objectName: 'message',
-        recordId: participant.personId,
-        workspaceMemberId: payload.workspaceMemberId,
-        workspaceId: payload.workspaceId,
-        linkedObjectMetadataId: messageObjectMetadata.id,
-        linkedRecordId: participant.messageId,
-        linkedRecordCachedName: '',
-      })),
-      payload.workspaceId,
-    );
+      await this.timelineActivityRepository.insertTimelineActivitiesForObject(
+        'person',
+        messageParticipantsWithPersonId.map((participant) => ({
+          dataSourceSchema,
+          name: 'message.linked',
+          properties: null,
+          objectName: 'message',
+          recordId: participant.personId,
+          workspaceMemberId: eventPayload.workspaceMemberId,
+          workspaceId: payload.workspaceId,
+          linkedObjectMetadataId: messageObjectMetadata.id,
+          linkedRecordId: participant.messageId,
+          linkedRecordCachedName: '',
+        })),
+        payload.workspaceId,
+      );
+    }
   }
 }
diff --git a/packages/twenty-server/src/modules/timeline/jobs/create-audit-log-from-internal-event.ts b/packages/twenty-server/src/modules/timeline/jobs/create-audit-log-from-internal-event.ts
index edf4c3d9e488..d820020d3efc 100644
--- a/packages/twenty-server/src/modules/timeline/jobs/create-audit-log-from-internal-event.ts
+++ b/packages/twenty-server/src/modules/timeline/jobs/create-audit-log-from-internal-event.ts
@@ -1,12 +1,13 @@
 import { ObjectRecordBaseEvent } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
+import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { AuditLogRepository } from 'src/modules/timeline/repositiories/audit-log.repository';
 import { AuditLogWorkspaceEntity } from 'src/modules/timeline/standard-objects/audit-log.workspace-entity';
 import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
-import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
 
 @Processor(MessageQueue.entityEventsToDbQueue)
 export class CreateAuditLogFromInternalEvent {
@@ -18,33 +19,37 @@ export class CreateAuditLogFromInternalEvent {
   ) {}
 
   @Process(CreateAuditLogFromInternalEvent.name)
-  async handle(data: ObjectRecordBaseEvent): Promise<void> {
-    let workspaceMemberId: string | null = null;
+  async handle(
+    data: WorkspaceEventBatch<ObjectRecordBaseEvent>,
+  ): Promise<void> {
+    for (const eventData of data.events) {
+      let workspaceMemberId: string | null = null;
 
-    if (data.userId) {
-      const workspaceMember = await this.workspaceMemberService.getByIdOrFail(
-        data.userId,
-        data.workspaceId,
-      );
+      if (eventData.userId) {
+        const workspaceMember = await this.workspaceMemberService.getByIdOrFail(
+          eventData.userId,
+          data.workspaceId,
+        );
 
-      workspaceMemberId = workspaceMember.id;
-    }
+        workspaceMemberId = workspaceMember.id;
+      }
 
-    if (data.properties.diff) {
-      // we remove "before" and "after" property for a cleaner/slimmer event payload
-      data.properties = {
-        diff: data.properties.diff,
-      };
-    }
+      if (eventData.properties.diff) {
+        // we remove "before" and "after" property for a cleaner/slimmer event payload
+        eventData.properties = {
+          diff: eventData.properties.diff,
+        };
+      }
 
-    await this.auditLogRepository.insert(
-      data.name,
-      data.properties,
-      workspaceMemberId,
-      data.name.split('.')[0],
-      data.objectMetadata.id,
-      data.recordId,
-      data.workspaceId,
-    );
+      await this.auditLogRepository.insert(
+        data.name,
+        eventData.properties,
+        workspaceMemberId,
+        data.name.split('.')[0],
+        eventData.objectMetadata.id,
+        eventData.recordId,
+        data.workspaceId,
+      );
+    }
   }
 }
diff --git a/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts b/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
index ada03bf13c8f..c73479745c7c 100644
--- a/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
+++ b/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
@@ -3,6 +3,7 @@ import { Process } from 'src/engine/integrations/message-queue/decorators/proces
 import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { TimelineActivityService } from 'src/modules/timeline/services/timeline-activity.service';
 import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
@@ -16,33 +17,41 @@ export class UpsertTimelineActivityFromInternalEvent {
   ) {}
 
   @Process(UpsertTimelineActivityFromInternalEvent.name)
-  async handle(data: ObjectRecordBaseEvent): Promise<void> {
-    if (data.userId) {
-      const workspaceMember = await this.workspaceMemberService.getByIdOrFail(
-        data.userId,
-        data.workspaceId,
-      );
+  async handle(
+    data: WorkspaceEventBatch<ObjectRecordBaseEvent>,
+  ): Promise<void> {
+    for (const eventData of data.events) {
+      if (eventData.userId) {
+        const workspaceMember = await this.workspaceMemberService.getByIdOrFail(
+          eventData.userId,
+          data.workspaceId,
+        );
 
-      data.workspaceMemberId = workspaceMember.id;
-    }
+        eventData.workspaceMemberId = workspaceMember.id;
+      }
 
-    if (data.properties.diff) {
-      // we remove "before" and "after" property for a cleaner/slimmer event payload
-      data.properties = {
-        diff: data.properties.diff,
-      };
-    }
+      if (eventData.properties.diff) {
+        // we remove "before" and "after" property for a cleaner/slimmer event payload
+        eventData.properties = {
+          diff: eventData.properties.diff,
+        };
+      }
 
-    // Temporary
-    // We ignore every that is not a LinkedObject or a Business Object
-    if (
-      data.objectMetadata.isSystem &&
-      data.objectMetadata.nameSingular !== 'noteTarget' &&
-      data.objectMetadata.nameSingular !== 'taskTarget'
-    ) {
-      return;
-    }
+      // Temporary
+      // We ignore every that is not a LinkedObject or a Business Object
+      if (
+        eventData.objectMetadata.isSystem &&
+        eventData.objectMetadata.nameSingular !== 'noteTarget' &&
+        eventData.objectMetadata.nameSingular !== 'taskTarget'
+      ) {
+        continue;
+      }
 
-    await this.timelineActivityService.upsertEvent(data);
+      await this.timelineActivityService.upsertEvent({
+        ...eventData,
+        workspaceId: data.workspaceId,
+        name: data.name,
+      });
+    }
   }
 }
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
index b3b32ef3b522..963a65d5f35f 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
@@ -1,12 +1,12 @@
 import { Injectable } from '@nestjs/common';
 
-import { ObjectRecordBaseEvent } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
+import { ObjectRecordBaseEventWithNameAndWorkspaceId } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 import { TimelineActivityRepository } from 'src/modules/timeline/repositiories/timeline-activity.repository';
 import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
 
-type TransformedEvent = ObjectRecordBaseEvent & {
+type TransformedEvent = ObjectRecordBaseEventWithNameAndWorkspaceId & {
   objectName?: string;
   linkedRecordCachedName?: string;
   linkedRecordId?: string;
@@ -26,7 +26,7 @@ export class TimelineActivityService {
     task: 'taskTarget',
   };
 
-  async upsertEvent(event: ObjectRecordBaseEvent) {
+  async upsertEvent(event: ObjectRecordBaseEventWithNameAndWorkspaceId) {
     const events = await this.transformEvent(event);
 
     if (!events || events.length === 0) return;
@@ -47,7 +47,7 @@ export class TimelineActivityService {
   }
 
   private async transformEvent(
-    event: ObjectRecordBaseEvent,
+    event: ObjectRecordBaseEventWithNameAndWorkspaceId,
   ): Promise<TransformedEvent[]> {
     if (['note', 'task'].includes(event.objectMetadata.nameSingular)) {
       const linkedObjects = await this.handleLinkedObjects(event);
@@ -69,7 +69,9 @@ export class TimelineActivityService {
     return [event];
   }
 
-  private async handleLinkedObjects(event: ObjectRecordBaseEvent) {
+  private async handleLinkedObjects(
+    event: ObjectRecordBaseEventWithNameAndWorkspaceId,
+  ) {
     const dataSourceSchema = this.workspaceDataSourceService.getSchemaName(
       event.workspaceId,
     );
@@ -92,7 +94,7 @@ export class TimelineActivityService {
   }
 
   private async processActivity(
-    event: ObjectRecordBaseEvent,
+    event: ObjectRecordBaseEventWithNameAndWorkspaceId,
     dataSourceSchema: string,
     activityType: string,
   ) {
@@ -145,7 +147,7 @@ export class TimelineActivityService {
   }
 
   private async processActivityTarget(
-    event: ObjectRecordBaseEvent,
+    event: ObjectRecordBaseEventWithNameAndWorkspaceId,
     dataSourceSchema: string,
     activityType: string,
   ) {
diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/listeners/database-event-trigger.listener.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/listeners/database-event-trigger.listener.ts
index 3bf1eaa7e416..5291b8094ba9 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/listeners/database-event-trigger.listener.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/listeners/database-event-trigger.listener.ts
@@ -10,6 +10,7 @@ import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decora
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { WorkflowEventListenerWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-event-listener.workspace-entity';
 import {
   WorkflowEventTriggerJob,
@@ -28,25 +29,32 @@ export class DatabaseEventTriggerListener {
   ) {}
 
   @OnEvent('*.created')
-  async handleObjectRecordCreateEvent(payload: ObjectRecordCreateEvent<any>) {
+  async handleObjectRecordCreateEvent(
+    payload: WorkspaceEventBatch<ObjectRecordCreateEvent<any>>,
+  ) {
     await this.handleEvent(payload);
   }
 
   @OnEvent('*.updated')
-  async handleObjectRecordUpdateEvent(payload: ObjectRecordUpdateEvent<any>) {
+  async handleObjectRecordUpdateEvent(
+    payload: WorkspaceEventBatch<ObjectRecordUpdateEvent<any>>,
+  ) {
     await this.handleEvent(payload);
   }
 
   @OnEvent('*.deleted')
-  async handleObjectRecordDeleteEvent(payload: ObjectRecordDeleteEvent<any>) {
+  async handleObjectRecordDeleteEvent(
+    payload: WorkspaceEventBatch<ObjectRecordDeleteEvent<any>>,
+  ) {
     await this.handleEvent(payload);
   }
 
   private async handleEvent(
-    payload:
+    payload: WorkspaceEventBatch<
       | ObjectRecordCreateEvent<any>
       | ObjectRecordUpdateEvent<any>
-      | ObjectRecordDeleteEvent<any>,
+      | ObjectRecordDeleteEvent<any>
+    >,
   ) {
     const workspaceId = payload.workspaceId;
     const eventName = payload.name;
@@ -84,15 +92,17 @@ export class DatabaseEventTriggerListener {
     });
 
     for (const eventListener of eventListeners) {
-      this.messageQueueService.add<WorkflowEventTriggerJobData>(
-        WorkflowEventTriggerJob.name,
-        {
-          workspaceId,
-          workflowId: eventListener.workflowId,
-          payload,
-        },
-        { retryLimit: 3 },
-      );
+      for (const eventPayload of payload.events) {
+        this.messageQueueService.add<WorkflowEventTriggerJobData>(
+          WorkflowEventTriggerJob.name,
+          {
+            workspaceId,
+            workflowId: eventListener.workflowId,
+            payload: eventPayload,
+          },
+          { retryLimit: 3 },
+        );
+      }
     }
   }
 }
diff --git a/packages/twenty-server/src/queue-worker/queue-worker.module.ts b/packages/twenty-server/src/queue-worker/queue-worker.module.ts
index 6f3374a1c79c..c6eb553d2219 100644
--- a/packages/twenty-server/src/queue-worker/queue-worker.module.ts
+++ b/packages/twenty-server/src/queue-worker/queue-worker.module.ts
@@ -1,15 +1,17 @@
 import { Module } from '@nestjs/common';
 
-import { JobsModule } from 'src/engine/integrations/message-queue/jobs.module';
 import { IntegrationsModule } from 'src/engine/integrations/integrations.module';
-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
+import { JobsModule } from 'src/engine/integrations/message-queue/jobs.module';
 import { MessageQueueModule } from 'src/engine/integrations/message-queue/message-queue.module';
+import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
+import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
 
 @Module({
   imports: [
     TwentyORMModule.register({}),
     IntegrationsModule,
     MessageQueueModule.registerExplorer(),
+    WorkspaceEventEmitterModule,
     JobsModule,
   ],
 })