Improve Dockerfile and docker-compose instructions