Fix some minor (given the size of the MR) fallout from !5688 (merged).
(If @craftyguy or @lucaweiss merges this, can you reset the image status back to queued? but anyone else could merge it as well.)
[ci:skip-build]: already built successfully in CI
