Make the build more responsive to environment values
builder, not process