Docker updates

@githart pls review