diff --git a/docs/docs/contributor/local-setup/docker-setup.mdx b/docs/docs/contributor/local-setup/docker-setup.mdx
index 6eda06985..be57f8256 100644
--- a/docs/docs/contributor/local-setup/docker-setup.mdx
+++ b/docs/docs/contributor/local-setup/docker-setup.mdx
@@ -52,6 +52,7 @@ git clone https://github.com/twentyhq/twenty.git
 Twenty requires a few environment variables to be set. Locally, we recommend setting them through `.env` files.
 
 ```bash
+cd twenty
 cp ./front/.env.example ./front/.env
 cp ./server/.env.example ./server/.env 
 ```
@@ -91,7 +92,8 @@ make up
 
 Run database migrations, generate prisma client, and seed:
 ```bash
-make server-prisma-reset
+make server-database-setup
+make server-database-reset
 ```
 
 ## Step 5: Start Twenty
@@ -123,7 +125,7 @@ make sh
 Then run commands through yarn:
 ```bash
 cd server
-yarn prisma:reset
+yarn database:reset
 ```
 
 
diff --git a/infra/dev/Makefile b/infra/dev/Makefile
index 62a9c7739..4d56c0217 100644
--- a/infra/dev/Makefile
+++ b/infra/dev/Makefile
@@ -53,3 +53,9 @@ server-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-setup:
+	@docker compose exec twenty-dev sh -c "cd /app/server && yarn database:setup"
\ No newline at end of file
diff --git a/infra/dev/twenty-dev/Dockerfile b/infra/dev/twenty-dev/Dockerfile
index cf60624de..96cd83656 100644
--- a/infra/dev/twenty-dev/Dockerfile
+++ b/infra/dev/twenty-dev/Dockerfile
@@ -20,10 +20,6 @@ WORKDIR /app
 
 COPY ../.. .
 
-WORKDIR /app/server
-RUN yarn database:setup
-RUN yarn database:reset
-
 WORKDIR /app
 
 CMD ["tail", "-f", "/dev/null"]