Docker - small refactoring