diff --git a/akka-javasdk-maven/akka-javasdk-parent/pom.xml b/akka-javasdk-maven/akka-javasdk-parent/pom.xml
index b67928835..189b50671 100644
--- a/akka-javasdk-maven/akka-javasdk-parent/pom.xml
+++ b/akka-javasdk-maven/akka-javasdk-parent/pom.xml
@@ -38,7 +38,7 @@
 
         <!-- These are dependent on runtime environment and cannot be customized by users -->
         <maven.compiler.release>21</maven.compiler.release>
-        <kalix-runtime.version>1.3.0-98fe2a3</kalix-runtime.version>
+        <kalix-runtime.version>1.3.0-cb36dd2e</kalix-runtime.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <skip.docker>false</skip.docker>
diff --git a/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala b/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala
index 9e8bf7fa3..06a49a5f2 100644
--- a/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala
+++ b/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala
@@ -450,7 +450,7 @@ private final class Sdk(
               })
         }
         eventSourcedEntityDescriptors :+=
-          new EventSourcedEntityDescriptor(componentId, readOnlyCommandNames, instanceFactory)
+          new EventSourcedEntityDescriptor(componentId, clz.getName, readOnlyCommandNames, instanceFactory)
 
       case clz if classOf[KeyValueEntity[_]].isAssignableFrom(clz) =>
         val componentId = clz.getAnnotation(classOf[ComponentId]).value
@@ -475,7 +475,7 @@ private final class Sdk(
               })
         }
         keyValueEntityDescriptors :+=
-          new EventSourcedEntityDescriptor(componentId, readOnlyCommandNames, instanceFactory)
+          new EventSourcedEntityDescriptor(componentId, clz.getName, readOnlyCommandNames, instanceFactory)
 
       case clz if Reflect.isWorkflow(clz) =>
         val componentId = clz.getAnnotation(classOf[ComponentId]).value
@@ -491,6 +491,7 @@ private final class Sdk(
         workflowDescriptors :+=
           new WorkflowDescriptor(
             componentId,
+            clz.getName,
             readOnlyCommandNames,
             ctx => workflowInstanceFactory(ctx, clz.asInstanceOf[Class[Workflow[Nothing]]]))
 
@@ -509,7 +510,7 @@ private final class Sdk(
             serializer,
             ComponentDescriptor.descriptorFor(timedActionClass, serializer))
         timedActionDescriptors :+=
-          new TimedActionDescriptor(componentId, timedActionSpi)
+          new TimedActionDescriptor(componentId, clz.getName, timedActionSpi)
 
       case clz if classOf[Consumer].isAssignableFrom(clz) =>
         val componentId = clz.getAnnotation(classOf[ComponentId]).value
@@ -529,6 +530,7 @@ private final class Sdk(
         consumerDescriptors :+=
           new ConsumerDescriptor(
             componentId,
+            clz.getName,
             consumerSource(consumerClass),
             consumerDestination(consumerClass),
             timedActionSpi)
diff --git a/akka-javasdk/src/main/scala/akka/javasdk/impl/view/ViewDescriptorFactory.scala b/akka-javasdk/src/main/scala/akka/javasdk/impl/view/ViewDescriptorFactory.scala
index 93f28e55f..7a73c2785 100644
--- a/akka-javasdk/src/main/scala/akka/javasdk/impl/view/ViewDescriptorFactory.scala
+++ b/akka-javasdk/src/main/scala/akka/javasdk/impl/view/ViewDescriptorFactory.scala
@@ -112,6 +112,7 @@ private[impl] object ViewDescriptorFactory {
 
     new SpiViewDescriptor(
       componentId,
+      viewClass.getName,
       tables,
       queries = allQueryMethods.map(_.descriptor),
       // FIXME reintroduce ACLs (does JWT make any sense here? I don't think so)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index dd616eedd..f27ea7067 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -8,7 +8,7 @@ object Dependencies {
     val ProtocolVersionMinor = 1
     val RuntimeImage = "gcr.io/kalix-public/kalix-runtime"
     // Remember to bump kalix-runtime.version in akka-javasdk-maven/akka-javasdk-parent if bumping this
-    val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.3.0-98fe2a3")
+    val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.3.0-cb36dd2e")
   }
   // NOTE: embedded SDK should have the AkkaVersion aligned, when updating RuntimeVersion, make sure to check
   // if AkkaVersion and AkkaHttpVersion are aligned