diff --git a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml
index f6eba8748d..931b6e666b 100644
--- a/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml
+++ b/maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml
@@ -2,7 +2,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml b/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml
index fa6db6c085..617efbcf56 100644
--- a/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml
+++ b/maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml
@@ -2,7 +2,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 7802f965f5..9eaf556196 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -5,7 +5,7 @@ object Dependencies {
   object AkkaServerless {
     val ProtocolVersionMajor = 0
     val ProtocolVersionMinor = 8
-    val FrameworkVersion = "0.8.5"
+    val FrameworkVersion = "0.8.6"
   }
 
   // changing the Scala version of the Java SDK affects end users
diff --git a/samples/java-customer-registry-quickstart/docker-compose.yml b/samples/java-customer-registry-quickstart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-customer-registry-quickstart/docker-compose.yml
+++ b/samples/java-customer-registry-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-customer-registry-views-quickstart/docker-compose.yml b/samples/java-customer-registry-views-quickstart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-customer-registry-views-quickstart/docker-compose.yml
+++ b/samples/java-customer-registry-views-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-eventsourced-counter/docker-compose.yml b/samples/java-eventsourced-counter/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-eventsourced-counter/docker-compose.yml
+++ b/samples/java-eventsourced-counter/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-eventsourced-shopping-cart/docker-compose.yml b/samples/java-eventsourced-shopping-cart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-eventsourced-shopping-cart/docker-compose.yml
+++ b/samples/java-eventsourced-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-fibonacci-action/docker-compose.yml b/samples/java-fibonacci-action/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-fibonacci-action/docker-compose.yml
+++ b/samples/java-fibonacci-action/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-first-service/docker-compose.yml b/samples/java-first-service/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-first-service/docker-compose.yml
+++ b/samples/java-first-service/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-replicatedentity-examples/docker-compose.yml b/samples/java-replicatedentity-examples/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-replicatedentity-examples/docker-compose.yml
+++ b/samples/java-replicatedentity-examples/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-replicatedentity-shopping-cart/docker-compose.yml b/samples/java-replicatedentity-shopping-cart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-replicatedentity-shopping-cart/docker-compose.yml
+++ b/samples/java-replicatedentity-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-shopping-cart-quickstart/docker-compose.yml b/samples/java-shopping-cart-quickstart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-shopping-cart-quickstart/docker-compose.yml
+++ b/samples/java-shopping-cart-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-valueentity-counter/docker-compose.yml b/samples/java-valueentity-counter/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-valueentity-counter/docker-compose.yml
+++ b/samples/java-valueentity-counter/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-valueentity-customer-registry/docker-compose.yml b/samples/java-valueentity-customer-registry/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-valueentity-customer-registry/docker-compose.yml
+++ b/samples/java-valueentity-customer-registry/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/java-valueentity-shopping-cart/docker-compose.yml b/samples/java-valueentity-shopping-cart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/java-valueentity-shopping-cart/docker-compose.yml
+++ b/samples/java-valueentity-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-customer-registry-quickstart/docker-compose.yml b/samples/scala-customer-registry-quickstart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-customer-registry-quickstart/docker-compose.yml
+++ b/samples/scala-customer-registry-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-eventsourced-counter/docker-compose.yml b/samples/scala-eventsourced-counter/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-eventsourced-counter/docker-compose.yml
+++ b/samples/scala-eventsourced-counter/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-eventsourced-customer-registry/docker-compose.yml b/samples/scala-eventsourced-customer-registry/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-eventsourced-customer-registry/docker-compose.yml
+++ b/samples/scala-eventsourced-customer-registry/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-eventsourced-shopping-cart/docker-compose.yml b/samples/scala-eventsourced-shopping-cart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-eventsourced-shopping-cart/docker-compose.yml
+++ b/samples/scala-eventsourced-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-fibonacci-action/docker-compose.yml b/samples/scala-fibonacci-action/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-fibonacci-action/docker-compose.yml
+++ b/samples/scala-fibonacci-action/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-first-service/docker-compose.yml b/samples/scala-first-service/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-first-service/docker-compose.yml
+++ b/samples/scala-first-service/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-replicatedentity-examples/docker-compose.yml b/samples/scala-replicatedentity-examples/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-replicatedentity-examples/docker-compose.yml
+++ b/samples/scala-replicatedentity-examples/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-replicatedentity-shopping-cart/docker-compose.yml b/samples/scala-replicatedentity-shopping-cart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-replicatedentity-shopping-cart/docker-compose.yml
+++ b/samples/scala-replicatedentity-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-valueentity-counter/docker-compose.yml b/samples/scala-valueentity-counter/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-valueentity-counter/docker-compose.yml
+++ b/samples/scala-valueentity-counter/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-valueentity-customer-registry/docker-compose.yml b/samples/scala-valueentity-customer-registry/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-valueentity-customer-registry/docker-compose.yml
+++ b/samples/scala-valueentity-customer-registry/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"
diff --git a/samples/scala-valueentity-shopping-cart/docker-compose.yml b/samples/scala-valueentity-shopping-cart/docker-compose.yml
index 6475f66799..268baf5c97 100644
--- a/samples/scala-valueentity-shopping-cart/docker-compose.yml
+++ b/samples/scala-valueentity-shopping-cart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   akka-serverless-proxy:
-    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.5
+    image: gcr.io/akkaserverless-public/akkaserverless-proxy:0.8.6
     command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator
     ports:
       - "9000:9000"