diff --git a/Capfile b/Capfile
index 3e0bb4329..372653a5e 100644
--- a/Capfile
+++ b/Capfile
@@ -10,6 +10,7 @@ require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 #require 'capistrano/passenger'
 require 'capistrano/delayed-job'
+require 'whenever/capistrano'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/config/deploy.rb b/config/deploy.rb
index de48908d2..26711fbff 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,8 +1,3 @@
-set :whenever_command, "bundle exec whenever"
-set :whenever_environment, -> { stage }
-set :whenever_roles, [ :cron ]
-require 'whenever/capistrano'
-
 # config valid only for current version of Capistrano
 lock '3.4.0'
 
@@ -11,7 +6,6 @@ def deploysecret(key)
   @deploy_secrets_yml.fetch(key.to_s, 'undefined')
 end
 
-
 set :rails_env, fetch(:stage)
 set :rvm_ruby_version, '2.2.3'
 set :rvm_type, :user
@@ -52,6 +46,10 @@ set(:config_files, %w(
   sidekiq.yml
 ))
 
+set :whenever_command, "bundle exec whenever"
+set :whenever_environment, -> { fetch(:stage) }
+set :whenever_roles, [ :cron ]
+
 namespace :deploy do
   # Check right version of deploy branch
   # before :deploy, "deploy:check_revision"