Hi Peter, I'm a bit confused about your patch, not that I would not believe it solves the issue, but IMAGE_LINK_NAME is defined as `IMAGE_LINK_NAME ?= "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}"` and IMAGE_NAME as `IMAGE_NAME ?= "${IMAGE_LINK_NAME}${IMAGE_VERSION_SUFFIX}"` means, if I'm not completely confused, if IMAGE_LINK_NAME would be empty for some reason, IMAGE_NAME, would only consist of the IMAGE_VERSION_SUFFIX. This does not read correct to me as well, and thus I'm not completely enthusiastic about your version. But I'm completely with you in terms of the main issue and would rather like to fix it on this level than patching symptoms. Anna