Build script ready
Fix appending of tags