Improved docker orchestration scripts