Improve docker installation