diff --git a/source/docker-compose.sample.yml b/source/docker-compose.sample.yml
index b856c3f..e1b65b1 100644
--- a/source/docker-compose.sample.yml
+++ b/source/docker-compose.sample.yml
@@ -8,7 +8,7 @@ services:
     volumes:
       - "./data/postgres:/var/lib/postgresql/data"
   plume:
-    image: plumeorg/plume:v0.3.0
+    image: plumeorg/plume:latest
     env_file: .env
     restart: unless-stopped
     volumes:
diff --git a/source/docker.sample.env b/source/docker.sample.env
index b6ae715..851c691 100644
--- a/source/docker.sample.env
+++ b/source/docker.sample.env
@@ -8,8 +8,13 @@ MAIL_USER=example
 MAIL_PASSWORD=123456
 MAIL_HELO_NAME=example.org
 
+# DATABASE SETUP
+POSTGRES_PASSWORD=passw0rd
+POSTGRES_USER=plume
+POSTGRES_DB=plume
+
 # you can safely leave those defaults
-DATABASE_URL=postgres://plume:plume@postgres:5432/plume
+DATABASE_URL=postgres://plume:passw0rd@postgres:5432/plume
 MIGRATION_DIRECTORY=migrations/postgres
 USE_HTTPS=1
 ROCKET_ADDRESS=0.0.0.0
diff --git a/source/installation/with/docker.html.md b/source/installation/with/docker.html.md
index f973675..45d00a5 100644
--- a/source/installation/with/docker.html.md
+++ b/source/installation/with/docker.html.md
@@ -37,15 +37,13 @@ docker-compose pull
 
 # Launch the database container
 docker-compose up -d postgres
-# Create the database role (it will ask you for the password)
-docker-compose run --rm postgres su postgres -c 'createuser plume -dP'
-# Setup the database (create it and run migrations)
-docker-compose run --rm postgres su postgres -c 'createdb plume -O plume'
+# Wait for postgres init (user docker-compose logs to get postgres output)
+# Database setup, first migration run
 docker-compose run --rm plume plm migration run
 
 # Setup your instance
-docker-compose run --rm plume plm instance new
-docker-compose run --rm plume plm users new --admin
+docker-compose run --rm plume plm instance new -d 'domain.name' -n 'instance name' -l 'default licence'
+docker-compose run --rm plume plm users new -n 'admin' -N 'name' -b 'bio' -e 'admin@domain.name' -p 'pass' --admin
 docker-compose run --rm plume plm search init
 
 # Launch your instance for good