Agreed. Not as part of this PR though. I can do that in another PR and update the release envvars.