Docker fix timeout

Fix #963 

See #963  or commit messages for more details. 
Done!