Docker refoactoring