Use polling for resiliency

Georgios Chinis