diff --git a/config/initializers/delayed_jobs.rb b/config/initializers/delayed_jobs.rb
index cdab68afe..59a6f9c1a 100644
--- a/config/initializers/delayed_jobs.rb
+++ b/config/initializers/delayed_jobs.rb
@@ -3,7 +3,7 @@ require 'delayed/plugin'
 class DelayedJobTimeoutPlugin < ::Delayed::Plugin
   callbacks do |lifecycle|
     lifecycle.before(:execute) do |job|
-      job.class.connection.execute "set statement_timeout = 0"
+      Delayed::Job.connection.execute "set statement_timeout = 0"
     end
   end
 end
diff --git a/db/structure.sql b/db/structure.sql
index 6536a87a9..d2010f071 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -5029,6 +5029,8 @@ CREATE INDEX index_comments_on_post_id ON comments USING btree (post_id);
 --
 
 CREATE INDEX index_delayed_jobs_on_run_at ON delayed_jobs USING btree (run_at);
+CREATE INDEX index_delayed_jobs_on_locked_by ON delayed_jobs USING btree (locked_by);
+CREATE INDEX index_delayed_jobs_on_locked_at ON delayed_jobs USING btree (locked_at);
 
 
 --
diff --git a/lib/capistrano/tasks/delayed_job.rake b/lib/capistrano/tasks/delayed_job.rake
index e9af40544..091510410 100644
--- a/lib/capistrano/tasks/delayed_job.rake
+++ b/lib/capistrano/tasks/delayed_job.rake
@@ -6,7 +6,7 @@ namespace :delayed_job do
         within current_path do
           with rails_env: fetch(:rails_env) do
             hostname = capture("hostname").strip
-            execute :bundle, "exec", "script/delayed_job", "--queues=default,#{hostname}", "-n 4", "start"
+            execute :bundle, "exec", "script/delayed_job", "--queues=default,#{hostname}", "-n 2", "start"
           end
         end
       end