EXOGTN-1845 Make container creation more flexible