diff --git a/LICENSE b/LICENSE
index 9280d938d..b5fc974ea 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             Lightbend, Inc.
-Licensed Work:        Akka Projection 1.5.7
+Licensed Work:        Akka Projection 1.5.8
                       This license applies to all sub directories and files
                       UNLESS another license file is present in a sub
                       directory, then that other license applies to all files
@@ -19,7 +19,7 @@ Additional Use Grant:
     Connecting to a Play Framework websocket and/or Play Framework
     request/response bodies for server and play-ws client.
 
-Change Date:          2027-10-02
+Change Date:          2027-10-16
 
 Change License:       Apache License, Version 2.0
 
diff --git a/samples/grpc/iot-service-java/pom.xml b/samples/grpc/iot-service-java/pom.xml
index 5dca2d409..f1c2505be 100644
--- a/samples/grpc/iot-service-java/pom.xml
+++ b/samples/grpc/iot-service-java/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.6</akka.version>
-        <akka-projection.version>1.5.7</akka-projection.version>
+        <akka-projection.version>1.5.8</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.5</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.2</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
diff --git a/samples/grpc/iot-service-scala/build.sbt b/samples/grpc/iot-service-scala/build.sbt
index cc5fb4438..f48af5e27 100644
--- a/samples/grpc/iot-service-scala/build.sbt
+++ b/samples/grpc/iot-service-scala/build.sbt
@@ -33,7 +33,7 @@ val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"
 val AkkaProjectionVersion =
-  sys.props.getOrElse("akka-projection.version", "1.5.7")
+  sys.props.getOrElse("akka-projection.version", "1.5.8")
 val AkkaDiagnosticsVersion = "2.1.1"
 
 enablePlugins(AkkaGrpcPlugin)
diff --git a/samples/grpc/local-drone-control-java/pom.xml b/samples/grpc/local-drone-control-java/pom.xml
index d5cbc4cba..605d27887 100644
--- a/samples/grpc/local-drone-control-java/pom.xml
+++ b/samples/grpc/local-drone-control-java/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.6</akka.version>
-        <akka-projection.version>1.5.7</akka-projection.version>
+        <akka-projection.version>1.5.8</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.5</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.2</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
diff --git a/samples/grpc/local-drone-control-scala/build.sbt b/samples/grpc/local-drone-control-scala/build.sbt
index 9058195e4..bb05b6bd7 100644
--- a/samples/grpc/local-drone-control-scala/build.sbt
+++ b/samples/grpc/local-drone-control-scala/build.sbt
@@ -35,7 +35,7 @@ val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"
 val AkkaProjectionVersion =
-  sys.props.getOrElse("akka-projection.version", "1.5.7")
+  sys.props.getOrElse("akka-projection.version", "1.5.8")
 val AkkaDiagnosticsVersion = "2.1.0"
 
 enablePlugins(AkkaGrpcPlugin)
diff --git a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt
index f43422882..ccdb1f9c7 100644
--- a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt
+++ b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt
@@ -33,7 +33,7 @@ val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"
 val AkkaProjectionVersion =
-  sys.props.getOrElse("akka-projection.version", "1.5.7")
+  sys.props.getOrElse("akka-projection.version", "1.5.8")
 val AkkaDiagnosticsVersion = "2.1.1"
 
 enablePlugins(AkkaGrpcPlugin)
diff --git a/samples/grpc/shopping-analytics-service-java/pom.xml b/samples/grpc/shopping-analytics-service-java/pom.xml
index 70d93b48e..43c75c9ac 100644
--- a/samples/grpc/shopping-analytics-service-java/pom.xml
+++ b/samples/grpc/shopping-analytics-service-java/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.6</akka.version>
-        <akka-projection.version>1.5.7</akka-projection.version>
+        <akka-projection.version>1.5.8</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.5</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.1</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
diff --git a/samples/grpc/shopping-analytics-service-scala/build.sbt b/samples/grpc/shopping-analytics-service-scala/build.sbt
index d4b158c8f..6025136d0 100644
--- a/samples/grpc/shopping-analytics-service-scala/build.sbt
+++ b/samples/grpc/shopping-analytics-service-scala/build.sbt
@@ -33,7 +33,7 @@ val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.1"
 val AkkaPersistenceR2dbcVersion = "1.2.5"
 val AkkaProjectionVersion =
-  sys.props.getOrElse("akka-projection.version", "1.5.7")
+  sys.props.getOrElse("akka-projection.version", "1.5.8")
 val AkkaDiagnosticsVersion = "2.1.0"
 
 enablePlugins(AkkaGrpcPlugin)
diff --git a/samples/grpc/shopping-cart-service-java/pom.xml b/samples/grpc/shopping-cart-service-java/pom.xml
index 4c354499c..691c33734 100644
--- a/samples/grpc/shopping-cart-service-java/pom.xml
+++ b/samples/grpc/shopping-cart-service-java/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.6</akka.version>
-        <akka-projection.version>1.5.7</akka-projection.version>
+        <akka-projection.version>1.5.8</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.5</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.1</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
diff --git a/samples/grpc/shopping-cart-service-scala/build.sbt b/samples/grpc/shopping-cart-service-scala/build.sbt
index 3d2381dc8..8c3d488c7 100644
--- a/samples/grpc/shopping-cart-service-scala/build.sbt
+++ b/samples/grpc/shopping-cart-service-scala/build.sbt
@@ -33,7 +33,7 @@ val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"
 val AkkaProjectionVersion =
-  sys.props.getOrElse("akka-projection.version", "1.5.7")
+  sys.props.getOrElse("akka-projection.version", "1.5.8")
 val AkkaDiagnosticsVersion = "2.1.1"
 
 enablePlugins(AkkaGrpcPlugin)
diff --git a/samples/replicated/shopping-cart-service-java/pom.xml b/samples/replicated/shopping-cart-service-java/pom.xml
index 68626f110..bf8aa3dc1 100644
--- a/samples/replicated/shopping-cart-service-java/pom.xml
+++ b/samples/replicated/shopping-cart-service-java/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.1</akka.version>
-        <akka-projection.version>1.5.7</akka-projection.version>
+        <akka-projection.version>1.5.8</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.2</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.0</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
diff --git a/samples/replicated/shopping-cart-service-scala/build.sbt b/samples/replicated/shopping-cart-service-scala/build.sbt
index 9a4efbb42..471d639fa 100644
--- a/samples/replicated/shopping-cart-service-scala/build.sbt
+++ b/samples/replicated/shopping-cart-service-scala/build.sbt
@@ -34,7 +34,7 @@ val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"
 val AkkaProjectionVersion =
-  sys.props.getOrElse("akka-projection.version", "1.5.7")
+  sys.props.getOrElse("akka-projection.version", "1.5.8")
 val AkkaDiagnosticsVersion = "2.1.1"
 
 enablePlugins(AkkaGrpcPlugin)