diff --git a/Capfile b/Capfile
index 7511fdb29..0c2b1b008 100644
--- a/Capfile
+++ b/Capfile
@@ -13,6 +13,6 @@ require 'capistrano/deploytags'
 require 'new_relic/recipes'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
-Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
 
 after "deploy:updated", "newrelic:notice_deployment"
diff --git a/Gemfile b/Gemfile
index f6e0911d9..e446eee2b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,12 +68,12 @@ end
 
 group :production do
   gem 'unicorn-worker-killer'
+  gem 'newrelic_rpm'
   gem 'gctools', :platforms => :ruby
+  gem 'capistrano-deploytags', '~> 1.0.0', require: false
 end
 
 group :development do
   gem 'ruby-prof'
-  gem 'newrelic_rpm', require: false
-  gem 'capistrano-deploytags', '~> 1.0.0', require: false
   # gem 'sql-logging'
 end
diff --git a/lib/capistrano/tasks/delayed_job.cap b/lib/capistrano/tasks/delayed_job.rake
similarity index 100%
rename from lib/capistrano/tasks/delayed_job.cap
rename to lib/capistrano/tasks/delayed_job.rake
diff --git a/lib/capistrano/tasks/nginx.cap b/lib/capistrano/tasks/nginx.rake
similarity index 100%
rename from lib/capistrano/tasks/nginx.cap
rename to lib/capistrano/tasks/nginx.rake
diff --git a/lib/capistrano/tasks/symlink.cap b/lib/capistrano/tasks/symlink.rake
similarity index 100%
rename from lib/capistrano/tasks/symlink.cap
rename to lib/capistrano/tasks/symlink.rake
diff --git a/lib/capistrano/tasks/unicorn.cap b/lib/capistrano/tasks/unicorn.rake
similarity index 93%
rename from lib/capistrano/tasks/unicorn.cap
rename to lib/capistrano/tasks/unicorn.rake
index 16efa4576..1c7e41f1b 100644
--- a/lib/capistrano/tasks/unicorn.cap
+++ b/lib/capistrano/tasks/unicorn.rake
@@ -3,6 +3,7 @@ namespace :unicorn do
   task :terminate do
     on roles(:app) do
       execute "[[ -n $(pgrep -f unicorn) ]] && pgrep -f unicorn | xargs kill -SIGTERM"
+      sleep(5)
     end
   end
 
@@ -14,7 +15,6 @@ namespace :unicorn do
   end
 end
 
-after "deploy:published", "unicorn:stop"
 after "deploy:published", "unicorn:terminate"
 after "deploy:published", "unicorn:kill"
 after "deploy:published", "unicorn:start"
diff --git a/lib/capistrano/tasks/web.cap b/lib/capistrano/tasks/web.rake
similarity index 100%
rename from lib/capistrano/tasks/web.cap
rename to lib/capistrano/tasks/web.rake