diff --git a/Vagrantfile b/Vagrantfile
index 3451c5232ab43551af9d38516f31d915cca5864c..2cf271f64c001733f80c965ccacdca0ca120e7f5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -42,8 +42,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell", path: "etc/vagrant/bootstrap.sh", args: ["niko", "secretPhdPassword#2014!", (isLocalMode ? "true" : "false")]
 
   # Network configuration
-  config.vm.network :forwarded_port, guest: 8080, host: 8080, auto_correct: true, id: "tomcat"
-  config.vm.network :forwarded_port, guest: 7474, host: 7474, auto_correct: true, id: "neo4j"
   config.vm.network :forwarded_port, guest: 5432, host: 5432, auto_correct: true, id: "postgresql"
+  config.vm.network :forwarded_port, guest: 7474, host: 7474, auto_correct: true, id: "neo4j"
   config.vm.network :forwarded_port, guest: 80,   host: 8000, auto_correct: true, id: "httpd"
+  unless isLocalMode
+  	config.vm.network :forwarded_port, guest: 8080, host: 8080, auto_correct: true, id: "tomcat"
+  end
 end
diff --git a/etc/vagrant/Vagrantfile b/etc/vagrant/Vagrantfile
index aee8b0d506890625b703be48dbe47d305e40ed37..819d8ee291a6f8243be857f05ef4d1a611a29ec0 100644
--- a/etc/vagrant/Vagrantfile
+++ b/etc/vagrant/Vagrantfile
@@ -30,10 +30,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell", path: "bootstrap.sh"
 
   # Network configuration
-  config.vm.network :forwarded_port, guest: 8080, host: 8080, auto_correct: true, id: "tomcat"
-  config.vm.network :forwarded_port, guest: 7474, host: 7474, auto_correct: true, id: "neo4j"
   config.vm.network :forwarded_port, guest: 5432, host: 5432, auto_correct: true, id: "postgresql"
+  config.vm.network :forwarded_port, guest: 7474, host: 7474, auto_correct: true, id: "neo4j"
   config.vm.network :forwarded_port, guest: 80,   host: 8000, auto_correct: true, id: "httpd"
+  config.vm.network :forwarded_port, guest: 8080, host: 8080, auto_correct: true, id: "tomcat"
 #  config.vm.network :private_network, :ip => '192.168.4.50'
 #  config.vm.network :public_network
 end