diff --git a/Vagrantfile b/Vagrantfile
index df172d34b243e56fb7a5adfeac06729a7e88fb16..67f789a282cd6ecb6857b5622d8be045da669839 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -15,11 +15,16 @@ else
 end
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.boot_timeout = 600
+
   # Hardware configuration
   config.vm.provider "virtualbox" do |v|
     v.name = (isLocalMode ? "isochrone-local" : "isochrone")
-    v.cpus = 2
+#    v.cpus = 2
     v.memory = 3072
+    if ! isLocalMode
+      v.customize ["modifyvm", :id, "--longmode", "off"]
+    end
   end
 
   # Enable vagrant-cachier plugin