Improved docker config