Fix for jammy previous image w/ different sources format
#20236 -
Commit aa93b7918e pushed by skeet70
Update after trying to run as much as I could locally via docker
#19452 -
Commit e05fcb7039 pushed by skeet70