diff --git a/pom.xml b/pom.xml
index c79209bea..8a35a000b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>uk.gov.moj.cpp.sjp</groupId>
     <artifactId>sjp-parent</artifactId>
-    <version>17.104.187-CCT-1981-SNAPSHOT</version>
+    <version>17.104.188-CCT-1981-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/sjp-command/pom.xml b/sjp-command/pom.xml
index ef3b55d40..7c5c8ec05 100644
--- a/sjp-command/pom.xml
+++ b/sjp-command/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-parent</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/sjp-command/sjp-command-api/pom.xml b/sjp-command/sjp-command-api/pom.xml
index 398eabf68..d645b1b20 100644
--- a/sjp-command/sjp-command-api/pom.xml
+++ b/sjp-command/sjp-command-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-command</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-command/sjp-command-controller/pom.xml b/sjp-command/sjp-command-controller/pom.xml
index 5b15335b2..868d91346 100644
--- a/sjp-command/sjp-command-controller/pom.xml
+++ b/sjp-command/sjp-command-controller/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-command</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-command/sjp-command-handler/pom.xml b/sjp-command/sjp-command-handler/pom.xml
index d4284a60f..c53967e46 100644
--- a/sjp-command/sjp-command-handler/pom.xml
+++ b/sjp-command/sjp-command-handler/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-command</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-domain/pom.xml b/sjp-domain/pom.xml
index e4784ba91..9b676bc48 100644
--- a/sjp-domain/pom.xml
+++ b/sjp-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
         <artifactId>sjp-parent</artifactId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
 
     <artifactId>sjp-domain</artifactId>
diff --git a/sjp-domain/sjp-domain-aggregate/pom.xml b/sjp-domain/sjp-domain-aggregate/pom.xml
index 6e9650d3d..16bf82c6f 100644
--- a/sjp-domain/sjp-domain-aggregate/pom.xml
+++ b/sjp-domain/sjp-domain-aggregate/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
         <artifactId>sjp-domain</artifactId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
 
     <artifactId>sjp-domain-aggregate</artifactId>
diff --git a/sjp-domain/sjp-domain-common/pom.xml b/sjp-domain/sjp-domain-common/pom.xml
index d3d417784..059132207 100644
--- a/sjp-domain/sjp-domain-common/pom.xml
+++ b/sjp-domain/sjp-domain-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
         <artifactId>sjp-domain</artifactId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/sjp-domain/sjp-domain-event-processor/pom.xml b/sjp-domain/sjp-domain-event-processor/pom.xml
index 9d75deb9d..dbb9f6bfc 100644
--- a/sjp-domain/sjp-domain-event-processor/pom.xml
+++ b/sjp-domain/sjp-domain-event-processor/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-domain</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-domain/sjp-domain-event/pom.xml b/sjp-domain/sjp-domain-event/pom.xml
index ee3907ad4..3c9761bce 100644
--- a/sjp-domain/sjp-domain-event/pom.xml
+++ b/sjp-domain/sjp-domain-event/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
         <artifactId>sjp-domain</artifactId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
 
     <artifactId>sjp-domain-event</artifactId>
diff --git a/sjp-domain/sjp-domain-prosecution/pom.xml b/sjp-domain/sjp-domain-prosecution/pom.xml
index e67ae8ad7..5f41918cc 100644
--- a/sjp-domain/sjp-domain-prosecution/pom.xml
+++ b/sjp-domain/sjp-domain-prosecution/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sjp-domain</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
 
     <artifactId>sjp-domain-prosecution</artifactId>
diff --git a/sjp-domain/sjp-domain-transformation/pom.xml b/sjp-domain/sjp-domain-transformation/pom.xml
index 858060e1a..3f0328025 100644
--- a/sjp-domain/sjp-domain-transformation/pom.xml
+++ b/sjp-domain/sjp-domain-transformation/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-domain</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml
index 14503cd42..86d360879 100644
--- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml
+++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-domain-transformation</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml
index 34f47630b..0b3f02dbf 100644
--- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml
+++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-domain-transformation</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-event-sources/pom.xml b/sjp-event-sources/pom.xml
index 94554d9f4..ffbfb2367 100644
--- a/sjp-event-sources/pom.xml
+++ b/sjp-event-sources/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-parent</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sjp-event/pom.xml b/sjp-event/pom.xml
index c88c05d0d..555661985 100644
--- a/sjp-event/pom.xml
+++ b/sjp-event/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-parent</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/sjp-event/sjp-event-indexer/pom.xml b/sjp-event/sjp-event-indexer/pom.xml
index 4320a66dc..4aa01e7d4 100644
--- a/sjp-event/sjp-event-indexer/pom.xml
+++ b/sjp-event/sjp-event-indexer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-event</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-event/sjp-event-listener/pom.xml b/sjp-event/sjp-event-listener/pom.xml
index 797484f20..0b4b6cde0 100644
--- a/sjp-event/sjp-event-listener/pom.xml
+++ b/sjp-event/sjp-event-listener/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-event</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-event/sjp-event-processor/pom.xml b/sjp-event/sjp-event-processor/pom.xml
index 296737c1a..0bd808c86 100644
--- a/sjp-event/sjp-event-processor/pom.xml
+++ b/sjp-event/sjp-event-processor/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-event</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-healthchecks/pom.xml b/sjp-healthchecks/pom.xml
index 46d8459ea..e3a85dc90 100644
--- a/sjp-healthchecks/pom.xml
+++ b/sjp-healthchecks/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-parent</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-integration-test/pom.xml b/sjp-integration-test/pom.xml
index c89c77998..c8b175bab 100644
--- a/sjp-integration-test/pom.xml
+++ b/sjp-integration-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
         <artifactId>sjp-parent</artifactId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java
index ab1bdcffb..5f620a1cd 100644
--- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java
+++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java
@@ -11,7 +11,6 @@
 import static uk.gov.moj.sjp.it.util.HttpClientUtil.makeGetCall;
 import static uk.gov.moj.sjp.it.util.HttpClientUtil.makePostCall;
 import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.POLL_INTERVAL;
-import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.TIMEOUT_IN_SECONDS;
 
 import uk.gov.justice.services.messaging.JsonEnvelope;
 import uk.gov.moj.cpp.sjp.event.session.CaseAssigned;
@@ -28,6 +27,8 @@
 
 public class AssignmentHelper {
 
+    private static final long ASSIGNMENT_TIMEOUT_IN_SECONDS = 20L;
+
     public static UUID requestCaseAssignmentAsync(final UUID sessionId, final UUID userId) {
         final String contentType = "application/vnd.sjp.assign-next-case+json";
         final String url = String.format("/sessions/%s", sessionId);
@@ -66,11 +67,11 @@ public static boolean isCaseAssignedToUser(final UUID caseId, final UUID userId)
     }
 
     public static boolean pollUntilCaseAssignedToUser(final UUID caseId, final UUID userId) {
-        return await().pollInterval(POLL_INTERVAL).atMost(TIMEOUT_IN_SECONDS, SECONDS).until(() -> isCaseAssignedToUser(caseId, userId), is(true));
+        return await().pollInterval(POLL_INTERVAL).atMost(ASSIGNMENT_TIMEOUT_IN_SECONDS, SECONDS).until(() -> isCaseAssignedToUser(caseId, userId), is(true));
     }
 
     public static boolean pollUntilCaseNotAssignedToUser(final UUID caseId, final UUID userId) {
-        return await().pollInterval(POLL_INTERVAL).atMost(TIMEOUT_IN_SECONDS, SECONDS).until(() -> isCaseAssignedToUser(caseId, userId), is(false));
+        return await().pollInterval(POLL_INTERVAL).atMost(ASSIGNMENT_TIMEOUT_IN_SECONDS, SECONDS).until(() -> isCaseAssignedToUser(caseId, userId), is(false));
     }
 
     public static void pollCaseUnassigned(final UUID caseId) {
diff --git a/sjp-json/pom.xml b/sjp-json/pom.xml
index da8195ac6..512b1b14a 100644
--- a/sjp-json/pom.xml
+++ b/sjp-json/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>sjp-parent</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-query/pom.xml b/sjp-query/pom.xml
index c22db28e1..7873654ea 100644
--- a/sjp-query/pom.xml
+++ b/sjp-query/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-parent</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-query/sjp-query-api/pom.xml b/sjp-query/sjp-query-api/pom.xml
index 05b7d9e10..bbcfd782e 100644
--- a/sjp-query/sjp-query-api/pom.xml
+++ b/sjp-query/sjp-query-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-query</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-query/sjp-query-view/pom.xml b/sjp-query/sjp-query-view/pom.xml
index c37837402..bcd79bf46 100644
--- a/sjp-query/sjp-query-view/pom.xml
+++ b/sjp-query/sjp-query-view/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-query</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sjp-service/pom.xml b/sjp-service/pom.xml
index 4f6a1f274..e20de5016 100644
--- a/sjp-service/pom.xml
+++ b/sjp-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
         <artifactId>sjp-parent</artifactId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <artifactId>sjp-service</artifactId>
     <packaging>war</packaging>
diff --git a/sjp-viewstore/pom.xml b/sjp-viewstore/pom.xml
index 5a15ea7d8..793fef301 100644
--- a/sjp-viewstore/pom.xml
+++ b/sjp-viewstore/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <artifactId>sjp-parent</artifactId>
       <groupId>uk.gov.moj.cpp.sjp</groupId>
-      <version>17.104.187-CCT-1981-SNAPSHOT</version>
+      <version>17.104.188-CCT-1981-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>sjp-viewstore</artifactId>
diff --git a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml
index e95d7c4b3..e0717af3c 100644
--- a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml
+++ b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
         <artifactId>sjp-viewstore</artifactId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
 
     <artifactId>sjp-viewstore-liquibase</artifactId>
diff --git a/sjp-viewstore/sjp-viewstore-persistence/pom.xml b/sjp-viewstore/sjp-viewstore-persistence/pom.xml
index 7aeb5dc2b..3e3572b18 100644
--- a/sjp-viewstore/sjp-viewstore-persistence/pom.xml
+++ b/sjp-viewstore/sjp-viewstore-persistence/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sjp-viewstore</artifactId>
         <groupId>uk.gov.moj.cpp.sjp</groupId>
-        <version>17.104.187-CCT-1981-SNAPSHOT</version>
+        <version>17.104.188-CCT-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>