Improved docker way to work with.