Simplify env overrides
1.1.5