Maybe we need to add the entire set of env vars?