Improving docker container handling