diff --git a/pom.xml b/pom.xml
index 2f17e7c37..a87344cc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,23 +24,23 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.7</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-core</artifactId>
-  <version>6.18-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements Core</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.8</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-subsystem-migration-manager</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -79,13 +79,13 @@
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-scheduler</artifactId>
-      <version>6.2</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-mailsender</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/src/main/java/com/celements/web/service/CelementsWebScriptService.java b/src/main/java/com/celements/web/service/CelementsWebScriptService.java
index 1acb25495..9fa1dd248 100644
--- a/src/main/java/com/celements/web/service/CelementsWebScriptService.java
+++ b/src/main/java/com/celements/web/service/CelementsWebScriptService.java
@@ -69,6 +69,7 @@
 import com.celements.rendering.RenderCommand;
 import com.celements.sajson.Builder;
 import com.celements.sajson.JsonScriptService;
+import com.celements.servlet.NodeConfig.NodeIdentity;
 import com.celements.validation.ValidationType;
 import com.celements.web.plugin.cmd.AddTranslationCommand;
 import com.celements.web.plugin.cmd.AttachmentURLCommand;
@@ -162,8 +163,12 @@ private XWikiContext getContext() {
     return (XWikiContext) execution.getContext().getProperty("xwikicontext");
   }
 
+  public NodeIdentity getNodeIdentity() {
+    return getBeanFactory().getBean(NodeIdentity.class);
+  }
+
   public String getNodeName() {
-    return getBeanFactory().getBean("nodeName", String.class);
+    return getNodeIdentity().nodeName();
   }
 
   /**