Make service checks detection dynamic == less flaky