diff --git a/docker/database.yml b/docker/database.yml
index b5a319899..fac41783d 100644
--- a/docker/database.yml
+++ b/docker/database.yml
@@ -5,7 +5,7 @@ default: &default
   adapter: postgresql
   encoding: unicode
   pool: 25
-  username: postgres
+  username: <%= ENV["POSTGRES_USERNAME"] %>
   password: <%= ENV["POSTGRES_PASSWORD"] %>
   host: <%= ENV["POSTGRES_HOST"] %>
 
diff --git a/setup/env.example b/setup/env.example
index bf6195e53..5c16d57e1 100644
--- a/setup/env.example
+++ b/setup/env.example
@@ -1,4 +1,5 @@
 POSTGRES_HOST=postgres
+POSTGRES_USERNAME=postgres
 REDIS_HOST=redis
 ELASTICSEARCH_HOST=elasticsearch