Improved dockerfile