Optimisation for services jobs

Change-Id: I0fec9c5dc225bda78fe05ea4e336381f4812e173