Aligned Dockerfile with master one