Image builder tweaks and ci shinies

Can't show this merge request because the source branch wip/sjoerd/dont-set-nonexisting-home is missing from project infrastructure/apertis-docker-images. Close this merge request or update the source branch.