merge: targets: update image generation and targets