Refactor and improvements on generic build jobs