diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 149d76fed..529297778 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -11,31 +11,9 @@ if AppConfig.environment.single_process_mode? && Rails.env != "test"
   require 'sidekiq/testing/inline'
 end
 
-def (Sidekiq::Logging).logger
-  defined?(@logger) ? @logger : (AppConfig.heroku? ? initialize_logger : initialize_logger(AppConfig.sidekiq_log))
-end
-
 Sidekiq.configure_server do |config|
   config.redis = AppConfig.get_redis_options
 
-  config.options = config.options.merge({
-    concurrency: AppConfig.environment.sidekiq.concurrency.to_i,
-    queues: %w{
-      socket_webfinger
-      photos
-      http_service
-      dispatch
-      mail
-      delete_account
-      receive_local
-      receive
-      receive_salmon
-      http
-      maintenance
-      default
-    }
-  })
-
   config.server_middleware do |chain|
     chain.add SidekiqMiddlewares::CleanAndShortBacktraces
   end
@@ -46,7 +24,7 @@ Sidekiq.configure_server do |config|
     ENV['DATABASE_URL'] = "#{database_url}?pool=#{AppConfig.environment.sidekiq.concurrency.get}"
     ActiveRecord::Base.establish_connection
   end
-  
+
   # Make sure each Sidekiq process has its own sequence of UUIDs
   UUID.generator.next_sequence
 end
diff --git a/config/load_config.rb b/config/load_config.rb
index faef94b60..fd4742259 100644
--- a/config/load_config.rb
+++ b/config/load_config.rb
@@ -1,13 +1,18 @@
+require 'pathname'
+require 'bundler/setup'
 require 'configurate'
 
-rails_root = File.expand_path('../../', __FILE__)
-rails_env = ENV['RACK_ENV']
-rails_env ||= ENV['RAILS_ENV']
-rails_env ||= 'development'
+rails_env = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
 
-require File.join(rails_root, 'lib', 'configuration_methods')
+module Rails
+  def self.root
+    @__root ||= Pathname.new File.expand_path('../../', __FILE__)
+  end
+end
 
-config_dir = File.join rails_root, 'config'
+require Rails.root.join 'lib', 'configuration_methods'
+
+config_dir = Rails.root.join('config').to_s
 
 
 AppConfig ||= Configurate::Settings.create do
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
new file mode 100644
index 000000000..8ba3d571e
--- /dev/null
+++ b/config/sidekiq.yml
@@ -0,0 +1,18 @@
+<% require_relative 'config/load_config' %>
+---
+:verbose: false
+:logfile: "<%= AppConfig.sidekiq_log unless AppConfig.heroku? %>"
+:concurrency: <%= AppConfig.environment.sidekiq.concurrency.to_i %>
+:queues:
+  - socket_webfinger
+  - photos
+  - http_service
+  - dispatch
+  - mail
+  - delete_account
+  - receive_local
+  - receive
+  - receive_salmon
+  - http
+  - maintenance
+  - default