diff --git a/.gitignore b/.gitignore
index cb66c1c86..a9c3b1761 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,3 @@ typebotsToFix.json
 snapshots
 
 .env
-.typebot-build
diff --git a/apps/docs/docs/self-hosting/guides/docker.mdx b/apps/docs/docs/self-hosting/guides/docker.mdx
index 5ba443d3d..9888d7bd8 100644
--- a/apps/docs/docs/self-hosting/guides/docker.mdx
+++ b/apps/docs/docs/self-hosting/guides/docker.mdx
@@ -188,6 +188,10 @@ If you don't already have an S3 storage available, you could include it in your
 
 ```yml
 version: '3.3'
+
+volumes:
+  s3-data:
+
 services:
   minio:
     image: minio/minio
@@ -198,7 +202,7 @@ services:
       MINIO_ROOT_USER: minio
       MINIO_ROOT_PASSWORD: minio123
     volumes:
-      - ${PWD}/.typebot/s3:/data
+      - s3-data:/data
   # This service just makes sure a bucket with the right policies is created
   createbuckets:
     image: minio/mc
@@ -237,6 +241,11 @@ Here is a config example that spins up Typebot with HTTPS, SMTP and S3 storage.
 
 ```yml
 version: '3.3'
+
+volumes:
+  db-data:
+  s3-data:
+
 services:
   caddy-gen:
     image: 'wemakeservices/caddy-gen:latest'
@@ -254,7 +263,7 @@ services:
     image: postgres:13
     restart: always
     volumes:
-      - {$PWD}/.typebot/database:/var/lib/postgresql/data
+      - db-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=typebot
       - POSTGRES_PASSWORD=typebot
@@ -298,7 +307,7 @@ services:
       MINIO_ROOT_USER: minio
       MINIO_ROOT_PASSWORD: minio123
     volumes:
-      - {$PWD}/.typebot/s3:/data
+      - s3_data:/data
   # This service just make sure a bucket with the right policies is created
   createbuckets:
     image: minio/mc
diff --git a/docker-compose.yml b/docker-compose.yml
index b0fb16fb8..fbaede977 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,18 @@
 version: '3.3'
+
+volumes:
+  db-data:
+
 services:
   typebot-db:
-    image: postgres:13
+    image: postgres:14-alpine
     restart: always
     volumes:
-      - ${PWD}/.typebot/database:/var/lib/postgresql/data
+      - db-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=typebot
       - POSTGRES_PASSWORD=typebot
+
   typebot-builder:
     image: baptistearno/typebot-builder:latest
     restart: always
@@ -18,6 +23,7 @@ services:
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     env_file: .env
+
   typebot-viewer:
     image: baptistearno/typebot-viewer:latest
     restart: always