Take the console and shop out of the image, and layer them at first boot
Carry the RPMs in the image, which removes the copy step and the wedge both
Measure what a hotfix is allowed to do, instead of assuming it