Improve docker image and build