Improved docker orchestration scripts
Resolved merge conflicts