Configuration refactoring – production fix