[PATCH aeolus-image 2/2] Support multiple builds