diff --git a/lib/puppet-standalone-mashup/capistrano.rb b/lib/puppet-standalone-mashup/capistrano.rb
index 37a9fba..1781443 100644
--- a/lib/puppet-standalone-mashup/capistrano.rb
+++ b/lib/puppet-standalone-mashup/capistrano.rb
@@ -77,6 +77,11 @@ Capistrano::Configuration.instance.load do
     top.rename if rename_server
 
     run "cd #{puppet_dir} && #{sudo} ./bootstrap"
+    top.reboot
+  end
+
+  desc "Reboot the server after bootstrapping"
+  task :reboot do
     run "#{sudo} shutdown -r now"
   end