diff --git a/Vagrantfile b/Vagrantfile
index 5761dc35fd3e9d5e1ef6779913f9b4492199c87a..3b04ea697fc1a49957b89082c8143d052c13f441 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -27,10 +27,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 #  config.vm.box_url = "http://www.krismer.de/files/VM/centos64-x86_64.box"
 #  config.vm.box = "centos65-x86_64"
 #  config.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.1/centos65-x86_64-20131205.box"
-#  config.vm.box = "vagrant-centos-65-i386-minimal"
-#  config.vm.box_url = "http://files.brianbirkinbine.com/vagrant-centos-65-i386-minimal.box"
-  config.vm.box = "vagrant-centos-65-x86_64-minimal"
-  config.vm.box_url = "http://files.brianbirkinbine.com/vagrant-centos-65-x86_64-minimal.box"
+  if isLocalMode
+    config.vm.box = "vagrant-centos-65-x86_64-minimal"
+    config.vm.box_url = "http://files.brianbirkinbine.com/vagrant-centos-65-x86_64-minimal.box"
+  else
+    config.vm.box = "vagrant-centos-65-i386-minimal"
+    config.vm.box_url = "http://files.brianbirkinbine.com/vagrant-centos-65-i386-minimal.box"
+  end
 
   # Setup of shared folders
   config.vm.synced_folder "etc/vagrant/conf", "/setup/conf"