Docker -  refactoring