Dockerfile refactor