diff --git a/Dockerfile b/Dockerfile
index 33e1fd2..b17ee63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -125,6 +125,6 @@ RUN rm -rf /tmp/*
 COPY *.sh /opt/
 RUN chmod +x /opt/*.sh
 
-ENTRYPOINT /opt/startup.sh
+ENTRYPOINT ["/opt/startup.sh"]
 
 WORKDIR /opt
diff --git a/startup.sh b/startup.sh
index be5f51e..7877831 100755
--- a/startup.sh
+++ b/startup.sh
@@ -79,4 +79,4 @@ if [ "${CORS_ENABLED}" = "true" ]; then
 fi
 
 # start the tomcat
-$CATALINA_HOME/bin/catalina.sh run
+exec $CATALINA_HOME/bin/catalina.sh run