rework config samples for recent changes