Make production settings more generic