diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index 951a9f260694ab08887a9e75e3352f5e5ce1ea34..7f984c4dbbaabc205d6e30a1fcfe9d1558300e64 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -135,7 +135,7 @@ TEMPLATE_PSIPROBE_VERSION="2.3.3"
 TEMPLATE_PSIPROBE_FILE="probe-$TEMPLATE_PSIPROBE_VERSION.zip"
 TEMPLATE_PSIPROBE_DOWNLOAD_URL="https://psi-probe.googlecode.com/files/$TEMPLATE_PSIPROBE_FILE"
 TEMPLATE_DIR_ISOCHRONE="/vagrant"
-TOMCAT_VERSION="8.0.20"
+TOMCAT_VERSION="8.0.23"
 TOMCAT_FILE="apache-tomcat-$TOMCAT_VERSION.tar.gz"
 TOMCAT_DOWNLOAD_URL="http://tweedo.com/mirror/apache/tomcat/tomcat-8/v$TOMCAT_VERSION/bin/$TOMCAT_FILE"
 TOMCAT_MEMORY_OPTS="-Xmx2048m -Xms512m"
diff --git a/conf/tomcat_startscript.sh b/conf/tomcat_startscript.sh
index ea2f0d7ebf60da76de479af32a9d440a4314e7d3..4857519649d2ea0ad4d78a98b9a272ee6b5543d3 100644
--- a/conf/tomcat_startscript.sh
+++ b/conf/tomcat_startscript.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Tomcat7: Start/Stop Tomcat 7
+# Tomcat: Start/Stop Tomcat
 #
 # chkconfig: - 90 10
 # description: Tomcat is a Java application Server.
@@ -16,7 +16,7 @@ LOCKFILE=/var/lock/subsys/tomcat
 
 RETVAL=0
 start(){
-   echo "Starting Tomcat7: "
+   echo "Starting Tomcat: "
    su - $TOMCAT_USER -c "$CATALINA_HOME/bin/startup.sh"
    RETVAL=$?
    echo
@@ -25,7 +25,7 @@ start(){
 }
 
 stop(){
-   echo "Shutting down Tomcat7: "
+   echo "Shutting down Tomcat: "
    $CATALINA_HOME/bin/shutdown.sh
    RETVAL=$?
    echo