workflows: more tags fixes (squash into main tags fix)