refactor dockerfiles