diff --git a/bin/rake b/bin/rake
index 8017a027..486010f4 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,8 +1,17 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")
diff --git a/bin/spring b/bin/spring
index 253ec37c..43731fe8 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,18 +1,17 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'spring' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-# This file loads spring without using Bundler, in order to be fast
-# It gets overwritten when you run the `spring binstub` command
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-unless defined?(Spring)
-  require "rubygems"
-  require "bundler"
+require "rubygems"
+require "bundler/setup"
 
-  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
-    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV["GEM_HOME"] = ""
-    Gem.paths = ENV
-
-    gem "spring", match[1]
-    require "spring/binstub"
-  end
-end
+load Gem.bin_path("spring", "spring")
diff --git a/lib/capistrano/tasks/restart.rake b/lib/capistrano/tasks/restart.rake
index 3fe1d710..223fd9b4 100644
--- a/lib/capistrano/tasks/restart.rake
+++ b/lib/capistrano/tasks/restart.rake
@@ -13,7 +13,7 @@ namespace :deploy do
 
   task :stop do
     on roles(:all) do
-      execute :sh, '-c', '\'tmux list-panes -t justask -F "#{pane_pid}" | xargs kill\''
+      execute :sh, '-c', '\'tmux list-panes -t retrospring -F "#{pane_pid}" | xargs kill\''
     end
   end