Started to add envvars to container