Streamline PZOSP Build