diff --git a/conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ClientProperties.java b/conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ClientProperties.java
index 39b7567ce..c90272bbc 100644
--- a/conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ClientProperties.java
+++ b/conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ClientProperties.java
@@ -37,6 +37,8 @@ public class ClientProperties {
 
     private int shutdownGracePeriodSeconds = 10;
 
+    private int taskPollTimeout = 100;
+
     public String getRootUri() {
         return rootUri;
     }
@@ -100,4 +102,12 @@ public Map<String, Integer> getTaskThreadCount() {
     public void setTaskThreadCount(Map<String, Integer> taskThreadCount) {
         this.taskThreadCount = taskThreadCount;
     }
+
+    public int getTaskPollTimeout() {
+        return taskPollTimeout;
+    }
+
+    public void setTaskPollTimeout(int taskPollTimeout) {
+        this.taskPollTimeout = taskPollTimeout;
+    }
 }
diff --git a/conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ConductorClientAutoConfiguration.java b/conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ConductorClientAutoConfiguration.java
index 5c698aaef..f157d5377 100644
--- a/conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ConductorClientAutoConfiguration.java
+++ b/conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ConductorClientAutoConfiguration.java
@@ -77,6 +77,7 @@ public TaskRunnerConfigurer taskRunnerConfigurer(Environment env,
         } else {
             clientProperties.setTaskThreadCount(taskThreadCount);
         }
+
         return new TaskRunnerConfigurer.Builder(taskClient, workers)
                 .withTaskThreadCount(clientProperties.getTaskThreadCount())
                 .withThreadCount(clientProperties.getThreadCount())
@@ -84,6 +85,7 @@ public TaskRunnerConfigurer taskRunnerConfigurer(Environment env,
                 .withUpdateRetryCount(clientProperties.getUpdateRetryCount())
                 .withTaskToDomain(clientProperties.getTaskToDomain())
                 .withShutdownGracePeriodSeconds(clientProperties.getShutdownGracePeriodSeconds())
+                .withTaskPollTimeout(clientProperties.getTaskPollTimeout())
                 .build();
     }
 
diff --git a/conductor-clients/java/conductor-java-sdk/gradle.properties b/conductor-clients/java/conductor-java-sdk/gradle.properties
index 4fa6a964f..ffca90162 100644
--- a/conductor-clients/java/conductor-java-sdk/gradle.properties
+++ b/conductor-clients/java/conductor-java-sdk/gradle.properties
@@ -1 +1 @@
-version=3.0.0-alpha14-SNAPSHOT
+version=3.0.0-alpha15-SNAPSHOT