Adjusting this to only use envvars for our specific purpose.