diff --git a/config/database.yml b/config/database.yml
index 9ef24edfd3..84d4ad2861 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,19 +1,23 @@
-default: &default
+defaults: &defaults
   adapter: postgresql
-  encoding: utf8
+  encoding: unicode
   pool: 5
-  timeout: 5000
-  host: db
-  port: 5432
+  host: localhost
+  username: <%= ENV.fetch('DB_USERNAME', 'ofn') %>
+  password: <%= ENV.fetch('DB_PASSWORD', 'f00d') %>
 
 development:
-  <<: *default
+  <<: *defaults
   database: open_food_network_dev
-  username: ofn
-  password: f00d
 
 test:
-  <<: *default
+  <<: *defaults
   database: open_food_network_test
-  username: ofn
-  password: f00d
+
+production:
+  <<: *defaults
+  database: open_food_network_prod
+
+staging:
+  <<: *defaults
+  database: open_food_network_prod