use container_envvars rather than link_variables for updating
Merge commit '33f44de3151816585979bc3f0667178dec948f09'