diff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yaml
index f6c33210b..c40a01858 100644
--- a/.github/workflows/ci-front.yaml
+++ b/.github/workflows/ci-front.yaml
@@ -21,6 +21,7 @@ jobs:
     runs-on: ci-8-cores
     env:
       REACT_APP_SERVER_BASE_URL: http://localhost:3000
+      NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.11.0
@@ -47,6 +48,7 @@ jobs:
         storybook_scope: [pages, modules]
     env:
       REACT_APP_SERVER_BASE_URL: http://localhost:3000
+      NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
     steps:
       - name: Fetch local actions
         uses: actions/checkout@v4
@@ -67,6 +69,7 @@ jobs:
     runs-on: ci-8-cores
     env:
       REACT_APP_SERVER_BASE_URL: http://localhost:3000
+      NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
     steps:
       - name: Fetch local actions
         uses: actions/checkout@v4
@@ -85,6 +88,7 @@ jobs:
     env:
       REACT_APP_SERVER_BASE_URL: http://127.0.0.1:3000
       CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+      NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
     steps:
       - uses: actions/checkout@v4
         with:
@@ -105,6 +109,8 @@ jobs:
         run: npx nx run twenty-front:chromatic:ci
   front-task:
     runs-on: ubuntu-latest
+    env:
+      NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
     strategy:
       matrix:
         task: [lint, typecheck, test]
diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml
index cc1968b34..83dcee198 100644
--- a/.github/workflows/ci-server.yaml
+++ b/.github/workflows/ci-server.yaml
@@ -19,6 +19,8 @@ concurrency:
 jobs:
   server-test:
     runs-on: ubuntu-latest
+    env:
+      NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
     services:
       postgres:
         image: twentycrm/twenty-postgres
diff --git a/nx.json b/nx.json
index 51a1c0f0d..a0567a4bb 100644
--- a/nx.json
+++ b/nx.json
@@ -210,13 +210,12 @@
       "executor": "nx:run-commands",
       "options": {
         "cwd": "{projectRoot}",
-        "command": "cross-var chromatic --project-token=$CHROMATIC_PROJECT_TOKEN --build-script-name={args.targetPackageJsonScript} --exit-zero-on-changes {args.ci}",
-        "ci": false,
+        "command": "cross-var chromatic --project-token=$CHROMATIC_PROJECT_TOKEN --build-script-name={args.targetPackageJsonScript} {args.ci}",
         "targetPackageJsonScript": "storybook:build:chromatic"
       },
       "configurations": {
         "ci": {
-          "ci": true
+          "ci": "--exit-zero-on-changes"
         }
       }
     },
diff --git a/packages/twenty-front/.storybook/main.ts b/packages/twenty-front/.storybook/main.ts
index 6abcc3657..9f356c31a 100644
--- a/packages/twenty-front/.storybook/main.ts
+++ b/packages/twenty-front/.storybook/main.ts
@@ -12,13 +12,13 @@ const computeStoriesGlob = () => {
 
   if (process.env.STORYBOOK_SCOPE === 'modules') {
     return [
-      '../src/modules/**/*.stories.@(js|jsx|ts|tsx)',
+      '../src/modules/**/!(perf)/*.stories.@(js|jsx|ts|tsx)',
       '../src/modules/**/*.docs.mdx',
     ];
   }
 
   if (process.env.STORYBOOK_SCOPE === 'performance') {
-    return ['../src/modules/**/*.perf.stories.@(js|jsx|ts|tsx)'];
+    return ['../src/modules/**/perf/*.perf.stories.@(js|jsx|ts|tsx)'];
   }
 
   if (process.env.STORYBOOK_SCOPE === 'ui-docs') {
diff --git a/packages/twenty-front/src/modules/activities/comment/Comment.tsx b/packages/twenty-front/src/modules/activities/comment/Comment.tsx
index ea6442b9f..810453eea 100644
--- a/packages/twenty-front/src/modules/activities/comment/Comment.tsx
+++ b/packages/twenty-front/src/modules/activities/comment/Comment.tsx
@@ -26,7 +26,6 @@ const StyledCommentBody = styled.div`
   overflow-wrap: anywhere;
 
   padding-left: 24px;
-
   text-align: left;
 `;
 
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/__stories__/EllipsisDisplay.perf.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/__stories__/perf/EllipsisDisplay.perf.stories.tsx
similarity index 100%
rename from packages/twenty-front/src/modules/ui/field/display/components/__stories__/EllipsisDisplay.perf.stories.tsx
rename to packages/twenty-front/src/modules/ui/field/display/components/__stories__/perf/EllipsisDisplay.perf.stories.tsx