diff --git a/pom.xml b/pom.xml
index d6da1898248b58e169d6b9bf427311ff8d153785..0912a01cca86d052d447b39e907056c2dd274aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
         <spring-data-jpa.version>1.10.11.RELEASE</spring-data-jpa.version>
         <spring-boot-starter-actuator.version>1.4.7.RELEASE</spring-boot-starter-actuator.version>
         <aspectjweaver.version>1.8.9</aspectjweaver.version>
-        <woken-messages.version>2.7.4</woken-messages.version>
+        <woken-messages.version>2.7.5</woken-messages.version>
         <javax-inject.version>1</javax-inject.version>
         <akka.version>2.5.12</akka.version>
         <spring-context.version>4.3.4.RELEASE</spring-context.version>
diff --git a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
index d2f285d4582537c714837d16c17f934f08bc6831..4f4ae846fc8b0e89d3a87c334f03a32948026846 100644
--- a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
@@ -52,7 +52,7 @@ class AkkaConfiguration {
     public ExtendedActorSystem actorSystem() {
         LOGGER.info("Step 1/3: Starting actor system...");
         LOGGER.info("Create actor system at " + wokenClusterHost() + ":" + wokenClusterPort());
-        ExtendedActorSystem system = (ExtendedActorSystem) ActorSystem.create("woken", config);
+        ExtendedActorSystem system = (ExtendedActorSystem) ActorSystem.create(wokenClusterName(), config);
         SPRING_EXTENSION_PROVIDER.get(system).initialize(applicationContext);
         return system;
     }
@@ -95,6 +95,11 @@ class AkkaConfiguration {
         return config.getString("clustering.ip");
     }
 
+    @Bean
+    public String wokenClusterName() {
+        return config.getString("clustering.cluster.name");
+    }
+
     @Bean
     public Integer wokenClusterPort() {
         return config.getInt("clustering.port");