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