diff --git a/api/pom.xml b/api/pom.xml
index 2c1091718f..793f533580 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/bom/pom.xml b/bom/pom.xml
index 42d02db74e..e6a5652f7e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/changelog-system/pom.xml b/changelog-system/pom.xml
index b05f25cccb..fde191de77 100644
--- a/changelog-system/pom.xml
+++ b/changelog-system/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/common-api/pom.xml b/common-api/pom.xml
index a9d8a6e1b2..eac8f60c7b 100644
--- a/common-api/pom.xml
+++ b/common-api/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/common/pom.xml b/common/pom.xml
index 13b7266ebe..88e1a2f332 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/core/pom.xml b/core/pom.xml
index 62cad7716e..6ab5b5c67b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/databases/orientdb/pom.xml b/databases/orientdb/pom.xml
index a79e50dd6f..ff41f72392 100644
--- a/databases/orientdb/pom.xml
+++ b/databases/orientdb/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-databases</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/databases/pom.xml b/databases/pom.xml
index 9aae9427f5..d5575d1581 100644
--- a/databases/pom.xml
+++ b/databases/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/demo/common/pom.xml b/demo/common/pom.xml
index 4cfad9fa46..a0ebc955ef 100644
--- a/demo/common/pom.xml
+++ b/demo/common/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-demos</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/demo/default/pom.xml b/demo/default/pom.xml
index 00187284db..4f9c331b0b 100644
--- a/demo/default/pom.xml
+++ b/demo/default/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-demos</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/demo/pom.xml b/demo/pom.xml
index 5aad3b107b..5e77f58b6f 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/distributed-coordinator/pom.xml b/distributed-coordinator/pom.xml
index 4c461338f2..03ba6f7a00 100644
--- a/distributed-coordinator/pom.xml
+++ b/distributed-coordinator/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mesh-distributed-coordinator</artifactId>
diff --git a/distributed/pom.xml b/distributed/pom.xml
index a39ab2ff26..c4efcd8369 100644
--- a/distributed/pom.xml
+++ b/distributed/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/doc/pom.xml b/doc/pom.xml
index ed8cac0684..489ffcc08f 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mesh-doc</artifactId>
diff --git a/doc/src/main/docs/generated/api/api-docs.raml b/doc/src/main/docs/generated/api/api-docs.raml
index 5440de6edb..7caffc3f41 100644
--- a/doc/src/main/docs/generated/api/api-docs.raml
+++ b/doc/src/main/docs/generated/api/api-docs.raml
@@ -1,6 +1,6 @@
 #%RAML 0.8
 title: Gentics Mesh REST API
-version: "1.8.19"
+version: "1.8.20"
 baseUri: "http://localhost:8080/api/v2"
 protocols: [HTTP, HTTPS]
 mediaType: application/json
@@ -6129,7 +6129,7 @@ mediaType: application/json
                                 | vertxVersion | false | string | Used Vert.x version. |
                             example: |
                                 {
-                                  "meshVersion" : "1.8.19",
+                                  "meshVersion" : "1.8.20",
                                   "meshNodeName" : "Reminiscent Tirtouga",
                                   "databaseVendor" : "orientdb",
                                   "databaseVersion" : "2.2.16",
diff --git a/doc/src/main/docs/generated/api/api.raml b/doc/src/main/docs/generated/api/api.raml
index 99b80ee91a..ff5fb7acb3 100644
--- a/doc/src/main/docs/generated/api/api.raml
+++ b/doc/src/main/docs/generated/api/api.raml
@@ -1,6 +1,6 @@
 #%RAML 0.8
 title: Gentics Mesh REST API
-version: "1.8.19"
+version: "1.8.20"
 baseUri: "http://localhost:8080/api/v2"
 protocols: [HTTP, HTTPS]
 mediaType: application/json
@@ -13852,7 +13852,7 @@ mediaType: application/json
                                 }
                             example: |
                                 {
-                                  "meshVersion" : "1.8.19",
+                                  "meshVersion" : "1.8.20",
                                   "meshNodeName" : "Reminiscent Tirtouga",
                                   "databaseVendor" : "orientdb",
                                   "databaseVersion" : "2.2.16",
diff --git a/doc/src/main/docs/generated/api/response/api/v2/200/example.json b/doc/src/main/docs/generated/api/response/api/v2/200/example.json
index 2f7af5b9dc..c1ff011aed 100644
--- a/doc/src/main/docs/generated/api/response/api/v2/200/example.json
+++ b/doc/src/main/docs/generated/api/response/api/v2/200/example.json
@@ -1,5 +1,5 @@
 {
-  "meshVersion" : "1.8.19",
+  "meshVersion" : "1.8.20",
   "meshNodeName" : "Reminiscent Tirtouga",
   "databaseVendor" : "orientdb",
   "databaseVersion" : "2.2.16",
diff --git a/doc/src/main/docs/generated/tables/mesh-db-revs.adoc-include b/doc/src/main/docs/generated/tables/mesh-db-revs.adoc-include
index 1984b6d431..7e2e483c1c 100644
--- a/doc/src/main/docs/generated/tables/mesh-db-revs.adoc-include
+++ b/doc/src/main/docs/generated/tables/mesh-db-revs.adoc-include
@@ -5,10 +5,10 @@
 | Database revision 
 
 
-| *1.10.2*
+| *1.10.3*
 | 6d5ccff3
 
-| *1.8.19*
+| *1.8.20*
 | 7f2ff7d7
 
 |======
diff --git a/doc/src/main/docs/generated/tables/mesh-env.adoc-include b/doc/src/main/docs/generated/tables/mesh-env.adoc-include
index 894e352c42..67caee3fb7 100644
--- a/doc/src/main/docs/generated/tables/mesh-env.adoc-include
+++ b/doc/src/main/docs/generated/tables/mesh-env.adoc-include
@@ -74,12 +74,12 @@
 | *MESH_MONITORING_JVM_METRICS_ENABLED*
 | Override the configured JVM metrics enabled flag.
 
-| *MESH_CACHE_PATH_SIZE*
-| Override the path cache size.
-
 | *MESH_GRAPH_EXPORT_DIRECTORY*
 | Override the graph database export directory.
 
+| *MESH_CACHE_PATH_SIZE*
+| Override the path cache size.
+
 | *MESH_VERTX_EVENT_BUS_ERROR_THRESHOLD*
 | Override the Vert.x eventBus error threshold in ms.
 
@@ -140,12 +140,12 @@
 | *MESH_ELASTICSEARCH_USERNAME*
 | Override the configured Elasticsearch connection username.
 
-| *MESH_CLUSTER_TOPOLOGY_LOCK_TIMEOUT*
-| Override the cluster topology lock timeout in ms.
-
 | *MESH_GRAPH_BACKUP_DIRECTORY*
 | Override the graph database backup directory.
 
+| *MESH_CLUSTER_TOPOLOGY_LOCK_TIMEOUT*
+| Override the cluster topology lock timeout in ms.
+
 | *MESH_VERTX_EVENT_BUS_CHECK_INTERVAL*
 | Override the Vert.x eventBus check interval in ms.
 
@@ -209,12 +209,12 @@
 | *MESH_HTTP_CORS_ENABLE*
 | Override the configured CORS enable flag.
 
-| *MESH_HTTP_SSL_ENABLE*
-| Override the configured https server flag.
-
 | *MESH_GRAPH_STARTSERVER*
 | Override the graph database server flag.
 
+| *MESH_HTTP_SSL_ENABLE*
+| Override the configured https server flag.
+
 | *MESH_HTTP_VERTICLE_AMOUNT*
 | Override the http verticle amount.
 
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 4316bf910c..b2c6635516 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/ferma/pom.xml b/ferma/pom.xml
index 27dfdab2bb..4db759bded 100644
--- a/ferma/pom.xml
+++ b/ferma/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>ferma</artifactId>
diff --git a/madl/api/pom.xml b/madl/api/pom.xml
index fd1b3a9be2..4317766e3b 100644
--- a/madl/api/pom.xml
+++ b/madl/api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>madl</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>madl-api</artifactId>
diff --git a/madl/core/pom.xml b/madl/core/pom.xml
index ed316b42ed..0dbe2c3e4f 100644
--- a/madl/core/pom.xml
+++ b/madl/core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>madl</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>madl-core</artifactId>
diff --git a/madl/madl-ferma/pom.xml b/madl/madl-ferma/pom.xml
index d8337c7115..58f0f908f6 100644
--- a/madl/madl-ferma/pom.xml
+++ b/madl/madl-ferma/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>madl</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>madl-ferma</artifactId>
diff --git a/madl/orientdb/pom.xml b/madl/orientdb/pom.xml
index 5b393fdc7d..f0ebc0ca1c 100644
--- a/madl/orientdb/pom.xml
+++ b/madl/orientdb/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>madl</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>madl-orientdb</artifactId>
diff --git a/madl/pom.xml b/madl/pom.xml
index 01bb369ea2..32e4cec4a6 100644
--- a/madl/pom.xml
+++ b/madl/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>madl</artifactId>
diff --git a/mdm/api/pom.xml b/mdm/api/pom.xml
index 7229aa12ad..38881716ea 100644
--- a/mdm/api/pom.xml
+++ b/mdm/api/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-mdm</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mesh-mdm-api</artifactId>
diff --git a/mdm/common/pom.xml b/mdm/common/pom.xml
index f84e961b4c..50e2bc55b2 100644
--- a/mdm/common/pom.xml
+++ b/mdm/common/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-mdm</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mesh-mdm-common</artifactId>
diff --git a/mdm/orientdb-api/pom.xml b/mdm/orientdb-api/pom.xml
index 96313f04a0..821e922b3d 100644
--- a/mdm/orientdb-api/pom.xml
+++ b/mdm/orientdb-api/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-mdm</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mesh-mdm-orientdb-api</artifactId>
diff --git a/mdm/orientdb-wrapper/pom.xml b/mdm/orientdb-wrapper/pom.xml
index 7e04d98846..0dc50af9c7 100644
--- a/mdm/orientdb-wrapper/pom.xml
+++ b/mdm/orientdb-wrapper/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-mdm</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mesh-mdm-orientdb-wrapper</artifactId>
diff --git a/mdm/pom.xml b/mdm/pom.xml
index bf7db46d9f..6d63d9a8c5 100644
--- a/mdm/pom.xml
+++ b/mdm/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mesh-mdm</artifactId>
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 34958941fa..9ad08ca260 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/plugin-api/pom.xml b/plugin-api/pom.xml
index a41b3c3f4d..f120345ef5 100644
--- a/plugin-api/pom.xml
+++ b/plugin-api/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/plugin-bom/pom.xml b/plugin-bom/pom.xml
index cc78206198..1dea7e00de 100644
--- a/plugin-bom/pom.xml
+++ b/plugin-bom/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/plugin-dep/pom.xml b/plugin-dep/pom.xml
index 2e0e89e8d4..f019028721 100644
--- a/plugin-dep/pom.xml
+++ b/plugin-dep/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/plugin-parent/pom.xml b/plugin-parent/pom.xml
index 830c591ec0..6d48f1155e 100644
--- a/plugin-parent/pom.xml
+++ b/plugin-parent/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/pom.xml b/pom.xml
index bfd6f84f0d..cd4db46670 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.gentics.mesh</groupId>
 	<artifactId>mesh</artifactId>
-	<version>1.8.20</version>
+	<version>1.8.21-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 	<name>Gentics Mesh</name>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index ec9a6111a8..47d80763a2 100644
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/rest-model/pom.xml b/rest-model/pom.xml
index 01cda8ddcb..5a0eca110f 100644
--- a/rest-model/pom.xml
+++ b/rest-model/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/server/pom.xml b/server/pom.xml
index b7bf5dc788..da8049d75d 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/services/aws-s3-storage/pom.xml b/services/aws-s3-storage/pom.xml
index 95554bfeda..5a4b05c7cf 100644
--- a/services/aws-s3-storage/pom.xml
+++ b/services/aws-s3-storage/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-services</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/services/image-imgscalr/pom.xml b/services/image-imgscalr/pom.xml
index b9ca489e3f..e03add399b 100644
--- a/services/image-imgscalr/pom.xml
+++ b/services/image-imgscalr/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-services</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/services/jwt-auth/pom.xml b/services/jwt-auth/pom.xml
index 1527d4d8d6..264d5a705b 100644
--- a/services/jwt-auth/pom.xml
+++ b/services/jwt-auth/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-services</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/services/local-storage/pom.xml b/services/local-storage/pom.xml
index 21241a936f..c35aa114de 100644
--- a/services/local-storage/pom.xml
+++ b/services/local-storage/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-services</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/services/metrics-prometheus/pom.xml b/services/metrics-prometheus/pom.xml
index f1656faf92..245a70148a 100644
--- a/services/metrics-prometheus/pom.xml
+++ b/services/metrics-prometheus/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-services</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/services/pom.xml b/services/pom.xml
index 92bd97df1f..db2952476c 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/tests/api/pom.xml b/tests/api/pom.xml
index 0e639e3bc7..b485616c1b 100644
--- a/tests/api/pom.xml
+++ b/tests/api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>mesh-tests-api</artifactId>
 	<name>Mesh - Tests API</name>
diff --git a/tests/common/pom.xml b/tests/common/pom.xml
index e57a74ca13..57bf9eb830 100644
--- a/tests/common/pom.xml
+++ b/tests/common/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/tests/context-api/pom.xml b/tests/context-api/pom.xml
index 83ba115deb..3409362ef1 100644
--- a/tests/context-api/pom.xml
+++ b/tests/context-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>mesh-tests-context-api</artifactId>
 	<name>Mesh - Tests context API</name>
diff --git a/tests/context-orientdb/pom.xml b/tests/context-orientdb/pom.xml
index 32b3eb8802..659269720b 100644
--- a/tests/context-orientdb/pom.xml
+++ b/tests/context-orientdb/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.gentics.mesh</groupId>
     <artifactId>mesh-tests</artifactId>
-    <version>1.8.20</version>
+    <version>1.8.21-SNAPSHOT</version>
   </parent>
   <artifactId>mesh-tests-context-orientdb</artifactId>
   <name>Mesh - Tests context - OrientDB</name>
diff --git a/tests/orientdb-runner/pom.xml b/tests/orientdb-runner/pom.xml
index 7b116d8f27..7c4b483370 100644
--- a/tests/orientdb-runner/pom.xml
+++ b/tests/orientdb-runner/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>mesh-orientdb-tests-runner</artifactId>
 	<name>Mesh - Tests Runner - OrientDB</name>
diff --git a/tests/pom.xml b/tests/pom.xml
index 932ad113e8..cb2067acd9 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/tests/tests-admin-gui/pom.xml b/tests/tests-admin-gui/pom.xml
index 4a6a30ca00..d883298441 100644
--- a/tests/tests-admin-gui/pom.xml
+++ b/tests/tests-admin-gui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-admin-gui</artifactId>
 	<name>Mesh Admin GUI - Shared tests</name>
diff --git a/tests/tests-api/pom.xml b/tests/tests-api/pom.xml
index a6a3235ba2..d7ec20c6b9 100644
--- a/tests/tests-api/pom.xml
+++ b/tests/tests-api/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/tests/tests-changelog-system/pom.xml b/tests/tests-changelog-system/pom.xml
index 26e5042ea9..15bc7b9877 100644
--- a/tests/tests-changelog-system/pom.xml
+++ b/tests/tests-changelog-system/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-changelog-system</artifactId>
 	<name>Mesh Changelog System - Shared tests</name>
diff --git a/tests/tests-common/pom.xml b/tests/tests-common/pom.xml
index a2a2125158..93a3a8a8d5 100644
--- a/tests/tests-common/pom.xml
+++ b/tests/tests-common/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/tests/tests-core/pom.xml b/tests/tests-core/pom.xml
index 9211bf45e5..ea99179b77 100644
--- a/tests/tests-core/pom.xml
+++ b/tests/tests-core/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/tests/tests-distributed-coordinator/pom.xml b/tests/tests-distributed-coordinator/pom.xml
index 5b7770f7ff..e42790b657 100644
--- a/tests/tests-distributed-coordinator/pom.xml
+++ b/tests/tests-distributed-coordinator/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-distributed-coordinator</artifactId>
 	<name>Mesh Distributed Coordinator - Shared tests</name>
diff --git a/tests/tests-distributed/pom.xml b/tests/tests-distributed/pom.xml
index 8d1378d8c6..ec0936e891 100644
--- a/tests/tests-distributed/pom.xml
+++ b/tests/tests-distributed/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/tests/tests-elasticsearch/pom.xml b/tests/tests-elasticsearch/pom.xml
index aafba5dee2..4350a7840d 100644
--- a/tests/tests-elasticsearch/pom.xml
+++ b/tests/tests-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-elasticsearch</artifactId>
 	<name>Mesh Elasticsearch - Shared tests</name>
diff --git a/tests/tests-plugin-api/pom.xml b/tests/tests-plugin-api/pom.xml
index fc6113cc98..521ffc9275 100644
--- a/tests/tests-plugin-api/pom.xml
+++ b/tests/tests-plugin-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-plugin-api</artifactId>
 	<name>Mesh Plugin API - Shared tests</name>
diff --git a/tests/tests-rest-client/pom.xml b/tests/tests-rest-client/pom.xml
index 910521d52d..6bf10a780b 100644
--- a/tests/tests-rest-client/pom.xml
+++ b/tests/tests-rest-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-rest-client</artifactId>
 	<name>Mesh REST Client - Shared tests</name>
diff --git a/tests/tests-rest-model/pom.xml b/tests/tests-rest-model/pom.xml
index a40f9a2f83..7a6fed1861 100644
--- a/tests/tests-rest-model/pom.xml
+++ b/tests/tests-rest-model/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-rest-model</artifactId>
 	<name>Mesh REST Model - Shared tests</name>
diff --git a/tests/tests-server/pom.xml b/tests/tests-server/pom.xml
index 6e0f7ad80c..46c817d240 100644
--- a/tests/tests-server/pom.xml
+++ b/tests/tests-server/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-server</artifactId>
 	<name>Mesh Server - Shared tests</name>
diff --git a/tests/tests-service-aws-s3-storage/pom.xml b/tests/tests-service-aws-s3-storage/pom.xml
index 058a94ef66..0a19bfe76a 100644
--- a/tests/tests-service-aws-s3-storage/pom.xml
+++ b/tests/tests-service-aws-s3-storage/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-service-aws-s3-storage</artifactId>
 	<name>Mesh AWS S3 Storage - Shared tests</name>
diff --git a/tests/tests-service-image-imgscalr/pom.xml b/tests/tests-service-image-imgscalr/pom.xml
index d574de36c8..9d107d8ec8 100644
--- a/tests/tests-service-image-imgscalr/pom.xml
+++ b/tests/tests-service-image-imgscalr/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-service-image-imgscalr</artifactId>
 	<name>Mesh Imgscalr Service - Shared tests</name>
diff --git a/tests/tests-service-jwt-auth/pom.xml b/tests/tests-service-jwt-auth/pom.xml
index e96ee8726e..a67ed3cce7 100644
--- a/tests/tests-service-jwt-auth/pom.xml
+++ b/tests/tests-service-jwt-auth/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-service-jwt-auth</artifactId>
 	<name>Mesh JWT Authentication - Shared tests</name>
diff --git a/tests/tests-service-local-storage/pom.xml b/tests/tests-service-local-storage/pom.xml
index c2ade075f5..3faec652bc 100644
--- a/tests/tests-service-local-storage/pom.xml
+++ b/tests/tests-service-local-storage/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-service-local-storage</artifactId>
 	<name>Mesh Local Storage - Shared tests</name>
diff --git a/tests/tests-service-metrics-prometheus/pom.xml b/tests/tests-service-metrics-prometheus/pom.xml
index dcc6e5d67d..31f1c14356 100644
--- a/tests/tests-service-metrics-prometheus/pom.xml
+++ b/tests/tests-service-metrics-prometheus/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-tests</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 	<artifactId>tests-mesh-service-metrics-prometheus</artifactId>
 	<name>Mesh Prometeus Metrics Service - Shared tests</name>
diff --git a/verticles/admin-gui/pom.xml b/verticles/admin-gui/pom.xml
index 89a6955d46..a72a5dc29a 100644
--- a/verticles/admin-gui/pom.xml
+++ b/verticles/admin-gui/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-verticles</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/verticles/graphql/pom.xml b/verticles/graphql/pom.xml
index 3f9a5018aa..948f0ddd98 100644
--- a/verticles/graphql/pom.xml
+++ b/verticles/graphql/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-verticles</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/verticles/pom.xml b/verticles/pom.xml
index 0c12803115..7e52096c2f 100644
--- a/verticles/pom.xml
+++ b/verticles/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/verticles/rest/pom.xml b/verticles/rest/pom.xml
index 3a25b89c49..8693fa3cb2 100644
--- a/verticles/rest/pom.xml
+++ b/verticles/rest/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh-verticles</artifactId>
-		<version>1.8.20</version>
+		<version>1.8.21-SNAPSHOT</version>
 	</parent>
 
 	<properties>