UPDATE: Mods to container generation for running in sub-project