Expand the configuration to support env vars