Docker refactoring