Use --always for tags

Change-Id: Ia9f11b37b43a47569971e5276bfefd6d94f66f75