Improved dockerfile generation