diff --git a/bin/autostart.sh b/bin/autostart.sh
index e01ae9204..52f0d2647 100755
--- a/bin/autostart.sh
+++ b/bin/autostart.sh
@@ -2,7 +2,7 @@
 
 for f in `ls /srv`
 do
-  sudo -u rosa bundle exec APP_NAME=$f bluepill --no-privileged load /srv/$f/current/config/production.pill
+  sudo -u rosa APP_NAME=$f bundle exec bluepill --no-privileged load /srv/$f/current/config/production.pill
 done
 
 /srv/rosa_build/current/bin/mount_downloads.sh
diff --git a/lib/recipes/bluepill.rb b/lib/recipes/bluepill.rb
index 9d29618c9..8d01d8bf8 100644
--- a/lib/recipes/bluepill.rb
+++ b/lib/recipes/bluepill.rb
@@ -1,6 +1,6 @@
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :bluepill do
-    set :bluepill_binary, "bundle exec APP_NAME=#{fetch :application} bluepill --no-privileged"
+    set :bluepill_binary, "APP_NAME=#{fetch :application} bundle exec bluepill --no-privileged"
 
     desc "Stop processes that bluepill is monitoring and quit bluepill"
     task :quit, :roles => [:app], :on_error => :continue do