Improve tag-build