diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index b581a9e4bd6e8b16d4a374a39e7ae602ad45a6ae..816cb0c02a91e99756fc1c4d87015fa6dd312589 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -234,7 +234,7 @@ Settings.gravatar['host']         = Settings.get_host_without_www(Settings.grava
 Settings['cron_jobs'] ||= Settingslogic.new({})
 Settings.cron_jobs['stuck_ci_builds_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 0 * * *'
-Settings.cron_jobs['stuck_ci_builds_worker']['class'] = 'StuckCiBuildsWorker'
+Settings.cron_jobs['stuck_ci_builds_worker']['job_class'] = 'StuckCiBuildsWorker'
 
 
 #
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index b42b718a7db817702b17181d107afc25280ebe8e..dcf6ce74d96bbd1dc546a6d0934e5a611d7b8cd7 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -19,7 +19,11 @@ Sidekiq.configure_server do |config|
   end
 
   # Sidekiq-cron: load recurring jobs from gitlab.yml
-  Sidekiq::Cron::Job.load_from_hash! Gitlab.config.cron_jobs
+  # UGLY Hack to get nested hash from settingslogic
+  cron_jobs = JSON.parse(Gitlab.config.cron_jobs.to_json)
+  # UGLY hack: Settingslogic doesn't allow 'class' key
+  cron_jobs.each { |k,v| cron_jobs[k]['class'] = cron_jobs[k].delete('job_class') }
+  Sidekiq::Cron::Job.load_from_hash! cron_jobs
 
   # Database pool should be at least `sidekiq_concurrency` + 2
   # For more info, see: https://github.com/mperham/sidekiq/blob/master/4.0-Upgrade.md