Improved docker build and run routing