Fix the imagebuilder generation (does not mean it works with the recent changes)