diff --git a/adapter-base/pom.xml b/adapter-base/pom.xml
index 61f34fa7a2..73ceb34015 100644
--- a/adapter-base/pom.xml
+++ b/adapter-base/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
   <artifactId>hono-adapter-base</artifactId>
diff --git a/adapters/amqp/pom.xml b/adapters/amqp/pom.xml
index 378c38af2f..2041de2e20 100644
--- a/adapters/amqp/pom.xml
+++ b/adapters/amqp/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-adapters-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-amqp</artifactId>
diff --git a/adapters/coap/pom.xml b/adapters/coap/pom.xml
index 9310b35c8d..7e0cdfdc7e 100644
--- a/adapters/coap/pom.xml
+++ b/adapters/coap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-adapters-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-coap</artifactId>
diff --git a/adapters/http-base/pom.xml b/adapters/http-base/pom.xml
index 5d963360d1..9392a17456 100644
--- a/adapters/http-base/pom.xml
+++ b/adapters/http-base/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-adapters</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-adapter-http-base</artifactId>
   <name>Hono HTTP Adapter base</name>
diff --git a/adapters/http/pom.xml b/adapters/http/pom.xml
index 31472fe1c7..f3ea7a8656 100644
--- a/adapters/http/pom.xml
+++ b/adapters/http/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-adapters-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-http</artifactId>
diff --git a/adapters/lora/pom.xml b/adapters/lora/pom.xml
index 5da27f0b11..c70b9dae13 100644
--- a/adapters/lora/pom.xml
+++ b/adapters/lora/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-adapters-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-lora</artifactId>
diff --git a/adapters/mqtt-base/pom.xml b/adapters/mqtt-base/pom.xml
index 5dfc4acfb9..df390fb991 100644
--- a/adapters/mqtt-base/pom.xml
+++ b/adapters/mqtt-base/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-adapters</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-adapter-mqtt-base</artifactId>
   <name>Hono MQTT Adapter base</name>
diff --git a/adapters/mqtt/pom.xml b/adapters/mqtt/pom.xml
index fb9e8ed0c6..8e0fc726aa 100644
--- a/adapters/mqtt/pom.xml
+++ b/adapters/mqtt/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-adapters-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-mqtt</artifactId>
diff --git a/adapters/parent/pom.xml b/adapters/parent/pom.xml
index 33f31babdf..685557ad58 100644
--- a/adapters/parent/pom.xml
+++ b/adapters/parent/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>hono-adapters</artifactId>
     <groupId>org.eclipse.hono</groupId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hono-adapters-parent</artifactId>
diff --git a/adapters/pom.xml b/adapters/pom.xml
index 72f64b8e7a..a21dfbb007 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
 
diff --git a/adapters/sigfox/pom.xml b/adapters/sigfox/pom.xml
index cb78b4225b..0c4c9e2464 100644
--- a/adapters/sigfox/pom.xml
+++ b/adapters/sigfox/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-adapters-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-adapter-sigfox</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index efd2cf91cb..abf27d3e75 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hono-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index b64987db94..55f6ba7916 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
 
diff --git a/client-device-connection-infinispan/pom.xml b/client-device-connection-infinispan/pom.xml
index 2d5097bcb3..153c95c002 100644
--- a/client-device-connection-infinispan/pom.xml
+++ b/client-device-connection-infinispan/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
   <artifactId>client-device-connection-infinispan</artifactId>
diff --git a/clients/amqp-common/pom.xml b/clients/amqp-common/pom.xml
index a19d82a041..413220e4de 100644
--- a/clients/amqp-common/pom.xml
+++ b/clients/amqp-common/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
     <artifactId>hono-client-amqp-common</artifactId>
 
diff --git a/clients/amqp-connection/pom.xml b/clients/amqp-connection/pom.xml
index 02d4702bee..47a47183c9 100644
--- a/clients/amqp-connection/pom.xml
+++ b/clients/amqp-connection/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
     <artifactId>hono-client-amqp-connection</artifactId>
 
diff --git a/clients/application-amqp/pom.xml b/clients/application-amqp/pom.xml
index e130c9fb96..2a17a46cca 100644
--- a/clients/application-amqp/pom.xml
+++ b/clients/application-amqp/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-application-amqp</artifactId>
 
diff --git a/clients/application-kafka/pom.xml b/clients/application-kafka/pom.xml
index 7e632cfc3d..413070efcc 100644
--- a/clients/application-kafka/pom.xml
+++ b/clients/application-kafka/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-application-kafka</artifactId>
 
diff --git a/clients/application/pom.xml b/clients/application/pom.xml
index 0a7f978bec..934d7628f6 100644
--- a/clients/application/pom.xml
+++ b/clients/application/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-application</artifactId>
 
diff --git a/clients/client-common/pom.xml b/clients/client-common/pom.xml
index 844dd31c99..cdd5b6f821 100644
--- a/clients/client-common/pom.xml
+++ b/clients/client-common/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-common</artifactId>
 
diff --git a/clients/command-amqp/pom.xml b/clients/command-amqp/pom.xml
index d116e80c7a..02c88d21ed 100644
--- a/clients/command-amqp/pom.xml
+++ b/clients/command-amqp/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-command-amqp</artifactId>
 
diff --git a/clients/command-kafka/pom.xml b/clients/command-kafka/pom.xml
index aa1d80548b..15a3b3f22e 100644
--- a/clients/command-kafka/pom.xml
+++ b/clients/command-kafka/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-command-kafka</artifactId>
 
diff --git a/clients/command-pubsub/pom.xml b/clients/command-pubsub/pom.xml
index a1f6b65a3c..adf17cbd7a 100644
--- a/clients/command-pubsub/pom.xml
+++ b/clients/command-pubsub/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-command-pubsub</artifactId>
 
diff --git a/clients/command/pom.xml b/clients/command/pom.xml
index 6539454018..4ec5233369 100644
--- a/clients/command/pom.xml
+++ b/clients/command/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-command</artifactId>
 
diff --git a/clients/device-amqp/pom.xml b/clients/device-amqp/pom.xml
index deef6c9013..fed3a17604 100644
--- a/clients/device-amqp/pom.xml
+++ b/clients/device-amqp/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
     <artifactId>hono-client-device-amqp</artifactId>
 
diff --git a/clients/kafka-common/pom.xml b/clients/kafka-common/pom.xml
index 6473636a0d..b65b3cd100 100644
--- a/clients/kafka-common/pom.xml
+++ b/clients/kafka-common/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-kafka-common</artifactId>
 
diff --git a/clients/notification-amqp/pom.xml b/clients/notification-amqp/pom.xml
index 9b6a8c110f..99928744b0 100644
--- a/clients/notification-amqp/pom.xml
+++ b/clients/notification-amqp/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-notification-amqp</artifactId>
 
diff --git a/clients/notification-kafka/pom.xml b/clients/notification-kafka/pom.xml
index 7ab68b3391..40d84bf1e9 100644
--- a/clients/notification-kafka/pom.xml
+++ b/clients/notification-kafka/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-notification-kafka</artifactId>
 
diff --git a/clients/notification-pubsub/pom.xml b/clients/notification-pubsub/pom.xml
index ccaa42b9a9..5d52d7982e 100644
--- a/clients/notification-pubsub/pom.xml
+++ b/clients/notification-pubsub/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-notification-pubsub</artifactId>
 
diff --git a/clients/notification/pom.xml b/clients/notification/pom.xml
index 60174859d8..3f740bb99d 100644
--- a/clients/notification/pom.xml
+++ b/clients/notification/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-notification</artifactId>
 
diff --git a/clients/pom.xml b/clients/pom.xml
index b777932eff..668f97f242 100644
--- a/clients/pom.xml
+++ b/clients/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
 
diff --git a/clients/pubsub-common/pom.xml b/clients/pubsub-common/pom.xml
index 9ed1e072c1..e9d79cd629 100644
--- a/clients/pubsub-common/pom.xml
+++ b/clients/pubsub-common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-pubsub-common</artifactId>
 
diff --git a/clients/registry-amqp/pom.xml b/clients/registry-amqp/pom.xml
index 0744acc888..b8a1ddea22 100644
--- a/clients/registry-amqp/pom.xml
+++ b/clients/registry-amqp/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-registry-amqp</artifactId>
 
diff --git a/clients/registry/pom.xml b/clients/registry/pom.xml
index 7ae39a6b6c..500fd24377 100644
--- a/clients/registry/pom.xml
+++ b/clients/registry/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-registry</artifactId>
 
diff --git a/clients/telemetry-amqp/pom.xml b/clients/telemetry-amqp/pom.xml
index d0b5195ce3..2ed6e53c7e 100644
--- a/clients/telemetry-amqp/pom.xml
+++ b/clients/telemetry-amqp/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-telemetry-amqp</artifactId>
 
diff --git a/clients/telemetry-kafka/pom.xml b/clients/telemetry-kafka/pom.xml
index e54e95a84b..48403153d0 100644
--- a/clients/telemetry-kafka/pom.xml
+++ b/clients/telemetry-kafka/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-telemetry-kafka</artifactId>
 
diff --git a/clients/telemetry-pubsub/pom.xml b/clients/telemetry-pubsub/pom.xml
index 6cecf3b1e9..1d1824b240 100644
--- a/clients/telemetry-pubsub/pom.xml
+++ b/clients/telemetry-pubsub/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-telemetry-pubsub</artifactId>
 
diff --git a/clients/telemetry/pom.xml b/clients/telemetry/pom.xml
index ea6efa938e..a0f0bc0973 100644
--- a/clients/telemetry/pom.xml
+++ b/clients/telemetry/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-clients-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-client-telemetry</artifactId>
 
diff --git a/core/pom.xml b/core/pom.xml
index 48b835dfff..3eaea43bf4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
 
diff --git a/demo-certs/pom.xml b/demo-certs/pom.xml
index 4859b47357..9b4e2d56ca 100644
--- a/demo-certs/pom.xml
+++ b/demo-certs/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-demo-certs</artifactId>
 
diff --git a/examples/hono-client-examples/pom.xml b/examples/hono-client-examples/pom.xml
index 01a222b0ae..5a149de542 100644
--- a/examples/hono-client-examples/pom.xml
+++ b/examples/hono-client-examples/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-example</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/examples/pom.xml b/examples/pom.xml
index 3d0efb0f38..8be7bb821f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
 
diff --git a/examples/protocol-gateway-example/pom.xml b/examples/protocol-gateway-example/pom.xml
index 0a59e2508c..de5114016c 100644
--- a/examples/protocol-gateway-example/pom.xml
+++ b/examples/protocol-gateway-example/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-example</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/legal/pom.xml b/legal/pom.xml
index c8ea584511..3d5c0dec81 100644
--- a/legal/pom.xml
+++ b/legal/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
   <artifactId>hono-legal</artifactId>
diff --git a/pom.xml b/pom.xml
index 668764bb85..12f3181be7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
   <groupId>org.eclipse.hono</groupId>
   <artifactId>hono-parent</artifactId>
-  <version>2.4.0</version>
+  <version>2.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Hono</name>
diff --git a/service-base/pom.xml b/service-base/pom.xml
index fab7f9ec40..04b05d31b6 100644
--- a/service-base/pom.xml
+++ b/service-base/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
   <artifactId>hono-service-base</artifactId>
diff --git a/services/auth-base/pom.xml b/services/auth-base/pom.xml
index 979595af98..35d51e553a 100644
--- a/services/auth-base/pom.xml
+++ b/services/auth-base/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-services</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>hono-service-auth-base</artifactId>
   <name>Hono Auth base</name>
diff --git a/services/auth/pom.xml b/services/auth/pom.xml
index 66a19c95db..9a921977d8 100644
--- a/services/auth/pom.xml
+++ b/services/auth/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-services-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-service-auth</artifactId>
diff --git a/services/base-jdbc/pom.xml b/services/base-jdbc/pom.xml
index 46d448cd1f..7f5b001982 100644
--- a/services/base-jdbc/pom.xml
+++ b/services/base-jdbc/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../bom</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/services/command-router/pom.xml b/services/command-router/pom.xml
index 2a2d741260..17a58b6f5a 100644
--- a/services/command-router/pom.xml
+++ b/services/command-router/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-services-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>hono-service-command-router</artifactId>
diff --git a/services/device-registry-base/pom.xml b/services/device-registry-base/pom.xml
index 35c8762301..6197ceedef 100644
--- a/services/device-registry-base/pom.xml
+++ b/services/device-registry-base/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-services</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/services/device-registry-jdbc/pom.xml b/services/device-registry-jdbc/pom.xml
index 8b5e4bd764..990c2d1c62 100644
--- a/services/device-registry-jdbc/pom.xml
+++ b/services/device-registry-jdbc/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-services-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/services/device-registry-mongodb/pom.xml b/services/device-registry-mongodb/pom.xml
index 07bfd3fe6d..b41e8d7ead 100644
--- a/services/device-registry-mongodb/pom.xml
+++ b/services/device-registry-mongodb/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-services-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/services/parent/pom.xml b/services/parent/pom.xml
index 0051699c67..a9c7f04a5f 100644
--- a/services/parent/pom.xml
+++ b/services/parent/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>hono-services</artifactId>
     <groupId>org.eclipse.hono</groupId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
diff --git a/services/pom.xml b/services/pom.xml
index c5a6c6d128..c130f51ac6 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
 
diff --git a/site/pom.xml b/site/pom.xml
index 8c7c86cdb9..a7c867eda3 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
 
diff --git a/test-utils/adapter-base-test-utils/pom.xml b/test-utils/adapter-base-test-utils/pom.xml
index c87d9bf1f2..2d842571fe 100644
--- a/test-utils/adapter-base-test-utils/pom.xml
+++ b/test-utils/adapter-base-test-utils/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>test-utils</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>adapter-base-test-utils</artifactId>
 
diff --git a/test-utils/client-test-utils/pom.xml b/test-utils/client-test-utils/pom.xml
index 5eca9676c5..433f238b6f 100644
--- a/test-utils/client-test-utils/pom.xml
+++ b/test-utils/client-test-utils/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>test-utils</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>client-test-utils</artifactId>
 
diff --git a/test-utils/core-test-utils/pom.xml b/test-utils/core-test-utils/pom.xml
index a7ca8d55db..1e6aa6fffe 100644
--- a/test-utils/core-test-utils/pom.xml
+++ b/test-utils/core-test-utils/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>test-utils</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>core-test-utils</artifactId>
 
diff --git a/test-utils/kafka-test-utils/pom.xml b/test-utils/kafka-test-utils/pom.xml
index 8400e756df..743c7d1a49 100644
--- a/test-utils/kafka-test-utils/pom.xml
+++ b/test-utils/kafka-test-utils/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>test-utils</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>kafka-test-utils</artifactId>
 
diff --git a/test-utils/pom.xml b/test-utils/pom.xml
index 4c17ba4823..bb2269b00d 100644
--- a/test-utils/pom.xml
+++ b/test-utils/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>hono-bom</artifactId>
     <groupId>org.eclipse.hono</groupId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
   <artifactId>test-utils</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 6dc8a1836a..9dd4c0a007 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.hono</groupId>
     <artifactId>hono-bom</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../bom</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>