Update docker compose file and Dockerfile