diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32be95d37..a34dd80cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development version 2.4.1
+
+**Internal changes & Bugfixes**
+
+
 ## Release version 2.4.0
 
 **New Features**
diff --git a/FROST-Server.Auth.Basic/pom.xml b/FROST-Server.Auth.Basic/pom.xml
index ce1c1ce50..67c0f9074 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.4.0</version>
+        <version>2.4.1-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 3a31e5c50..87ac4f496 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.4.0</version>
+        <version>2.4.1-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 63e92ec6e..4228b93b6 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.4.0</version>
+        <version>2.4.1-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 6efec6c7a..cae00a830 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.4.0</version>
+        <version>2.4.1-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 843ce8774..dd30baed8 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.4.0</version>
+        <version>2.4.1-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 6c2a08442..a900ac240 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.4.0</version>
+        <version>2.4.1-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 2a44b7df5..95848d0ff 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.4.0</version>
+        <version>2.4.1-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 4bf75c97c..cca1c8083 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.4.0</version>
+        <version>2.4.1-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 262e7f836..066cd6fd6 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.4.0</version>
+        <version>2.4.1-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 dcb0cf50f..7793522a4 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.4.0</version>
+        <version>2.4.1-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 43b3d2b26..8f8a4c77f 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.4.0</version>
+        <version>2.4.1-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 2aa255034..a34c69502 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.4.0</version>
+        <version>2.4.1-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 1c0dad502..9945973da 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.4.0</version>
+        <version>2.4.1-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 df7ea0948..d32866450 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.4.0</version>
+        <version>2.4.1-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 f7a09f2ac..3fe038acc 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.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.CoreModel</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/CoreModelV2/pom.xml b/Plugins/CoreModelV2/pom.xml
index 23b34879b..596ae4fa4 100644
--- a/Plugins/CoreModelV2/pom.xml
+++ b/Plugins/CoreModelV2/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.CoreModelV2</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/FormatCsv/pom.xml b/Plugins/FormatCsv/pom.xml
index 47a233b2a..5e3ecf9bd 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.4.0</version>
+        <version>2.4.1-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 c1076682d..f89985a0c 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.4.0</version>
+        <version>2.4.1-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 8c3df5e85..7d87c4b75 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.4.0</version>
+        <version>2.4.1-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 558d90eb5..d233b9e8e 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.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelLoader</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/ModelOM/pom.xml b/Plugins/ModelOM/pom.xml
index 6739ebf09..45679a935 100644
--- a/Plugins/ModelOM/pom.xml
+++ b/Plugins/ModelOM/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelOM</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/ModelRelations/pom.xml b/Plugins/ModelRelations/pom.xml
index dbb9e254c..02597edcd 100644
--- a/Plugins/ModelRelations/pom.xml
+++ b/Plugins/ModelRelations/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelRelations</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/ModelSampling/pom.xml b/Plugins/ModelSampling/pom.xml
index 4b22b86bc..99e0b5a8c 100644
--- a/Plugins/ModelSampling/pom.xml
+++ b/Plugins/ModelSampling/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.ModelSampling</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/MultiDatastream/pom.xml b/Plugins/MultiDatastream/pom.xml
index 8656b0393..1a234be43 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.4.0</version>
+        <version>2.4.1-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 9dcab133e..27ba4d39b 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.4.0</version>
+        <version>2.4.1-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 952d31ae5..bdb3afde6 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.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.OpenApi</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/Projects/pom.xml b/Plugins/Projects/pom.xml
index 134c4ca5d..ccd6368f7 100644
--- a/Plugins/Projects/pom.xml
+++ b/Plugins/Projects/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId>
         <artifactId>FROST-Server.Plugins</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>FROST-Server.Plugin.Projects</artifactId>
     <packaging>jar</packaging>
diff --git a/Plugins/pom.xml b/Plugins/pom.xml
index 385314360..2ff75533f 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.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Tools/ModelEditor/pom.xml b/Tools/ModelEditor/pom.xml
index f92587fcd..f9c60823d 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.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Tools/ModelExtractor/pom.xml b/Tools/ModelExtractor/pom.xml
index 231e115a5..dbd8df4d6 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.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Tools/pom.xml b/Tools/pom.xml
index 4525fff2f..43d3eb7d9 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.4.0</version>
+        <version>2.4.1-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 d25641fbb..999b523a9 100644
--- a/helm/frost-server/Chart.yaml
+++ b/helm/frost-server/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: frost-server
-version: 2.4.0
-appVersion: 2.4.0
+version: 2.4.1
+appVersion: 2.4.1
 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 1fc78de81..2cdedd3e6 100644
--- a/helm/frost-server/values.yaml
+++ b/helm/frost-server/values.yaml
@@ -115,7 +115,7 @@ frost:
     image:
       registry: docker.io
       repository: fraunhoferiosb/frost-server-http
-      tag: 2.4.0
+      tag: 2.4.1
       pullPolicy: IfNotPresent
       imagePullSecret:
     # FROST-Server HTTP deployment settings
@@ -198,7 +198,7 @@ frost:
     image:
       registry: docker.io
       repository: fraunhoferiosb/frost-server-mqtt
-      tag: 2.4.0
+      tag: 2.4.1
       pullPolicy: IfNotPresent
       imagePullSecret:
     # FROST-Server MQTT deployment settings
diff --git a/pom.xml b/pom.xml
index 5a00e8239..560cdece3 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.4.0</version>
+    <version>2.4.1-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.4.0</tag>
+        <tag>HEAD</tag>
         <url>https://github.com/FraunhoferIOSB/FROST-Server/tree/v2.x</url>
     </scm>