Improve Dockerization.