diff --git a/Dockerfile.dspace b/Dockerfile.dspace
index b32987ff4b4383ddfa13f760a4979acaadef9e42..1f2b8cc2dad0a4f2794788d6a2d71ee576801faa 100644
--- a/Dockerfile.dspace
+++ b/Dockerfile.dspace
@@ -62,6 +62,9 @@ COPY commul-customization/stop_stack.sh /opt/repository/workspace/scripts/
 COPY commul-customization/local.properties /opt/repository/workspace/sources/
 RUN chmod u+x /opt/repository/workspace/scripts/*_stack.sh
 
+# adapt TOS
+RUN perl /opt/repository/sources/dspace/utilities/adapt_tos.pl
+
 # install libs
 WORKDIR /opt/repository/workspace/scripts
 RUN make install_libs
@@ -71,5 +74,7 @@ RUN make new_deploy
 # copy over config files
 COPY commul-customization/aai_config.js /opt/lindat-dspace/installation/webapps/xmlui/themes/UFAL/lib/js/
 
-CMD tail -f /opt/repository/sources/dspace/dspace-api/src/test/data/dspaceFolder/log/dspace.log
+#CMD tail -f /opt/repository/sources/dspace/dspace-api/src/test/data/dspaceFolder/log/dspace.log
+# CMD /etc/init.d/tomcat8 start
+CMD ["/opt/tomcat8/bin/catalina.sh", "run"]