Fix Rebuild job logic