Fixes for the tagging
Removed ESA and IPS from Build for release