Modify scripts to use new env vars