Separate final image creation by architecture and image type (e.g.  x86/iso, armv6/sd).