diff --git a/README.md b/README.md
index 5b6492204..f8adef67a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.3.10-blue.svg)](http://kotlinlang.org/)
+[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.3.11-blue.svg)](http://kotlinlang.org/)
 [![Prime version](https://img.shields.io/github/tag/ostelco/ostelco-core.svg)](https://github.com/ostelco/ostelco-core/tags)
 [![GitHub license](https://img.shields.io/github/license/ostelco/ostelco-core.svg)](https://github.com/ostelco/ostelco-core/blob/master/LICENSE)
 
diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
index 047de7db5..38b76509b 100644
--- a/acceptance-tests/build.gradle
+++ b/acceptance-tests/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
 }
diff --git a/acceptance-tests/src/main/kotlin/org/ostelco/at/common/TestUser.kt b/acceptance-tests/src/main/kotlin/org/ostelco/at/common/TestUser.kt
index 3a278d77b..65e958769 100644
--- a/acceptance-tests/src/main/kotlin/org/ostelco/at/common/TestUser.kt
+++ b/acceptance-tests/src/main/kotlin/org/ostelco/at/common/TestUser.kt
@@ -38,4 +38,4 @@ fun createSubscription(email: String): String {
 }
 
 private val random = Random()
-fun randomInt(): Int = random.nextInt(999)
\ No newline at end of file
+fun randomInt(): Int = random.nextInt(99999)
\ No newline at end of file
diff --git a/admin-api/build.gradle b/admin-api/build.gradle
index d32848ded..ef493a5a5 100644
--- a/admin-api/build.gradle
+++ b/admin-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/analytics-module/build.gradle b/analytics-module/build.gradle
index 7c3a073f2..90dc28b42 100644
--- a/analytics-module/build.gradle
+++ b/analytics-module/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.3.10"
+    id "org.jetbrains.kotlin.jvm" version "1.3.11"
     id "java-library"
 }
 
@@ -9,5 +9,5 @@ dependencies {
     implementation "com.google.cloud:google-cloud-pubsub:$googleCloudVersion"
     implementation 'com.google.code.gson:gson:2.8.5'
 
-    testImplementation 'com.google.api:gax-grpc:1.35.0'
+    testImplementation 'com.google.api:gax-grpc:1.35.1'
 }
diff --git a/app-notifier/build.gradle b/app-notifier/build.gradle
index 850f8b624..35cdba153 100644
--- a/app-notifier/build.gradle
+++ b/app-notifier/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/auth-server/build.gradle b/auth-server/build.gradle
index a014ba51f..092c093f7 100644
--- a/auth-server/build.gradle
+++ b/auth-server/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
   id "idea"
diff --git a/bq-metrics-extractor/build.gradle b/bq-metrics-extractor/build.gradle
index 8d6f2dc06..581b68526 100644
--- a/bq-metrics-extractor/build.gradle
+++ b/bq-metrics-extractor/build.gradle
@@ -3,7 +3,7 @@ buildscript {
 }
 
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
   id "idea"
@@ -21,7 +21,7 @@ dependencies {
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
   implementation "com.google.cloud:google-cloud-bigquery:$googleCloudVersion"
-  implementation 'io.prometheus:simpleclient_pushgateway:0.5.0'
+  implementation 'io.prometheus:simpleclient_pushgateway:0.6.0'
 
   runtimeOnly "io.dropwizard:dropwizard-json-logging:$dropwizardVersion"
 
diff --git a/build.gradle b/build.gradle
index e6e0343aa..da55e6cc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,36 +34,36 @@ subprojects {
   ext {
     assertJVersion = "3.11.1"
     arrowVersion = "0.8.1"
-    beamVersion = "2.8.0"
+    beamVersion = "2.9.0"
     dropwizardVersion = "1.3.7"
-    firebaseVersion = "6.5.0"
-    googleCloudVersion = "1.53.0"
-    grpcVersion = "1.16.1"
+    firebaseVersion = "6.6.0"
+    googleCloudVersion = "1.56.0"
+    grpcVersion = "1.17.1"
     guavaVersion = "27.0.1-jre"
-    jacksonVersion = "2.9.7"
+    jacksonVersion = "2.9.8"
     javaxActivationVersion = "1.1.1"
     // Keeping it version 1.16.1 to be consistent with grpc via PubSub client lib
     // Keeping it version 1.16.1 to be consistent with netty via Firebase lib
     jaxbVersion = "2.3.1"
     junit5Version = "5.3.2"
-    kotlinVersion = "1.3.10"
+    kotlinVersion = "1.3.11"
     kotlinXCoroutinesVersion = "1.0.1"
     mockitoVersion = "2.23.4"
-    neo4jDriverVersion="1.7.1"
+    neo4jDriverVersion="1.7.2"
     neo4jVersion="3.5.0"
-    stripeVersion = "7.8.0"
+    stripeVersion = "7.10.0"
   }
 }
 
-//dependencyUpdates.resolutionStrategy {
-//  componentSelection { rules ->
-//    rules.all { ComponentSelection selection ->
-//      boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'redhat'].any { qualifier ->
-//        selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
-//      }
-//      if (rejected) {
-//        selection.reject('Release candidate')
-//      }
-//    }
-//  }
-//}
\ No newline at end of file
+dependencyUpdates.resolutionStrategy {
+  componentSelection { rules ->
+    rules.all { ComponentSelection selection ->
+      boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'redhat'].any { qualifier ->
+        selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
+      }
+      if (rejected) {
+        selection.reject('Release candidate')
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/client-api/build.gradle b/client-api/build.gradle
index 553481240..57278710e 100644
--- a/client-api/build.gradle
+++ b/client-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.3.10"
+    id "org.jetbrains.kotlin.jvm" version "1.3.11"
     id "java-library"
 }
 
diff --git a/dataflow-pipelines/build.gradle b/dataflow-pipelines/build.gradle
index 60f8ba8f3..dcc6fbd1d 100644
--- a/dataflow-pipelines/build.gradle
+++ b/dataflow-pipelines/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
   id "idea"
diff --git a/diameter-stack/build.gradle b/diameter-stack/build.gradle
index 49e7e3273..8848b733e 100644
--- a/diameter-stack/build.gradle
+++ b/diameter-stack/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
   id "signing"
   id "maven"
diff --git a/diameter-test/build.gradle b/diameter-test/build.gradle
index ea57e1741..acae0223a 100644
--- a/diameter-test/build.gradle
+++ b/diameter-test/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
   id "signing"
   id "maven"
diff --git a/ext-auth-provider/build.gradle b/ext-auth-provider/build.gradle
index 4f1bd7a5f..eb4e4d800 100644
--- a/ext-auth-provider/build.gradle
+++ b/ext-auth-provider/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
 }
diff --git a/firebase-extensions/build.gradle b/firebase-extensions/build.gradle
index 95e9d870b..4ef9311a6 100644
--- a/firebase-extensions/build.gradle
+++ b/firebase-extensions/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/firebase-store/build.gradle b/firebase-store/build.gradle
index 5d05ddc4a..5ab31e234 100644
--- a/firebase-store/build.gradle
+++ b/firebase-store/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/graphql/build.gradle b/graphql/build.gradle
index 570a2c0de..8e65b0b09 100644
--- a/graphql/build.gradle
+++ b/graphql/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/imei-lookup/build.gradle b/imei-lookup/build.gradle
index 401356457..e62ba6bfc 100644
--- a/imei-lookup/build.gradle
+++ b/imei-lookup/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
   id "idea"
 }
diff --git a/jersey/build.gradle b/jersey/build.gradle
index 52f2cc6d3..0c5129ea1 100644
--- a/jersey/build.gradle
+++ b/jersey/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/model/build.gradle b/model/build.gradle
index 70f207c81..e4507b3f0 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/neo4j-store/build.gradle b/neo4j-store/build.gradle
index 7664f1207..318630c2a 100644
--- a/neo4j-store/build.gradle
+++ b/neo4j-store/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/neo4j-store/src/main/kotlin/org/ostelco/prime/storage/graph/Neo4jStore.kt b/neo4j-store/src/main/kotlin/org/ostelco/prime/storage/graph/Neo4jStore.kt
index 0f98b292c..8d84d31e5 100644
--- a/neo4j-store/src/main/kotlin/org/ostelco/prime/storage/graph/Neo4jStore.kt
+++ b/neo4j-store/src/main/kotlin/org/ostelco/prime/storage/graph/Neo4jStore.kt
@@ -472,7 +472,7 @@ object Neo4jStoreSingleton : GraphStore {
 
         return getProduct(subscriberId, sku).fold(
                 {
-                    Either.left(org.ostelco.prime.paymentprocessor.core.NotFoundError("Product ${sku} is unavailable",
+                    Either.left(org.ostelco.prime.paymentprocessor.core.NotFoundError("Product $sku is unavailable",
                             error = it))
                 },
                 {
diff --git a/ocs-ktc/build.gradle b/ocs-ktc/build.gradle
index 46aae68e6..61442bcab 100644
--- a/ocs-ktc/build.gradle
+++ b/ocs-ktc/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/ocs/build.gradle b/ocs/build.gradle
index 5da0f1627..d9a0e5240 100644
--- a/ocs/build.gradle
+++ b/ocs/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/payment-processor/build.gradle b/payment-processor/build.gradle
index 2dadff728..ea441aaca 100644
--- a/payment-processor/build.gradle
+++ b/payment-processor/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
   id "idea"
 }
diff --git a/prime-client-api/build.gradle b/prime-client-api/build.gradle
index f6b63bb55..50d2b3a00 100644
--- a/prime-client-api/build.gradle
+++ b/prime-client-api/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java-library'
-  id 'org.hidetake.swagger.generator' version '2.15.0'
+  id 'org.hidetake.swagger.generator' version '2.15.1'
   id "idea"
 }
 
@@ -21,7 +21,7 @@ sourceSets.main.resources.srcDir "${swaggerSources.'java-client'.code.outputDir}
 
 dependencies {
   // implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
-  swaggerCodegen 'io.swagger:swagger-codegen-cli:2.3.1'
+  swaggerCodegen 'io.swagger:swagger-codegen-cli:2.4.0'
 
   implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
diff --git a/prime-modules/build.gradle b/prime-modules/build.gradle
index fc0195603..ab9bd8dcb 100644
--- a/prime-modules/build.gradle
+++ b/prime-modules/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/prime/build.gradle b/prime/build.gradle
index f522ac050..de4620910 100644
--- a/prime/build.gradle
+++ b/prime/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
   id "idea"
@@ -18,7 +18,7 @@ sourceSets {
   }
 }
 
-version = "1.20.0"
+version = "1.21.0"
 
 repositories {
   maven {
diff --git a/pseudonym-server/build.gradle b/pseudonym-server/build.gradle
index c99e29fea..a33ed458b 100644
--- a/pseudonym-server/build.gradle
+++ b/pseudonym-server/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/sim-administration/pom.xml b/sim-administration/pom.xml
index 2fe2e9264..49d2ca3be 100644
--- a/sim-administration/pom.xml
+++ b/sim-administration/pom.xml
@@ -28,7 +28,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <dropwizard.version>1.3.7</dropwizard.version>
-        <kotlin.version>1.3.10</kotlin.version>
+        <kotlin.version>1.3.11</kotlin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
diff --git a/slack/build.gradle b/slack/build.gradle
index 6785be750..2932ffbf5 100644
--- a/slack/build.gradle
+++ b/slack/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "java-library"
 }
 
diff --git a/tools/neo4j-admin-tools/build.gradle b/tools/neo4j-admin-tools/build.gradle
index e4d046771..07c0f072d 100644
--- a/tools/neo4j-admin-tools/build.gradle
+++ b/tools/neo4j-admin-tools/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.3.10"
+  id "org.jetbrains.kotlin.jvm" version "1.3.11"
   id "application"
   id "com.github.johnrengelman.shadow" version "4.0.3"
   id "idea"