diff --git a/scripts/gce-create-bot.sh b/scripts/gce-create-bot.sh
index 85dce41..383dc5a 100755
--- a/scripts/gce-create-bot.sh
+++ b/scripts/gce-create-bot.sh
@@ -37,7 +37,7 @@
     --network "default" \
     --metadata-from-file "startup-script=gce-startup-script.sh" \
     --maintenance-policy "MIGRATE" \
-    --scopes default="https://www.googleapis.com/auth/logging.write","https://www.googleapis.com/auth/monitoring.write","https://www.googleapis.com/auth/servicecontrol","https://www.googleapis.com/auth/service.management.readonly","https://www.googleapis.com/auth/devstorage.read_only","https://www.googleapis.com/auth/userinfo.email" \
+    --scopes default="https://www.googleapis.com/auth/logging.write","https://www.googleapis.com/auth/monitoring.write","https://www.googleapis.com/auth/pubsub","https://www.googleapis.com/auth/servicecontrol","https://www.googleapis.com/auth/service.management.readonly","https://www.googleapis.com/auth/devstorage.read_only","https://www.googleapis.com/auth/userinfo.email" \
     --tags "use-swarming-auth" \
     --image "/ubuntu-os-cloud/ubuntu-1404-trusty-v20160809a" \
     --boot-disk-size "${disk_size}" \
diff --git a/scripts/gce-startup-script.sh b/scripts/gce-startup-script.sh
index f82586e..fcad27c 100644
--- a/scripts/gce-startup-script.sh
+++ b/scripts/gce-startup-script.sh
@@ -22,7 +22,7 @@
 python - <<END
 import requests
 r = requests.get('http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/token', headers={'Metadata-Flavor': 'Google'})
-r = requests.get('https://chromium-swarm-dev.appspot.com/bot_code', headers={'Authorization': 'Bearer %(access_token)s' % r.json()}, stream=True)
+r = requests.get('https://chromium-swarm.appspot.com/bot_code', headers={'Authorization': 'Bearer %(access_token)s' % r.json()}, stream=True)
 with open('/b/swarm_slave/swarming_bot.zip', 'wb') as fd:
   for chunk in r.iter_content(chunk_size=4096):
     fd.write(chunk)
@@ -40,9 +40,9 @@
 
 setuid swarming
 
-exec /usr/bin/env python /b/swarm_slave/swarming_bot.zip start_bot
+exec /usr/bin/env SWARMING_EXTERNAL_BOT_SETUP=1 python /b/swarm_slave/swarming_bot.zip start_bot
 EOF
 
-service swarming restart &
+service swarming start &
 
 # [END startup]