diff --git a/CHANGELOG.md b/CHANGELOG.md
index 290f156f9..09e36e7d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development version 2.3.5
+
+**Internal changes & Bugfixes**
+
+
 ## Release version 2.3.4
 
 **Internal changes & Bugfixes**
diff --git a/FROST-Server.Auth.Basic/pom.xml b/FROST-Server.Auth.Basic/pom.xml
index a99ac93b4..decb26c0b 100644
--- a/FROST-Server.Auth.Basic/pom.xml
+++ b/FROST-Server.Auth.Basic/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Auth.Basic</artifactId>
diff --git a/FROST-Server.Auth.Keycloak/pom.xml b/FROST-Server.Auth.Keycloak/pom.xml
index c12fcb832..b9dce66b0 100644
--- a/FROST-Server.Auth.Keycloak/pom.xml
+++ b/FROST-Server.Auth.Keycloak/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Auth.Keycloak</artifactId>
diff --git a/FROST-Server.Core.Model/pom.xml b/FROST-Server.Core.Model/pom.xml
index a44e07566..cc8be654a 100644
--- a/FROST-Server.Core.Model/pom.xml
+++ b/FROST-Server.Core.Model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Core.Model</artifactId>
diff --git a/FROST-Server.Core/pom.xml b/FROST-Server.Core/pom.xml
index 0b56ed781..42ae19901 100644
--- a/FROST-Server.Core/pom.xml
+++ b/FROST-Server.Core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Core</artifactId>
diff --git a/FROST-Server.HTTP.Common/pom.xml b/FROST-Server.HTTP.Common/pom.xml
index 92b8e293a..dba61c5ba 100644
--- a/FROST-Server.HTTP.Common/pom.xml
+++ b/FROST-Server.HTTP.Common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.HTTP.Common</artifactId>
diff --git a/FROST-Server.HTTP/pom.xml b/FROST-Server.HTTP/pom.xml
index 317381c1c..7b510d9c5 100644
--- a/FROST-Server.HTTP/pom.xml
+++ b/FROST-Server.HTTP/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.HTTP</artifactId>
diff --git a/FROST-Server.MQTT.Moquette/pom.xml b/FROST-Server.MQTT.Moquette/pom.xml
index 89fca1a8b..9d88af798 100644
--- a/FROST-Server.MQTT.Moquette/pom.xml
+++ b/FROST-Server.MQTT.Moquette/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.MQTT.Moquette</artifactId>
diff --git a/FROST-Server.MQTT/pom.xml b/FROST-Server.MQTT/pom.xml
index 937a2382f..95056b95a 100644
--- a/FROST-Server.MQTT/pom.xml
+++ b/FROST-Server.MQTT/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.MQTT</artifactId>
diff --git a/FROST-Server.MQTTP/pom.xml b/FROST-Server.MQTTP/pom.xml
index f7d420c10..f7b213a07 100644
--- a/FROST-Server.MQTTP/pom.xml
+++ b/FROST-Server.MQTTP/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.MQTTP</artifactId>
diff --git a/FROST-Server.SQLjooq/pom.xml b/FROST-Server.SQLjooq/pom.xml
index e51bddcfb..93c9df674 100644
--- a/FROST-Server.SQLjooq/pom.xml
+++ b/FROST-Server.SQLjooq/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.SQLjooq</artifactId>
diff --git a/FROST-Server.Tests/pom.xml b/FROST-Server.Tests/pom.xml
index 74da8e95f..48ddc1703 100644
--- a/FROST-Server.Tests/pom.xml
+++ b/FROST-Server.Tests/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Tests</artifactId>
diff --git a/FROST-Server.Util/pom.xml b/FROST-Server.Util/pom.xml
index ab1844f3a..3e2fb9663 100644
--- a/FROST-Server.Util/pom.xml
+++ b/FROST-Server.Util/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Util</artifactId>
diff --git a/Plugins/Actuation/pom.xml b/Plugins/Actuation/pom.xml
index 4bd350996..67f37d298 100644
--- a/Plugins/Actuation/pom.xml
+++ b/Plugins/Actuation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.Actuation</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/BatchProcessing/pom.xml b/Plugins/BatchProcessing/pom.xml
index 63182d503..7b3e4bab1 100644
--- a/Plugins/BatchProcessing/pom.xml
+++ b/Plugins/BatchProcessing/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.BatchProcessing</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/CoreModel/pom.xml b/Plugins/CoreModel/pom.xml
index 1667cf3a0..83e0ee243 100644
--- a/Plugins/CoreModel/pom.xml
+++ b/Plugins/CoreModel/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.CoreModel</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/FormatCsv/pom.xml b/Plugins/FormatCsv/pom.xml
index d96db175e..6f34f31b2 100644
--- a/Plugins/FormatCsv/pom.xml
+++ b/Plugins/FormatCsv/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.FormatCsv</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/FormatDataArray/pom.xml b/Plugins/FormatDataArray/pom.xml
index 10eac884e..55b7334cb 100644
--- a/Plugins/FormatDataArray/pom.xml
+++ b/Plugins/FormatDataArray/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.FormatDataArray</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/FormatGeoJson/pom.xml b/Plugins/FormatGeoJson/pom.xml
index 061f27df1..9c120adb5 100644
--- a/Plugins/FormatGeoJson/pom.xml
+++ b/Plugins/FormatGeoJson/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.FormatGeoJson</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/ModelLoader/pom.xml b/Plugins/ModelLoader/pom.xml
index 3c5943d97..0727ad201 100644
--- a/Plugins/ModelLoader/pom.xml
+++ b/Plugins/ModelLoader/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelLoader</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/MultiDatastream/pom.xml b/Plugins/MultiDatastream/pom.xml
index 5bd76a210..563cd9dc1 100644
--- a/Plugins/MultiDatastream/pom.xml
+++ b/Plugins/MultiDatastream/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.MultiDatastream</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/OData/pom.xml b/Plugins/OData/pom.xml
index 82b3e93f7..019602a78 100644
--- a/Plugins/OData/pom.xml
+++ b/Plugins/OData/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.OData</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/OpenApi/pom.xml b/Plugins/OpenApi/pom.xml
index e1af96d77..87aa6a2eb 100644
--- a/Plugins/OpenApi/pom.xml
+++ b/Plugins/OpenApi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.OpenApi</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/pom.xml b/Plugins/pom.xml
index a35380237..9098f1284 100644
--- a/Plugins/pom.xml
+++ b/Plugins/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Tools/ModelEditor/pom.xml b/Tools/ModelEditor/pom.xml
index a43717f21..5a51cb697 100644
--- a/Tools/ModelEditor/pom.xml
+++ b/Tools/ModelEditor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Tools</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Tools/ModelExtractor/pom.xml b/Tools/ModelExtractor/pom.xml
index ac22b7945..93ad41b0a 100644
--- a/Tools/ModelExtractor/pom.xml
+++ b/Tools/ModelExtractor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Tools</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Tools/pom.xml b/Tools/pom.xml
index b085ef7cc..9b83eb254 100644
--- a/Tools/pom.xml
+++ b/Tools/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-ServerParent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>FROST-Server.Tools</artifactId>
diff --git a/helm/frost-server/Chart.yaml b/helm/frost-server/Chart.yaml
index 81ad54ea4..1c30147e2 100644
--- a/helm/frost-server/Chart.yaml
+++ b/helm/frost-server/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: frost-server
-version: 2.3.4
-appVersion: 2.3.4
+version: 2.3.5
+appVersion: 2.3.5
 description: The FROST-Server (FRaunhofer Opensource SensorThings-Server) is the first complete, open-source implementation of the OGC SensorThings API Part 1 (Sensing).
 keywords:
   - sensorthings-api
diff --git a/helm/frost-server/values.yaml b/helm/frost-server/values.yaml
index 85c3fcbcc..6e49bd906 100644
--- a/helm/frost-server/values.yaml
+++ b/helm/frost-server/values.yaml
@@ -108,7 +108,7 @@ frost:
     image:
       registry: docker.io
       repository: fraunhoferiosb/frost-server-http
-      tag: 2.3.4
+      tag: 2.3.5
       pullPolicy: IfNotPresent
       imagePullSecret:
     # FROST-Server HTTP deployment settings
@@ -187,7 +187,7 @@ frost:
     image:
       registry: docker.io
       repository: fraunhoferiosb/frost-server-mqtt
-      tag: 2.3.4
+      tag: 2.3.5
       pullPolicy: IfNotPresent
       imagePullSecret:
     # FROST-Server MQTT deployment settings
diff --git a/pom.xml b/pom.xml
index 273f95524..3ee938ac4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
     <artifactId>FROST-ServerParent</artifactId>
-    <version>2.3.4</version>
+    <version>2.3.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>FROST-ServerParent</name>
@@ -54,7 +54,7 @@
     <scm>
         <connection>scm:git:git://github.com/FraunhoferIOSB/SensorThingsServer.git</connection>
         <developerConnection>scm:git:ssh://github.com:FraunhoferIOSB/SensorThingsServer.git</developerConnection>
-        <tag>v2.3.4</tag>
+        <tag>HEAD</tag>
         <url>https://github.com/FraunhoferIOSB/FROST-Server/tree/v2.x</url>
     </scm>