Improved the un-dockerize