Use ENTRYPOINT and fix tail