Properly define tag so that updates are taken from the same tag.
Only add targets if necessary.