Docker changes

@githart pls review