Move ENV vars to pass_env