diff --git a/docs/docs/dev/_category_.json b/docs/docs/dev/_category_.json
index d07b6dbf2..b8aeacfa2 100644
--- a/docs/docs/dev/_category_.json
+++ b/docs/docs/dev/_category_.json
@@ -1,4 +1,4 @@
 {
-  "label": "Development",
+  "label": "Contributing",
   "position": 2
 }
diff --git a/docs/docs/dev/workflows.mdx b/docs/docs/dev/workflows.mdx
index b99f04356..4b161e2c9 100644
--- a/docs/docs/dev/workflows.mdx
+++ b/docs/docs/dev/workflows.mdx
@@ -2,20 +2,42 @@
 sidebar_custom_props:
   icon: TbTopologyStar
 ---
-# Workflows
+# Development workflow
 
-The following steps assume that you have installed and configure the project with Docker.
 
 ## IDE Setup
 
-If you are using VSCode, please use the `Dev Containers` extension to open the project in a container.
-This will allow you to run Visual Studio on top of the docker container.
+If you are using VSCode, we provide a [.vscode](https://github.com/twentyhq/twenty/tree/main/.vscode) configuration.
 
-## Front tests
+## Front development commands
 
-Run tests: `make front-test`  
-Run tests with coverage: `make front-coverage`
+```
+yarn # install dependencies
+yarn start # start local development server
 
-## Running commands
-If you are using Docker install, make sure to ssh in the docker container during development to execute commands.
-You can use `Makefile` to help you do this: `make sh` will open a CLI in the docker container and commands such as `make front-test` have been setup to be executed in the container.
\ No newline at end of file
+yarn test # run jest tests
+yarn storybook:dev # run storybook
+yarn storybook:test # run tests (needs yarn storybook:dev to be running)
+yarn storybook:coverage # run tests (needs yarn storybook:dev to be running)
+yarn lint # run linter
+
+yarn graphql:generate
+```
+
+See [front/package.json](https://github.com/twentyhq/twenty/blob/main/front/package.json) script section to see the full list of available commands.
+
+## Server development
+
+```
+yarn # install dependencies
+yarn start:dev
+
+yarn prisma:migrate # run migrations
+yarn prisma:generate # generate prisma and nestjs-graphql schemas
+yarn prisma:seed # provision database with seeds
+yarn:reset # all-in-one command to reset, migrate, seed and generate schemas
+
+yarn:test
+```
+
+See [server/package.json](https://github.com/twentyhq/twenty/blob/main/server/package.json) script section to see the full list of available commands.
\ No newline at end of file
diff --git a/docs/docs/start/cloud-setup.mdx b/docs/docs/start/cloud-setup.mdx
index 1b5bf3de4..470c50155 100644
--- a/docs/docs/start/cloud-setup.mdx
+++ b/docs/docs/start/cloud-setup.mdx
@@ -6,4 +6,5 @@ sidebar_custom_props:
 # Cloud setup
 
 The easiest way to quickly try the app is to signup on [app.twenty.com](https://app.twenty.com).
-Signup is free  
\ No newline at end of file
+
+The signup is free.
\ No newline at end of file
diff --git a/docs/docs/start/local-setup.mdx b/docs/docs/start/local-setup.mdx
index b44d5ee58..46964f626 100644
--- a/docs/docs/start/local-setup.mdx
+++ b/docs/docs/start/local-setup.mdx
@@ -6,20 +6,12 @@ sidebar_custom_props:
 
 # Local Setup
 
-We recommend using Docker to avoid potential problems with version compatibility, but it's also fairly simple to run the app directly on your machine.
+This section will guide you through the Twenty installation on your local environment. 
+Twenty is designed to be developer-friendly, and your local installation should be up and running in a few minutes.
 
-## With Docker
-
-### 1. Pre-requisites
-
-Make sure you have the latest Docker and Docker-compose versions installed on your computer.
-
-You can run `docker-compose --version` and `docker --version` to check they are installed.
-
-### 2. Git clone
-```
-git clone git@github.com:twentyhq/twenty.git
-```
+In a nutshell:
+- we recommend using `yarn` installation but we also provide an easy way to provide the project with Docker.
+- Twenty uses PostgreSQL as a database. If we don't have one available, we also provide a one-line command to provision a PostgreSQL instance through Docker.
 
 The repository is structured as follows:
 ```
@@ -27,25 +19,111 @@ twenty
 └───docs // contains this documentation
 └───front // contains the frontend code for the application
 └───server // contains the backend code for the application
-└───infra // contains the deployment configurations for dev and prod
+└───infra // contains docker development/production-ready deployment configuration
+```
+
+## Yarn install (recommended)
+
+**Note:** `npm` is currently not supporting local packages satisfactorily. We strongly recommend using `yarn` instead.
+
+### 1. Pre-requisites
+
+You need to have [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git), [node](https://nodejs.org/en/download) and [yarn](https://classic.yarnpkg.com/lang/en/docs/install/) installed on your computer.
+
+### 2. Git clone
+```
+git clone git@github.com:twentyhq/twenty.git
+```
+
+
+### 3. PostgresSQL database
+You also need to have a PosgresSQL database available. If you already have one available, you can skip this step.
+
+If you don't, you can provision one through `docker` using the following command:
+
+```
+make provision-postgres
+```
+
+This will create a docker container, exposing a PostgresSQL instance at [http://localhost:5432](http://localhost:5432).
+
+### 4. Setup env variables
+
+Twenty requires a few environment variables to be set. Locally, we recommend setting them through `.env` file.
+
+To do so, make a copy of .env.example files:
+```
+cp ./front/.env.example ./front/.env
+cp ./server/.env.example ./server/.env
+```
+
+The default values should work out of the box. Don't forget to update the database connection string if you are using your own database instance.
+
+### 5. Server setup
+
+**Note:** we recommend that you use `nvm` to install the correct `node` version. We have added a `server/.nvmrc` to ensure all contributors are using the same version.
+
+To build Twenty server and seed some data into your database:
+```
+cd server
+nvm use #recommended 
+yarn
+yarn prisma:reset
+yarn start:dev
+```
+
+Twenty server will be running at [http://localhost:3000](http://localhost:3000).
+
+### 6. Front setup
+
+**Note:** similarly, we recommend that you use `nvm` to install the right node version.
+
+```
+cd front
+nvm use #recommended 
+yarn
+yarn start
+```
+
+Twenty front will be running at [http://localhost:3001](http://localhost:3001).
+
+### 7. Sign in to your local Twenty installation
+
+Browse [http://localhost:3001](http://localhost:3001). You can connect using our recently seeded demo account `tim@apple.dev`.
+
+## Docker install
+
+If you wish, you can also provision the project with docker. This come with a few advantages:
+- provides the exact same environment as our core developer team
+- includes some additional dependencies (such as `playwright`) that you might need if you wish to contribute to some advanced areas of the project.
+- provisions a postgres database
+
+### 1. Pre-requisites
+
+Make sure you have the latest `Docker` and [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) versions installed on your computer.
+
+You can run `docker --version` to check they it is installed.
+
+### 2. Git clone
+```
+git clone git@github.com:twentyhq/twenty.git
 ```
 
 ### 3. Setup env variables
 
-Go to the cloned folder (`cd twenty`). Then copy the env files:
+Twenty requires a few environment variables to be set. Locally, we recommend setting them through `.env` pattern.
 ```
-cp ./infra/dev/.env.example ./infra/dev/.env
 cp ./front/.env.example ./front/.env
 cp ./server/.env.example ./server/.env 
 ```
-Default values should work out of the box with the docker setup.
+The default values should work out of the box.
 
 ### 4. Build
 
 We provide a containerized environment with Docker and orchestrated with docker-compose.
 This install will also provision a Postgres container.
 
-The configuration is stored `infra/dev` folder.
+**Note:**: the configuration is stored `infra/dev` folder but you can run `make` commands direclty from the root folder.
 
 ```
 make build
@@ -53,9 +131,7 @@ make build
 
 ### 5. Migrate & seed
 
-Before running the project, we need to init the database by running migration and seeds.
-
-Always go the `infra/dev` folder to run the `make` commands.
+Before running the project, you need to initialize the database by running migration and seeds.
 
 Start the containers:
 ```
@@ -64,24 +140,10 @@ make up
 
 Run database migrations, generate prisma client and seed:
 ```
-make server-prisma-migrate
-make server-prisma-generate-client
-make server-prisma-seed
+make server-prisma-reset
 ```
 
-You can also ssh directly in the container and run these commands from the container:
-```
-make sh
-```
-Then
-```
-cd server
-yarn prisma:migrate
-yarn prisma:generate-client
-yarn prisma:seed
-```
-
-### 6. Start
+### 6. Start Twenty
 
 Once this is completed you can run the project with the following commands:
 
@@ -95,62 +157,23 @@ server:
 make server-start
 ```
 
-(optional) [storybook](https://storybook.js.org/): 
-```
-make front-storybook
-```
-
 - front available on: http://localhost:3001
 - server available on: http://localhost:3000/healthz
-- postgres: available on http://localhost:5432 and should contain database named `twenty` 
+- postgres: available on http://localhost:5432 and should contain database named `default` 
 
+### 7. Sign in to your local Twenty installation
 
-## Without Docker
+Browse [http://localhost:3001](http://localhost:3001). You can connect using our recently seeded demo account `tim@apple.dev`.
 
-While Docker is the recommended way to run Twenty, you might want to run the project directly on your machine.
+### 8. (Optional)
 
-### 1. Pre-requisites
-You need to have [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git), [node](https://nodejs.org/en/download) and [yarn](https://classic.yarnpkg.com/lang/en/docs/install/) installed on your computer.
-You also need to bring your own Postgres database.
+If you don't want to use make command and work directly from the container, you can also ssh directly in the container 
 
-### 2. Git clone
 ```
-git clone git@github.com:twentyhq/twenty.git
+make sh
 ```
-
-### 3. Setup env variables
-Make a copy of .env.example files:
-```
-cp ./front/.env.example ./front/.env
-cp ./server/.env.example ./server/.env
-```
-
-Most default value should work out of the box, but don't forget to update the database connection string.
-
-### 4. Build, Migrate & Seed
-On the frontend:
-```
-cd front
-yarn
-```
-
-On the server side:
+Then run commands through yarn:
 ```
 cd server
-yarn
-yarn prisma:migrate
-yarn prisma:generate-client
-yarn prisma:seed
-```
-
-### 5. Start
-On the frontend:
-```
-cd front
-yarn start
-```
-On the server side:
-```
-cd server
-yarn start
-```
+yarn prisma:reset
+```
\ No newline at end of file
diff --git a/docs/docs/start/self-hosting.mdx b/docs/docs/start/self-hosting.mdx
index 027be4f5c..b7d633e12 100644
--- a/docs/docs/start/self-hosting.mdx
+++ b/docs/docs/start/self-hosting.mdx
@@ -4,5 +4,42 @@ sidebar_custom_props:
 ---
 # Self hosting
 
-We will soon be working on options to make it easy to self host the app (click-to-deploy buttons for Heroku, Railway...).
-Contributions are welcome!
\ No newline at end of file
+Right now, docker containers are the only option we currently support. However we are actively working on providing simple options to self host Twenty yourself. 
+Feel free to open issues on [Github](https://github.com/twentyhq/twenty) if you want a specific cloud provider to be supported.
+
+Refer to this list to see what future options will be available
+
+## Production docker containers
+
+We provide a production-ready set of `Dockerfile` to allow you to build your own image and deploy it to your favorite cloud provider (Amazon Web Services, Google Cloud Platform, ...)
+
+You will find these in [infra/prod/front/Dockerfile](https://github.com/twentyhq/twenty/blob/main/infra/prod/front/Dockerfile) and [infra/prod/server/Dockerfile](https://github.com/twentyhq/twenty/blob/main/infra/prod/server/Dockerfile) files.
+
+### Front
+
+```
+docker build \
+ --build-arg REACT_APP_API_URL=REPLACE_ME \
+ --build-arg REACT_APP_AUTH_URL=REPLACE_ME \
+ --build-arg REACT_APP_FILES_URL=REPLACE_ME \
+ -t twenty-front:latest \
+ -f ./infra/prod/front/Dockerfile .
+```
+
+### Server
+
+```
+docker build \
+  -t twenty-server:latest \
+  -f ./infra/prod/server/Dockerfile .
+```
+
+To run the server, you will need to set a few environment variables you can find [here](https://github.com/twentyhq/twenty/blob/main/server/.env.example).
+
+## Ready-to-deploy joint image (soon)
+
+We are working on providing a joint docker image containing Twenty front and server, that you can deploy to Amazon Web Services (Elastic Beanstalk).
+
+## Railway (soon)
+
+Railway(railway.app) is an infrastructure platform that let you deploy to the cloud in one-click
\ No newline at end of file
diff --git a/infra/dev/.env.example b/infra/dev/.env.example
deleted file mode 100644
index 39aa93db5..000000000
--- a/infra/dev/.env.example
+++ /dev/null
@@ -1 +0,0 @@
-POSTGRES_PASSWORD=postgrespassword
\ No newline at end of file
diff --git a/infra/dev/Makefile b/infra/dev/Makefile
index 1d50478c7..1a4b07ce2 100644
--- a/infra/dev/Makefile
+++ b/infra/dev/Makefile
@@ -5,6 +5,9 @@ build:
 	@docker volume rm dev_twenty_node_modules_docs > /dev/null 2>&1 || true
 	@docker-compose build
 
+provision-postgres:
+	@docker-compose up postgres -d
+
 up:
 	@docker-compose up -d
 
diff --git a/infra/dev/docker-compose.yml b/infra/dev/docker-compose.yml
index 0f9518805..dc06e98da 100644
--- a/infra/dev/docker-compose.yml
+++ b/infra/dev/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     volumes:
     - db_data:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: postgrespassword
     ports:
       - "5432:5432"
 volumes:
diff --git a/server/.env.example b/server/.env.example
index 080d8ec59..03dc004b5 100644
--- a/server/.env.example
+++ b/server/.env.example
@@ -5,7 +5,7 @@ LOGIN_TOKEN_SECRET=secret_login_token
 LOGIN_TOKEN_EXPIRES_IN=15m
 REFRESH_TOKEN_SECRET=secret_refresh_token
 REFRESH_TOKEN_EXPIRES_IN=90d
-PG_DATABASE_URL=postgres://postgres:postgrespassword@postgres:5432/default?connection_limit=1
+PG_DATABASE_URL=postgres://postgres:postgrespassword@localhost:5432/default?connection_limit=1
 FRONT_AUTH_CALLBACK_URL=http://localhost:3001/auth/callback
 STORAGE_TYPE=local
 STORAGE_LOCAL_PATH=.local-storage