diff --git a/Caddyfile b/Caddyfile
index f694d3fc41..419b192ad4 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -1,4 +1,4 @@
 {$SITE_URL} {  
   bind {$ADDRESS}
-  reverse_proxy /* server:8000
+  reverse_proxy /* windmill:8000
 }
diff --git a/README.md b/README.md
index 5ec6515d92..e4ed50d141 100644
--- a/README.md
+++ b/README.md
@@ -102,12 +102,17 @@ Windmill is <b>fully open-sourced</b>:
 
 ## How to self-host
 
-`docker-compose up` with the following docker-compose is sufficient:
+`docker volume create caddy_data && docker-compose up` with the following
+docker-compose is sufficient:
 <https://github.com/windmill-labs/windmill-server/blob/main/docker-compose.yml>
 
-The default super-admin user is: admin@windmill.dev
+The default super-admin user is: admin@windmill.dev / changeme
 
-From there, you can create other users.
+From there, you can create other users (do not forget to change the password!)
+
+Detailed instructions for more complex deployments will come soon. For simpler
+docker based ones, the docker-compose.yml file contains all the necessary
+informations.
 
 ## Copyright
 
diff --git a/docker-compose.yml b/docker-compose.yml
index b775cb5314..fd0ac36f45 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     restart: always
     volumes:
       - db_data:/var/lib/postgresql/data
+      - ./init-db.sql:/docker-entrypoint-initdb.d/create_tables.sql
     ports:
       - 5432:5432
     environment:
diff --git a/init-db.sql b/init-db.sql
new file mode 100644
index 0000000000..ba6b881018
--- /dev/null
+++ b/init-db.sql
@@ -0,0 +1,23 @@
+DO
+$do$
+BEGIN
+    IF NOT EXISTS (
+        SELECT
+        FROM   pg_catalog.pg_roles
+        WHERE  rolname = 'app') THEN
+        CREATE ROLE app LOGIN PASSWORD 'changeme';
+    END IF;
+END
+$do$;
+
+DO
+$do$
+BEGIN
+    IF NOT EXISTS (
+        SELECT
+        FROM   pg_catalog.pg_roles
+        WHERE  rolname = 'admin') THEN
+        CREATE ROLE admin LOGIN PASSWORD 'changeme';
+    END IF;
+END
+$do$;