BACKLOG-5249 Replace propertyGroups with tags