Updated multi-enviro setup to use default setup (which wasn't available previously) where possible