Merge "Add envs via volume mapping"