Improve docker image