Refactor docker images