Make deployment scripts safer w/r/t tags