Improve docker build