diff --git a/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java b/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java
index f2ecd452..9af57172 100644
--- a/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java
+++ b/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java
@@ -17,6 +17,7 @@
 
 import com.github.rholder.retry.RetryerBuilder;
 import com.github.rholder.retry.StopStrategies;
+import com.github.rholder.retry.WaitStrategies;
 import com.google.common.base.Stopwatch;
 import io.appform.ranger.core.finder.ServiceFinder;
 import io.appform.ranger.core.model.HubConstants;
@@ -54,7 +55,7 @@ public class ServiceFinderHub<T, R extends ServiceRegistry<T>> {
     private final Lock updateLock = new ReentrantLock();
     private final Condition updateCond = updateLock.newCondition();
     private final AtomicBoolean updateAvailable = new AtomicBoolean(false);
-    private final ExecutorService executorService = Executors.newFixedThreadPool(1);
+    private final ExecutorService executorService = Executors.newFixedThreadPool(2);
 
     @Getter
     private final ExternalTriggeredSignal<Void> startSignal
@@ -187,7 +188,7 @@ private void monitor() {
                 while (!updateAvailable.get()) {
                     updateCond.await();
                 }
-                updateRegistry();
+                executorService.submit(this::updateRegistry);
             }
             catch (InterruptedException e) {
                 log.info("Updater thread interrupted");
@@ -279,6 +280,7 @@ private void waitTillServiceIsReady(Service service) {
             RetryerBuilder.<Boolean>newBuilder()
                     .retryIfResult(r -> !r)
                     .withStopStrategy(StopStrategies.stopAfterDelay(serviceRefreshTimeoutMs, TimeUnit.MILLISECONDS))
+                    .withWaitStrategy(WaitStrategies.fixedWait(1, TimeUnit.SECONDS))
                     .build()
                     .call(() -> Optional.ofNullable(getFinders().get().get(service))
                             .map(ServiceFinder::getServiceRegistry)
diff --git a/ranger-core/src/test/java/io/appform/ranger/core/finderhub/ServiceFinderHubTest.java b/ranger-core/src/test/java/io/appform/ranger/core/finderhub/ServiceFinderHubTest.java
index 535f99ad..de92dbac 100644
--- a/ranger-core/src/test/java/io/appform/ranger/core/finderhub/ServiceFinderHubTest.java
+++ b/ranger-core/src/test/java/io/appform/ranger/core/finderhub/ServiceFinderHubTest.java
@@ -66,6 +66,25 @@ void testDynamicServiceAddition() {
         Assertions.assertEquals(0, dynamicServiceNode.get().getPort());
     }
 
+    @Test
+    void testTimeoutOnHubStartup() {
+        var testServiceFinderHub = new TestServiceFinderHubBuilder()
+                .withServiceDataSource(new DynamicDataSource(Lists.newArrayList(new Service("NS", "SERVICE"))))
+                .withServiceFinderFactory(new TestServiceFinderFactory())
+                .withRefreshFrequencyMs(5_000)
+                .withHubStartTimeout(1_000)
+                .withServiceRefreshTimeout(10_000)
+                .build();
+
+        try {
+            Exception exception = Assertions.assertThrows(IllegalStateException.class, testServiceFinderHub::start);
+            Assertions.assertTrue(exception.getMessage()
+                    .contains("Couldn't perform service hub refresh at this time. Refresh exceeded the start up time specified"));
+        } finally {
+            testServiceFinderHub.stop();
+        }
+    }
+
     @Test
     void testDelayedServiceAddition() {
         val delayedHub = new ServiceFinderHub<>(new DynamicDataSource(Lists.newArrayList(new Service("NS", "SERVICE"))),
@@ -107,6 +126,34 @@ void testDynamicServiceAdditionWithNonDynamicDataSource() {
         }
     }
 
+    public class TestServiceFinderFactory  implements ServiceFinderFactory<TestNodeData, MapBasedServiceRegistry<TestNodeData>> {
+
+        @Override
+        public ServiceFinder<TestNodeData, MapBasedServiceRegistry<TestNodeData>> buildFinder(Service service) {
+            val finder = new TestServiceFinderBuilder()
+                    .withNamespace(service.getNamespace())
+                    .withServiceName(service.getServiceName())
+                    .withDeserializer(new Deserializer<TestNodeData>() {})
+                    .withSleepDuration(60)
+                    .build();
+
+            finder.start();
+            return finder;
+        }
+    }
+
+private static class TestServiceFinderHubBuilder extends ServiceFinderHubBuilder<TestNodeData, MapBasedServiceRegistry<TestNodeData>> {
+
+    @Override
+    protected void preBuild() {
+
+    }
+
+    @Override
+    protected void postBuild(ServiceFinderHub<TestNodeData, MapBasedServiceRegistry<TestNodeData>> serviceFinderHub) {
+
+    }
+}
     private static class TestServiceFinderBuilder extends BaseServiceFinderBuilder<TestNodeData, MapBasedServiceRegistry<TestNodeData>, ServiceFinder<TestNodeData, MapBasedServiceRegistry<TestNodeData>>, TestServiceFinderBuilder, Deserializer<TestNodeData>> {
 
         private int finderSleepDurationSeconds = 0;
diff --git a/ranger-http/src/main/java/io/appform/ranger/http/utils/RangerHttpUtils.java b/ranger-http/src/main/java/io/appform/ranger/http/utils/RangerHttpUtils.java
index c3aaf105..906e06e6 100644
--- a/ranger-http/src/main/java/io/appform/ranger/http/utils/RangerHttpUtils.java
+++ b/ranger-http/src/main/java/io/appform/ranger/http/utils/RangerHttpUtils.java
@@ -45,6 +45,12 @@ public static <T> HttpCommunicator<T> httpClient(
                         .connectTimeout(config.getConnectionTimeoutMs() == 0
                                         ? 3000
                                         : config.getConnectionTimeoutMs(), TimeUnit.MILLISECONDS)
+                        .readTimeout(config.getOperationTimeoutMs() == 0
+                                ? 3000
+                                : config.getOperationTimeoutMs(), TimeUnit.MILLISECONDS)
+                        .writeTimeout(config.getOperationTimeoutMs() == 0
+                                ? 3000
+                                : config.getOperationTimeoutMs(), TimeUnit.MILLISECONDS)
                         .followRedirects(true)
                         .connectionPool(new ConnectionPool(1, 30, TimeUnit.SECONDS))
                         .build(),
diff --git a/ranger-server/src/main/resources/local.yml b/ranger-server/src/main/resources/local.yml
new file mode 100644
index 00000000..8e0c6012
--- /dev/null
+++ b/ranger-server/src/main/resources/local.yml
@@ -0,0 +1,41 @@
+ranger:
+  namespace: mynamespace
+  upstreams:
+    - type: HTTP
+      nodeRefreshTimeMs: 5000
+      serviceRefreshTimeoutMs: 300000
+      hubStartTimeoutMs: 210000
+      httpClientConfigs:
+        - host: localhost
+          port: 80
+    - type: ZK
+      nodeRefreshTimeMs: 5000
+      serviceRefreshTimeoutMs: 3000
+      hubStartTimeoutMs: 5000
+      zookeepers: [ "localhost:2181" ]
+      disablePushUpdaters: true
+
+
+server:
+  maxThreads: 1024
+  minThreads: 1024
+  applicationConnectors:
+    - type: http
+      port: 18080
+  adminConnectors:
+    - type: http
+      port: 18081
+  applicationContextPath: /
+  requestLog:
+    appenders:
+      - type: console
+        timeZone: IST
+
+logging:
+  level: INFO
+
+  appenders:
+    - type: console
+      threshold: INFO
+      timeZone: IST
+      logFormat: "%(%-5level) [%date] [%thread] [%logger{0}]: %message%n"