diff --git a/contribs/dependencies.lock b/contribs/dependencies.lock
index 8683de789b..81ac30b343 100644
--- a/contribs/dependencies.lock
+++ b/contribs/dependencies.lock
@@ -7,7 +7,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.11.389",
+            "locked": "1.11.415",
             "requested": "latest.release"
         },
         "com.fasterxml.jackson.core:jackson-core": {
@@ -125,7 +125,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.11.389",
+            "locked": "1.11.415",
             "requested": "latest.release"
         },
         "com.fasterxml.jackson.core:jackson-core": {
@@ -243,7 +243,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.11.389",
+            "locked": "1.11.415",
             "requested": "latest.release"
         },
         "com.fasterxml.jackson.core:jackson-core": {
@@ -371,7 +371,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.11.389",
+            "locked": "1.11.415",
             "requested": "latest.release"
         },
         "com.fasterxml.jackson.core:jackson-core": {
@@ -489,7 +489,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.11.389",
+            "locked": "1.11.415",
             "requested": "latest.release"
         },
         "com.fasterxml.jackson.core:jackson-core": {
@@ -607,7 +607,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.11.389",
+            "locked": "1.11.415",
             "requested": "latest.release"
         },
         "com.fasterxml.jackson.core:jackson-core": {
@@ -741,7 +741,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.11.389",
+            "locked": "1.11.415",
             "requested": "latest.release"
         },
         "com.fasterxml.jackson.core:jackson-core": {
@@ -875,7 +875,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.11.389",
+            "locked": "1.11.415",
             "requested": "latest.release"
         },
         "com.fasterxml.jackson.core:jackson-core": {
@@ -1009,7 +1009,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.11.389",
+            "locked": "1.11.415",
             "requested": "latest.release"
         },
         "com.fasterxml.jackson.core:jackson-core": {
diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock
index 4a9952f4de..9e03ce6015 100644
--- a/redis-persistence/dependencies.lock
+++ b/redis-persistence/dependencies.lock
@@ -53,15 +53,15 @@
             "project": true
         },
         "com.netflix.dyno-queues:dyno-queues-redis": {
-            "locked": "1.0.8",
-            "requested": "1.0.8"
+            "locked": "2.0.0-rc3",
+            "requested": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.dyno:dyno-jedis": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.servo:servo-core": {
@@ -92,7 +92,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.0"
+            "locked": "3.6"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -101,7 +101,7 @@
             "locked": "1.7.25"
         },
         "redis.clients:jedis": {
-            "locked": "2.8.1",
+            "locked": "2.9.0",
             "requested": "2.8.1"
         }
     },
@@ -159,15 +159,15 @@
             "project": true
         },
         "com.netflix.dyno-queues:dyno-queues-redis": {
-            "locked": "1.0.8",
-            "requested": "1.0.8"
+            "locked": "2.0.0-rc3",
+            "requested": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.dyno:dyno-jedis": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.servo:servo-core": {
@@ -198,7 +198,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.0"
+            "locked": "3.6"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -207,7 +207,7 @@
             "locked": "1.7.25"
         },
         "redis.clients:jedis": {
-            "locked": "2.8.1",
+            "locked": "2.9.0",
             "requested": "2.8.1"
         }
     },
@@ -265,15 +265,15 @@
             "project": true
         },
         "com.netflix.dyno-queues:dyno-queues-redis": {
-            "locked": "1.0.8",
-            "requested": "1.0.8"
+            "locked": "2.0.0-rc3",
+            "requested": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.dyno:dyno-jedis": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.servo:servo-core": {
@@ -304,7 +304,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.0"
+            "locked": "3.6"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -313,7 +313,7 @@
             "locked": "1.7.25"
         },
         "redis.clients:jedis": {
-            "locked": "2.8.1",
+            "locked": "2.9.0",
             "requested": "2.8.1"
         }
     },
@@ -371,15 +371,15 @@
             "project": true
         },
         "com.netflix.dyno-queues:dyno-queues-redis": {
-            "locked": "1.0.8",
-            "requested": "1.0.8"
+            "locked": "2.0.0-rc3",
+            "requested": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.dyno:dyno-jedis": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.servo:servo-core": {
@@ -410,7 +410,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.0"
+            "locked": "3.6"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -419,7 +419,7 @@
             "locked": "1.7.25"
         },
         "redis.clients:jedis": {
-            "locked": "2.8.1",
+            "locked": "2.9.0",
             "requested": "2.8.1"
         }
     },
@@ -477,15 +477,15 @@
             "project": true
         },
         "com.netflix.dyno-queues:dyno-queues-redis": {
-            "locked": "1.0.8",
-            "requested": "1.0.8"
+            "locked": "2.0.0-rc3",
+            "requested": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.dyno:dyno-jedis": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.servo:servo-core": {
@@ -516,7 +516,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.0"
+            "locked": "3.6"
         },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
@@ -525,7 +525,7 @@
             "locked": "1.7.25"
         },
         "redis.clients:jedis": {
-            "locked": "2.8.1",
+            "locked": "2.9.0",
             "requested": "2.8.1"
         }
     },
@@ -583,15 +583,15 @@
             "project": true
         },
         "com.netflix.dyno-queues:dyno-queues-redis": {
-            "locked": "1.0.8",
-            "requested": "1.0.8"
+            "locked": "2.0.0-rc3",
+            "requested": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.dyno:dyno-jedis": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.servo:servo-core": {
@@ -626,7 +626,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.0"
+            "locked": "3.6"
         },
         "org.mockito:mockito-all": {
             "locked": "1.10.0",
@@ -643,7 +643,7 @@
             "locked": "1.7.25"
         },
         "redis.clients:jedis": {
-            "locked": "2.8.1",
+            "locked": "2.9.0",
             "requested": "2.8.1"
         }
     },
@@ -701,15 +701,15 @@
             "project": true
         },
         "com.netflix.dyno-queues:dyno-queues-redis": {
-            "locked": "1.0.8",
-            "requested": "1.0.8"
+            "locked": "2.0.0-rc3",
+            "requested": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.dyno:dyno-jedis": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.servo:servo-core": {
@@ -744,7 +744,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.0"
+            "locked": "3.6"
         },
         "org.mockito:mockito-all": {
             "locked": "1.10.0",
@@ -761,7 +761,7 @@
             "locked": "1.7.25"
         },
         "redis.clients:jedis": {
-            "locked": "2.8.1",
+            "locked": "2.9.0",
             "requested": "2.8.1"
         }
     },
@@ -819,15 +819,15 @@
             "project": true
         },
         "com.netflix.dyno-queues:dyno-queues-redis": {
-            "locked": "1.0.8",
-            "requested": "1.0.8"
+            "locked": "2.0.0-rc3",
+            "requested": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.dyno:dyno-jedis": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.servo:servo-core": {
@@ -862,7 +862,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.0"
+            "locked": "3.6"
         },
         "org.mockito:mockito-all": {
             "locked": "1.10.0",
@@ -879,7 +879,7 @@
             "locked": "1.7.25"
         },
         "redis.clients:jedis": {
-            "locked": "2.8.1",
+            "locked": "2.9.0",
             "requested": "2.8.1"
         }
     },
@@ -937,15 +937,15 @@
             "project": true
         },
         "com.netflix.dyno-queues:dyno-queues-redis": {
-            "locked": "1.0.8",
-            "requested": "1.0.8"
+            "locked": "2.0.0-rc3",
+            "requested": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.dyno:dyno-jedis": {
-            "locked": "1.5.9",
+            "locked": "1.6.4",
             "requested": "1.5.9"
         },
         "com.netflix.servo:servo-core": {
@@ -980,7 +980,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.0"
+            "locked": "3.6"
         },
         "org.mockito:mockito-all": {
             "locked": "1.10.0",
@@ -997,7 +997,7 @@
             "locked": "1.7.25"
         },
         "redis.clients:jedis": {
-            "locked": "2.8.1",
+            "locked": "2.9.0",
             "requested": "2.8.1"
         }
     }
diff --git a/redis-persistence/src/main/java/com/netflix/conductor/dao/RedisWorkflowModule.java b/redis-persistence/src/main/java/com/netflix/conductor/dao/RedisWorkflowModule.java
index 1b0027fbb6..0021453dfb 100644
--- a/redis-persistence/src/main/java/com/netflix/conductor/dao/RedisWorkflowModule.java
+++ b/redis-persistence/src/main/java/com/netflix/conductor/dao/RedisWorkflowModule.java
@@ -16,19 +16,17 @@
  */
 
 import com.google.inject.AbstractModule;
-
 import com.netflix.conductor.core.config.Configuration;
 import com.netflix.conductor.dao.dynomite.DynoProxy;
 import com.netflix.conductor.dao.dynomite.RedisExecutionDAO;
 import com.netflix.conductor.dao.dynomite.RedisMetadataDAO;
 import com.netflix.conductor.dao.dynomite.queue.DynoQueueDAO;
 import com.netflix.dyno.connectionpool.HostSupplier;
-import com.netflix.dyno.queues.redis.DynoShardSupplier;
+import com.netflix.dyno.queues.shard.DynoShardSupplier;
+import redis.clients.jedis.JedisCommands;
 
 import javax.inject.Inject;
 
-import redis.clients.jedis.JedisCommands;
-
 /**
  * @author Viren
  */
diff --git a/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/DynoProxy.java b/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/DynoProxy.java
index 2899d10b79..a17ec35eee 100644
--- a/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/DynoProxy.java
+++ b/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/DynoProxy.java
@@ -15,32 +15,29 @@
  */
 package com.netflix.conductor.dao.dynomite;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.inject.Singleton;
 import com.netflix.conductor.core.config.Configuration;
 import com.netflix.discovery.DiscoveryClient;
 import com.netflix.dyno.connectionpool.exception.DynoException;
 import com.netflix.dyno.jedis.DynoJedisClient;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import redis.clients.jedis.JedisCommands;
 import redis.clients.jedis.ScanParams;
 import redis.clients.jedis.ScanResult;
 import redis.clients.jedis.Tuple;
 import redis.clients.jedis.params.sortedset.ZAddParams;
 
+import javax.inject.Inject;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+
 /**
  * 
  * @author Viren Proxy for the Dynomite client
diff --git a/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java
index a7bdc7b7bd..85e35471d4 100644
--- a/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java
+++ b/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java
@@ -25,9 +25,9 @@
 import com.netflix.dyno.queues.DynoQueue;
 import com.netflix.dyno.queues.Message;
 import com.netflix.dyno.queues.ShardSupplier;
-import com.netflix.dyno.queues.redis.DynoShardSupplier;
 import com.netflix.dyno.queues.redis.RedisDynoQueue;
 import com.netflix.dyno.queues.redis.RedisQueues;
+import com.netflix.dyno.queues.shard.DynoShardSupplier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import redis.clients.jedis.JedisCommands;
diff --git a/server/dependencies.lock b/server/dependencies.lock
index 7876e0d433..2a61900b88 100644
--- a/server/dependencies.lock
+++ b/server/dependencies.lock
@@ -10,7 +10,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -98,19 +98,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -218,7 +218,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -274,7 +274,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "compileClasspath": {
@@ -288,7 +288,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -376,19 +376,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -496,7 +496,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -552,7 +552,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "default": {
@@ -566,7 +566,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -654,19 +654,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -774,7 +774,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -830,7 +830,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "grettyProductRuntime": {
@@ -844,7 +844,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -932,19 +932,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -1052,7 +1052,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -1108,7 +1108,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "grettyProvidedCompile": {
@@ -1182,7 +1182,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -1270,19 +1270,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -1390,7 +1390,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -1446,7 +1446,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "runtimeClasspath": {
@@ -1460,7 +1460,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -1548,19 +1548,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -1668,7 +1668,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -1724,7 +1724,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "springBoot": {
@@ -1738,7 +1738,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -1826,19 +1826,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -1946,7 +1946,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -2002,7 +2002,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "testCompile": {
@@ -2016,7 +2016,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -2104,19 +2104,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -2228,7 +2228,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -2288,7 +2288,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "testCompileClasspath": {
@@ -2302,7 +2302,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -2390,19 +2390,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -2514,7 +2514,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -2574,7 +2574,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "testRuntime": {
@@ -2588,7 +2588,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -2676,19 +2676,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -2800,7 +2800,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -2860,7 +2860,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "testRuntimeClasspath": {
@@ -2874,7 +2874,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -2962,19 +2962,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
@@ -3086,7 +3086,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -3146,7 +3146,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     }
 }
\ No newline at end of file
diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock
index 92da9ea42a..b87b93ce0e 100644
--- a/test-harness/dependencies.lock
+++ b/test-harness/dependencies.lock
@@ -4,7 +4,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-client"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.amazonaws:aws-java-sdk-s3": {
             "firstLevelTransitive": [
@@ -16,7 +16,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -76,7 +76,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-client"
             ],
-            "locked": "0.7.5"
+            "locked": "0.7.6"
         },
         "com.netflix.conductor:conductor-client": {
             "project": true
@@ -145,19 +145,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.eureka:eureka-client": {
             "firstLevelTransitive": [
@@ -288,7 +288,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -358,7 +358,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "testCompileClasspath": {
@@ -366,7 +366,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-client"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.amazonaws:aws-java-sdk-s3": {
             "firstLevelTransitive": [
@@ -378,7 +378,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -438,7 +438,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-client"
             ],
-            "locked": "0.7.5"
+            "locked": "0.7.6"
         },
         "com.netflix.conductor:conductor-client": {
             "project": true
@@ -507,19 +507,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.eureka:eureka-client": {
             "firstLevelTransitive": [
@@ -650,7 +650,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -720,7 +720,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "testRuntime": {
@@ -728,7 +728,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-client"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.amazonaws:aws-java-sdk-s3": {
             "firstLevelTransitive": [
@@ -740,7 +740,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -800,7 +800,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-client"
             ],
-            "locked": "0.7.5"
+            "locked": "0.7.6"
         },
         "com.netflix.conductor:conductor-client": {
             "project": true
@@ -869,19 +869,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.eureka:eureka-client": {
             "firstLevelTransitive": [
@@ -1012,7 +1012,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -1082,7 +1082,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     },
     "testRuntimeClasspath": {
@@ -1090,7 +1090,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-client"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.amazonaws:aws-java-sdk-s3": {
             "firstLevelTransitive": [
@@ -1102,7 +1102,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-contribs"
             ],
-            "locked": "1.11.389"
+            "locked": "1.11.415"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -1162,7 +1162,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-client"
             ],
-            "locked": "0.7.5"
+            "locked": "0.7.6"
         },
         "com.netflix.conductor:conductor-client": {
             "project": true
@@ -1231,19 +1231,19 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.0.8"
+            "locked": "2.0.0-rc3"
         },
         "com.netflix.dyno:dyno-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.dyno:dyno-jedis": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "1.5.9"
+            "locked": "1.6.4"
         },
         "com.netflix.eureka:eureka-client": {
             "firstLevelTransitive": [
@@ -1374,7 +1374,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
             ],
-            "locked": "3.2.1"
+            "locked": "3.6"
         },
         "org.apache.logging.log4j:log4j-api": {
             "firstLevelTransitive": [
@@ -1444,7 +1444,7 @@
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-redis-persistence"
             ],
-            "locked": "2.8.1"
+            "locked": "2.9.0"
         }
     }
 }
\ No newline at end of file
diff --git a/versionsOfDependencies.gradle b/versionsOfDependencies.gradle
index 91efb5d4b6..d9549083ad 100644
--- a/versionsOfDependencies.gradle
+++ b/versionsOfDependencies.gradle
@@ -8,7 +8,7 @@ ext {
     revCommonsIo = '2.4'
     revDynoCore = '1.5.9'
     revDynoJedis = '1.5.9'
-    revDynoQueues = '1.0.8'
+    revDynoQueues = '2.0.0-rc3'
     revElasticSearch2 = '2.4.6'
     revElasticSearch5 = '5.6.8'
     revElasticSearch5Client = '5.6.8'