diff --git a/docs/docs/contributor/local-setup/docker-setup.mdx b/docs/docs/contributor/local-setup/docker-setup.mdx
index 88dd1e07a..501252673 100644
--- a/docs/docs/contributor/local-setup/docker-setup.mdx
+++ b/docs/docs/contributor/local-setup/docker-setup.mdx
@@ -90,10 +90,9 @@ Start the containers:
 make up
 ```
 
-Run database migrations, generate prisma client, and seed:
+Setup database, generate prisma client, run migrations, and seed:
 ```bash
-make server-database-setup
-make server-database-reset
+make server-database-init
 ```
 
 ## Step 5: Start Twenty
diff --git a/infra/dev/Makefile b/infra/dev/Makefile
index 860d30c74..a83cb95bf 100644
--- a/infra/dev/Makefile
+++ b/infra/dev/Makefile
@@ -41,20 +41,20 @@ front-storybook:
 server-start:
 	@docker compose exec twenty-dev sh -c "cd /app/server && yarn start:dev"
 
-server-prisma-generate:
-	@docker compose exec twenty-dev sh -c "cd /app/server && yarn prisma:generate"
-
-server-prisma-migrate:
-	@docker compose exec twenty-dev sh -c "cd /app/server && yarn prisma:migrate"
-
-server-prisma-seed:
-	@docker compose exec twenty-dev sh -c "cd /app/server && yarn prisma:seed"
-
-server-prisma-reset:
-	@docker compose exec twenty-dev sh -c "cd /app/server && yarn prisma:reset"
-
-server-database-reset:
-	@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:reset"
+server-database-init:
+	@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:init"
 
 server-database-setup:
 	@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:setup"
+
+server-database-migrate:
+	@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:migrate"
+
+server-database-generate:
+	@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:generate"
+
+server-database-seed:
+	@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:seed"
+
+server-database-reset:
+	@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:reset"
diff --git a/server/package.json b/server/package.json
index cca46902f..3e5508381 100644
--- a/server/package.json
+++ b/server/package.json
@@ -20,7 +20,6 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "./scripts/run-integration.sh",
-
     "prisma:generate-client": "npx prisma generate --generator client && yarn prisma:generate-gql-select",
     "prisma:generate-gql-select": "node scripts/generate-model-select-map.js",
     "prisma:generate-nest-graphql": "npx prisma generate --generator nestgraphql",
@@ -30,13 +29,12 @@
     "prisma:migrate": "npx prisma migrate deploy",
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
     "typeorm:migrate": "yarn typeorm migration:run -- -d ./src/metadata/metadata.datasource.ts",
-
+    "database:init": "yarn database:setup && yarn database:reset",
     "database:setup": "npx ts-node ./scripts/setup-db.ts",
-    "database:migrate": "yarn prisma:migrate && yarn typeorm:migrate",
+    "database:migrate": "yarn typeorm:migrate && yarn prisma:migrate",
     "database:generate": "yarn prisma:generate",
     "database:seed": "yarn prisma:seed",
-    "database:reset": "yarn database:migrate && yarn database:generate && yarn database:seed"
-    
+    "database:reset": "yarn database:generate && yarn database:migrate && yarn database:seed"
   },
   "dependencies": {
     "@apollo/server": "^4.7.3",