diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 546dd67924d1c07c4614ff7bf79867513ce7b53c..6cda4dfbeea89960997168772518512908b2efd5 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -143,6 +143,7 @@ TEMPLATE_FILE_PSIPROBE=probe-$TEMPLATE_VERSION_PSIPROBE.zip
 TEMPLATE_DIR_ISOCHRONE=/vagrant
 TOMCAT_VERSION=7.0.54
 TOMCAT_FILE=apache-tomcat-$TOMCAT_VERSION.tar.gz
+TOMCAT_MEMORY_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=512m"
 TOMCAT_NAME=tomcat
 TOMCAT_USER=tomcat
 TOPOLOGY_TOLERANCE=0.0005
@@ -498,7 +499,7 @@ if $INSTALL_GEOSERVER; then
 #	mkdir -p $DEPLOY_DIR/geoserver >> install_geoserver.log 2>&1
 #	mv $TOMCAT_WEBAPP_DIR/geoserver/data $DEPLOY_DIR/geoserver >> install_geoserver.log 2>&1
 	mkdir -p $DEPLOY_DIR/geoserver/data >> install_geoserver.log 2>&1
-	echo "export CATALINA_OPTS=\"-Djava.awt.headless=true -Xmx512m -Xms128m -XX:MaxPermSize=128m -DGEOSERVER_DATA_DIR=$DEPLOY_DIR/geoserver/data\"" > /etc/profile.d/catalina.sh
+	echo "export CATALINA_OPTS=\"-Djava.awt.headless=true $TOMCAT_MEMORY_OPTS -DGEOSERVER_DATA_DIR=$DEPLOY_DIR/geoserver/data\"" > /etc/profile.d/catalina.sh
 	source /etc/profile.d/catalina.sh
 
 	echo "Installing geoserver-shell $GEOSERVER_SHELL_VERSION"