diff --git a/run.sh b/run.sh
index f6568e248f8d36676f5700f561e111cf1f8aa20a..b699d78d7cac83f1415fa64900b9b40f63fe9546 100644
--- a/run.sh
+++ b/run.sh
@@ -1,14 +1,11 @@
 #!/usr/bin/env bash
 
-shutdown -h +30 "Timeout on VM creation"
-
-export PATH=$PATH:/vagrant
-chmod ugo+x /vagrant/*.sh
+shutdown -h +60 "Timeout on VM creation"
 
 if [ -e "/vagrant/build.sh" ]; then
     bash /vagrant/build.sh
 fi
 
-if [ -e "/vagrant/build.sh" ]; then
+if [ -e "/vagrant/build_as_vagrant.sh" ]; then
     sudo -H -u vagrant bash /vagrant/build_as_vagrant.sh
 fi