Comment 2 for bug 1896744

OK, I understand that the impact is limited for groovy since we don't build most of the relevant images there. Feel free to go ahead then, but please do make sure that the ubuntu-cpc images continue to work.