diff --git a/.env.sample b/.env.sample
index 73642ea..c5f6758 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1 +1,3 @@
-RAILS_PORT=7500
\ No newline at end of file
+RAILS_PORT=7500
+DATABASE_HOST=localhost
+DATABASE_NAME=easy-going-rails
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
index 093217d..9e34cc7 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,8 +1,8 @@
 ---
 
 default: &default
-  host: <%= ENV.fetch("DB_HOST") { 'localhost' } %>
-  database: &db_name easy-going-rails
+  host: <%= ENV.fetch("DATABASE_HOST") { 'localhost' } %>
+  database: &db_name <%= ENV.fetch("DATABASE_NAME") { 'easy-going-rails' } %>
   user: *db_name
   password: *db_name
   adapter: postgresql