Current fix uses a blocking way of setting up webhooks, find a way to do non-blocking webhooks setup.