Dockerfile - Refactoring