diff --git a/config/database.yml b/config/database.yml
index e0df97ad2c9..a776747916a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,7 +1,11 @@
 default: &default
-  adapter: postgresql
-  pool: 17
-  timeout: 5000
+  adapter:  postgresql
+  username: <%= ENV['DB_USER'] || 'mastodon' %>
+  password: <%= ENV['DB_PASS'] || '' %>
+  host:     <%= ENV['DB_HOST'] || 'localhost' %>
+  port:     <%= ENV['DB_PORT'] || 5432 %>
+  pool:     17
+  timeout:  5000
   encoding: unicode
 
 development:
@@ -18,7 +22,3 @@ test:
 production:
   <<: *default
   database: <%= ENV['DB_NAME'] || 'mastodon_production' %>
-  username: <%= ENV['DB_USER'] || 'mastodon' %>
-  password: <%= ENV['DB_PASS'] || '' %>
-  host: <%= ENV['DB_HOST'] || 'localhost' %>
-  port: <%= ENV['DB_PORT'] || 5432 %>