diff --git a/Dockerfile b/Dockerfile
index dcfc53c3b0f2cff6f499cc907f64fe2266b94e37..6a35d4d29e1c82e995d00f360ca5d90cad103620 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,11 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical
 ENV DEBCONF_NOWARNINGS yes
 
+# Upgrade packages
+RUN \
+  apt-get -y update && \
+  apt-get -y upgrade
+
 # Set Timezone
 RUN \
   echo "Europe/Stockholm" > /etc/timezone && \
@@ -47,9 +52,8 @@ ENV CROWD_HOME /home/crowd
 # Add startup script
 ADD init.sh /init.sh
 
+# Expose ports
+EXPOSE 25 3306 8095 8096
+
 # Start Crowd
-EXPOSE 25
-EXPOSE 3306
-EXPOSE 8095
-EXPOSE 8096
 CMD ["sh", "/init.sh"]
diff --git a/init.sh b/init.sh
index 231c45d9744f45810bdc6c0afcba104caab415b9..23586c87afd472f92f19022bfb1b58f7f2b25077 100644
--- a/init.sh
+++ b/init.sh
@@ -47,4 +47,4 @@ echo "$SEPARATOR"
 
 exim4 -v -bdf -q15m &
 
-exec $CROWD_DIR/bin/start_crowd.sh -fg
+exec $CROWD_DIR/apache-tomcat/bin/catalina.sh run