diff --git a/docs/content/configuration/indexing-service.md b/docs/content/configuration/indexing-service.md
index a2e5f9f5afb..b6cbf57117f 100644
--- a/docs/content/configuration/indexing-service.md
+++ b/docs/content/configuration/indexing-service.md
@@ -298,6 +298,6 @@ If the peon is running in remote mode, there must be an overlord up and running.
 
 |Property|Description|Default|
 |--------|-----------|-------|
-|`druid.peon.taskActionClient.retry.minWait`|The minimum retry time to communicate with overlord.|PT1M|
-|`druid.peon.taskActionClient.retry.maxWait`|The maximum retry time to communicate with overlord.|PT10M|
-|`druid.peon.taskActionClient.retry.maxRetryCount`|The maximum number of retries to communicate with overlord.|10|
+|`druid.peon.taskActionClient.retry.minWait`|The minimum retry time to communicate with overlord.|PT5S|
+|`druid.peon.taskActionClient.retry.maxWait`|The maximum retry time to communicate with overlord.|PT1M|
+|`druid.peon.taskActionClient.retry.maxRetryCount`|The maximum number of retries to communicate with overlord.|60|
diff --git a/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyConfig.java b/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyConfig.java
index 92dff230aed..45b1d0df988 100644
--- a/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyConfig.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyConfig.java
@@ -27,13 +27,13 @@ import org.joda.time.Period;
 public class RetryPolicyConfig
 {
   @JsonProperty
-  private Period minWait = new Period("PT1M");
+  private Period minWait = new Period("PT5S");
 
   @JsonProperty
-  private Period maxWait = new Period("PT10M");
+  private Period maxWait = new Period("PT1M");
 
   @JsonProperty
-  private long maxRetryCount = 10;
+  private long maxRetryCount = 60;
 
   public Period getMinWait()
   {