[DependencyInjection] Issue #7555 - Resolve environment variables at runtime