I don't look at Yak shaving any differently than a normal feature/bug workflow. If something crops up during development or fire-fighting I will make a note and

I don't look at Yak shaving any differently than a normal feature/bug workflow. If something crops up during development or fire-fighting I will make a note and continue on with what I was doing. Later, the notes get written up into proper bug reports during the time I've set aside for this type of work. These are added to the normal pipeline and prioritised the same as any other feature or bug. Important tasks rise to the top. Others are reserved for "cleanup sprints". This does add some overhead but it means all tasks get careful consideration. It also gives us a great list of short tickets to do on a Friday afternoon. Since these kinds of tasks usually don't need the kind of focus that normal development does.