Add CM build tags

For having correct tags after build