diff --git a/.cursor/rules/README.mdc b/.cursor/rules/README.mdc
index 81284a9e06..88b1b3b495 100644
--- a/.cursor/rules/README.mdc
+++ b/.cursor/rules/README.mdc
@@ -82,7 +82,7 @@ npx nx run twenty-server:test              # Run unit tests
 npx nx run twenty-server:test:integration:with-db-reset # Run integration tests
 
 # Migrations
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/[name] -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 
 # Workspace
 ```
diff --git a/.cursor/rules/server-migrations.mdc b/.cursor/rules/server-migrations.mdc
index 6855d1a34b..57115554dc 100644
--- a/.cursor/rules/server-migrations.mdc
+++ b/.cursor/rules/server-migrations.mdc
@@ -11,14 +11,12 @@ alwaysApply: false
 
 - **When changing an entity, always generate a migration**
   - If you modify a `*.entity.ts` file in `packages/twenty-server/src`, you **must** generate a corresponding TypeORM migration instead of manually editing the database schema.
-  - Use the Nx + TypeORM command from the project root:
+  - Use the Nx command from the project root:
 
     ```bash
-    npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/common/[name] -d src/database/typeorm/core/core.datasource.ts
+    npx nx run twenty-server:database:migrate:generate
     ```
 
-  - Replace `[name]` with a descriptive, kebab-case migration name that reflects the change (for example, `add-agent-turn-evaluation`).
-
 - **Prefer generated migrations over manual edits**
   - Let TypeORM infer schema changes from the updated entities; only adjust the generated migration file manually if absolutely necessary (for example, for data backfills or complex constraints).
   - Keep schema changes (DDL) in these generated migrations and avoid mixing in heavy data migrations unless there is a strong reason and clear comments.
diff --git a/CLAUDE.md b/CLAUDE.md
index 29eb70b50c..229477b7aa 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -73,8 +73,8 @@ npx nx database:reset twenty-server         # Reset database
 npx nx run twenty-server:database:init:prod # Initialize database
 npx nx run twenty-server:database:migrate:prod # Run migrations
 
-# Generate migration (replace [name] with kebab-case descriptive name)
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/common/[name] -d src/database/typeorm/core/core.datasource.ts
+# Generate migration
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ### Database Inspection (Postgres MCP)
diff --git a/packages/twenty-docs/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/developers/contribute/capabilities/backend-development/server-commands.mdx
index e723e710f5..fa09716222 100644
--- a/packages/twenty-docs/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### For objects in Core/Metadata schemas (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## Tech Stack
diff --git a/packages/twenty-docs/l/ar/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/l/ar/developers/contribute/capabilities/backend-development/server-commands.mdx
index c99520b621..6b03494205 100644
--- a/packages/twenty-docs/l/ar/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/l/ar/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### للكائنات داخل مخططات Core/Metadata (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## "التقنية المستخدمة"
diff --git a/packages/twenty-docs/l/cs/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/l/cs/developers/contribute/capabilities/backend-development/server-commands.mdx
index 541731b012..02557f6c9d 100644
--- a/packages/twenty-docs/l/cs/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/l/cs/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### Pro objekty ve schématech Core/Metadata (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## Technologický stack
diff --git a/packages/twenty-docs/l/de/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/l/de/developers/contribute/capabilities/backend-development/server-commands.mdx
index bb50eb28ef..91bde2d596 100644
--- a/packages/twenty-docs/l/de/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/l/de/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### Für Objekte in Core/Metadata-Schemas (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## Technologie-Stack
diff --git a/packages/twenty-docs/l/es/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/l/es/developers/contribute/capabilities/backend-development/server-commands.mdx
index 15fa5d4214..e1b96c639e 100644
--- a/packages/twenty-docs/l/es/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/l/es/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### Para objetos en esquemas Core/Metadata (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## Stack Tecnológico
diff --git a/packages/twenty-docs/l/it/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/l/it/developers/contribute/capabilities/backend-development/server-commands.mdx
index 4271f9fcad..9c4a81476a 100644
--- a/packages/twenty-docs/l/it/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/l/it/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### Per oggetti negli schemi Core/Metadata (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## Tech Stack
diff --git a/packages/twenty-docs/l/pt/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/l/pt/developers/contribute/capabilities/backend-development/server-commands.mdx
index bc70f39efd..8a78ced5de 100644
--- a/packages/twenty-docs/l/pt/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/l/pt/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### Para objetos nos esquemas Core/Metadata (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## Pilha de Tecnologias
diff --git a/packages/twenty-docs/l/ro/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/l/ro/developers/contribute/capabilities/backend-development/server-commands.mdx
index 3096fcd68c..c9b0dbf215 100644
--- a/packages/twenty-docs/l/ro/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/l/ro/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### Pentru obiectele din schematizările de Bază/Metadate (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## Tehnologii Utilizate
diff --git a/packages/twenty-docs/l/ru/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/l/ru/developers/contribute/capabilities/backend-development/server-commands.mdx
index b4b4c86037..d037ead396 100644
--- a/packages/twenty-docs/l/ru/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/l/ru/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### Для объектов в схемах Core/Metadata (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## Технологический стек
diff --git a/packages/twenty-docs/l/tr/developers/contribute/capabilities/backend-development/server-commands.mdx b/packages/twenty-docs/l/tr/developers/contribute/capabilities/backend-development/server-commands.mdx
index 6a407d89a3..6b86afdabd 100644
--- a/packages/twenty-docs/l/tr/developers/contribute/capabilities/backend-development/server-commands.mdx
+++ b/packages/twenty-docs/l/tr/developers/contribute/capabilities/backend-development/server-commands.mdx
@@ -47,7 +47,7 @@ npx nx run twenty-server:database:reset
 #### Core/Metadata şemalarında (TypeORM) nesneler için
 
 ```bash
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/nameOfYourMigration -d src/database/typeorm/core/core.datasource.ts
+npx nx run twenty-server:database:migrate:generate
 ```
 
 ## Teknoloji Yığını
diff --git a/packages/twenty-server/project.json b/packages/twenty-server/project.json
index 62ca011e66..6b351eb5ce 100644
--- a/packages/twenty-server/project.json
+++ b/packages/twenty-server/project.json
@@ -123,14 +123,6 @@
         "command": "node dist/queue-worker/queue-worker.js"
       }
     },
-    "typeorm": {
-      "executor": "nx:run-commands",
-      "options": {
-        "cwd": "packages/twenty-server",
-        "command": "ts-node --transpile-only -P tsconfig.json ../../node_modules/typeorm/cli.js"
-      },
-      "dependsOn": ["^build"]
-    },
     "ts-node": {
       "executor": "nx:run-commands",
       "dependsOn": ["^build"],