diff --git a/config/database.yml b/config/database.yml
index 76e702432abc3039790430c9b57c4f56366e15df..8606f19c485bb1d6da95ba31f19a9b905ac4cac2 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -6,7 +6,7 @@
 #
 default: &default
     adapter: postgresql
-    host: localhost
+    host: <%= ENV.fetch('NEP_DB_HOSTNAME', 'localhost') %>
     port: 5432
     encoding: utf8
     pool: 5
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index b6ecfbefebf0ec67ebd262f0a4e91a5f79dabdcc..5b0a95c2a3e43ddc27eb164e4f172b29ea2c4881 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,5 +1,5 @@
 Sidekiq.configure_server do |config|
     config.redis = {
-      url: ENV.fetch("SIDEKIQ_REDIS_URL", "redis://redis:6379/1")
+      url: ENV.fetch("REDIS_URL", "redis://localhost:6379/1")
     }
   end
\ No newline at end of file