diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local
index a146a060c..ee95ad1d7 100644
--- a/docker/Dockerfile-local
+++ b/docker/Dockerfile-local
@@ -5,11 +5,12 @@
 #  \___\___|_|\___|_| |_| |_|\___|_| |_|\__|___/ #
 #                                                #
 
-FROM tomcat:9-jdk11-temurin
+FROM tomcat:10-jdk21-temurin
 
 # environment variables, may be overridden from the .env file
 # celements
 ENV CELEMENTS_DATA=/usr/local/celements
+ENV CONF_DIR=/usr/local/conf
 # tomcat
 ENV CATALINA_XMX="2g"
 # tomcat jpda debugging
@@ -17,13 +18,15 @@ ENV JPDA_ADDRESS="8000"
 ENV JPDA_TRANSPORT="dt_socket"
 
 # copy configurations / scripts
-COPY docker/tomcat /usr/local/config
+COPY docker/tomcat ${CONF_DIR}
 
 # installs and setup
 RUN mkdir -p \
-${CELEMENTS_DATA} \
-${CATALINA_HOME}/temp \
-&& cp /usr/local/config/setenv.sh ${CATALINA_HOME}/bin/
+    ${CELEMENTS_DATA} \
+    ${CATALINA_HOME}/temp \
+    ${CATALINA_HOME}/conf/Catalina/localhost \
+  && cp ${CONF_DIR}/setenv.sh ${CATALINA_HOME}/bin/ \
+  && cp ${CONF_DIR}/jakarta.converter.xml ${CATALINA_HOME}/conf/Catalina/localhost/ROOT.xml
 
 # define custom command (with remote debugging)
 CMD ["catalina.sh", "jpda", "run"]
diff --git a/docker/tomcat/jakarta.converter.xml b/docker/tomcat/jakarta.converter.xml
new file mode 100644
index 000000000..ab2aed44d
--- /dev/null
+++ b/docker/tomcat/jakarta.converter.xml
@@ -0,0 +1,4 @@
+<!-- Run legacy javax.* on Tomcat 10  -->
+<Context>
+  <Loader jakartaConverter="TOMCAT" />
+</Context>
diff --git a/pom.xml b/pom.xml
index f7a57f90f..f9562f7c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,17 +22,19 @@
  *
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <url>https://github.com/celements/celements-web</url>
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celementsweb</artifactId>
-    <version>6.3</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-web</artifactId>
   <packaging>war</packaging>
-  <version>6.11-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <name>Celements Webapplication</name>
   <licenses>
     <license>
@@ -100,12 +102,12 @@
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-scheduler</artifactId>
-      <version>6.2</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-mailsender</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.xpn.xwiki.platform.plugins</groupId>
@@ -130,43 +132,43 @@
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>blog-web</artifactId>
-      <version>6.6</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>calendar-web</artifactId>
-      <version>6.2</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>image-web</artifactId>
-      <version>6.5</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>tinymce-langs</artifactId>
-      <version>3.4.3.2-celRTE</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>tinymce-langs-v4</artifactId>
-      <version>4.9.11-CEL5</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>tinymce-langs-v6</artifactId>
-      <version>6.8.3-CEL6</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-richtext-web</artifactId>
-      <version>6.4</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
@@ -176,19 +178,19 @@
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-wiki-manager-web</artifactId>
-      <version>6.1</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-user-manager-web</artifactId>
-      <version>6.3</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-layout-web</artifactId>
-      <version>6.4</version>
+      <version>7.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
 
@@ -196,87 +198,87 @@
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-commons</artifactId>
-      <version>6.2</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-xwiki-core</artifactId>
-      <version>6.11</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-global-redirect</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-component</artifactId>
-      <version>6.1</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-reference</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-observation</artifactId>
-      <version>6.2</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-servlet</artifactId>
-      <version>6.3</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-config-source-api</artifactId>
-      <version>6.2</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-config-source</artifactId>
-      <version>6.2</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.8</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.17</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-search</artifactId>
-      <version>6.5</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-captcha</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-subsystem-migration-manager</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-spring-mvc</artifactId>
-      <version>6.3</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-spring-security</artifactId>
-      <version>6.4</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-keycloak</artifactId>
-      <version>6.2</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Spring -->
@@ -445,7 +447,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.6.2</version>
         <executions>
           <execution>
             <id>enforce-dependency-convergence</id>
diff --git a/sample.env b/sample.env
index 89811fa9e..6c717c77d 100644
--- a/sample.env
+++ b/sample.env
@@ -19,5 +19,7 @@ TZ=Europe/Zurich
 CATALINA_XMX=2g
 
 # celements
+APP_NAME=celements
+CLUSTER_NAME=local
 NODE_NAME=local1
 CELEMENTS_DATA=/usr/local/celements
diff --git a/src/main/webapp/WEB-INF/xwiki.properties b/src/main/webapp/WEB-INF/xwiki.properties
index 27907cd08..a08f9fea5 100644
--- a/src/main/webapp/WEB-INF/xwiki.properties
+++ b/src/main/webapp/WEB-INF/xwiki.properties
@@ -224,8 +224,6 @@ kafka.servers=
 #-------------------------------------------------------------------------------------
 # empty->disable remote observation, kafka->use kafka
 celements.observation.remote=
-# kafka topic name
-celements.observation.remote.kafka.topic=
 # kafka payload encryption (optional)
 # openssl rand -base64 32
 celements.observation.remote.kafka.crypto.pass=