diff --git a/templates/sidekiq/sidekiq.rb.erb b/templates/sidekiq/sidekiq.rb.erb
index c7f1f21..93a32bb 100644
--- a/templates/sidekiq/sidekiq.rb.erb
+++ b/templates/sidekiq/sidekiq.rb.erb
@@ -1,9 +1,11 @@
 require 'sidekiq'
 require 'sidekiq/web'
 
+Rails.application.config.active_job.queue_adapter = :sidekiq
+
 namespace = "<%= app_name.parameterize %>_#{Rails.env}"
 settings = {
-  url: ENV['REDIS_URL'] || 'redis://localhost:6379/0',
+  url: ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0',
   namespace: namespace
 }
 
@@ -11,8 +13,6 @@ Sidekiq.configure_server { |config| config.redis = settings }
 Sidekiq.configure_client { |config| config.redis = settings }
 Sidekiq.options[:labels] << namespace
 
-Rails.application.config.active_job.queue_adapter = :sidekiq
-
 # Open this if you have scheduled jobs
 # schedule_file = 'config/sidekiq_schedule.yml'
 # if File.exists?(schedule_file) && Sidekiq.server?
diff --git a/templates/sidekiq/sidekiq.yml.erb b/templates/sidekiq/sidekiq.yml.erb
index fac36ab..83f4367 100644
--- a/templates/sidekiq/sidekiq.yml.erb
+++ b/templates/sidekiq/sidekiq.yml.erb
@@ -1,18 +1,17 @@
-:concurrency: 25
-:pidfile: ./tmp/pids/sidekiq.pid
-:logfile: ./log/sidekiq.log
 :queues:
   - default
   - mailers
   - low_priority
   - [high_priority, 2]
 staging:
-  :concurrency: 10
+  :concurrency: 3
   :logfile: ./log/staging.log
 production:
+  :concurrency: 25
   :logfile: ./log/production.log
 development:
   :concurrency: 10
+  :pidfile: ./tmp/pids/sidekiq.pid
   :logfile: ./log/development.log
 test:
   :pidfile: ./tmp/pids/sidekiq_test.pid