Dockerfile refactored