diff --git a/api/pom.xml b/api/pom.xml
index 8268e6f1db..f3f08885b2 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/bom/pom.xml b/bom/pom.xml
index 5f30ba3ffc..91bee67d34 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/changelog-system/pom.xml b/changelog-system/pom.xml
index b549937fcd..1e3859f72b 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/common/pom.xml b/common/pom.xml
index 6d4380dfdf..517b7710a3 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/core/pom.xml b/core/pom.xml
index 456bde79ff..29956ca6eb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/databases/orientdb/pom.xml b/databases/orientdb/pom.xml
index 6c402df198..2c0101334e 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/databases/pom.xml b/databases/pom.xml
index 1041f848d1..87e69e42c9 100644
--- a/databases/pom.xml
+++ b/databases/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/demo/pom.xml b/demo/pom.xml
index fe1b062e90..21f7f6f4f7 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/distributed-coordinator/pom.xml b/distributed-coordinator/pom.xml
index 13c59bca1a..95fe3ecf4d 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<artifactId>mesh-distributed-coordinator</artifactId>
diff --git a/distributed/pom.xml b/distributed/pom.xml
index cd48631212..c304a7f4f6 100644
--- a/distributed/pom.xml
+++ b/distributed/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/doc/pom.xml b/doc/pom.xml
index 0191be3947..ae3b27c296 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<artifactId>mesh-doc</artifactId>
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 0804b17b80..fbfffb6ed0 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/ferma/pom.xml b/ferma/pom.xml
index 8f761392f1..388ed049aa 100644
--- a/ferma/pom.xml
+++ b/ferma/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<artifactId>ferma</artifactId>
diff --git a/madl/api/pom.xml b/madl/api/pom.xml
index 36fac5af28..2227e72b5d 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<artifactId>madl-api</artifactId>
diff --git a/madl/core/pom.xml b/madl/core/pom.xml
index 3d8485246c..afc3c9c93c 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<artifactId>madl-core</artifactId>
diff --git a/madl/madl-ferma/pom.xml b/madl/madl-ferma/pom.xml
index b621f42ecb..b06ec09226 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<artifactId>madl-ferma</artifactId>
diff --git a/madl/neo4j/pom.xml b/madl/neo4j/pom.xml
index 5a22045783..d0f0a3fae8 100644
--- a/madl/neo4j/pom.xml
+++ b/madl/neo4j/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>madl</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<artifactId>madl-neo4j</artifactId>
diff --git a/madl/orientdb/pom.xml b/madl/orientdb/pom.xml
index 8247cad6e9..f2c78b6010 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<artifactId>madl-orientdb</artifactId>
diff --git a/madl/pom.xml b/madl/pom.xml
index 1b3b9e2721..491b88298c 100644
--- a/madl/pom.xml
+++ b/madl/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<artifactId>madl</artifactId>
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 60c81eb423..b3181c5cf7 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/plugin-api/pom.xml b/plugin-api/pom.xml
index e41767a23a..f18c04fbed 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/plugin-bom/pom.xml b/plugin-bom/pom.xml
index d705d98475..727434d5b4 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/plugin-dep/pom.xml b/plugin-dep/pom.xml
index 98c19a8a29..c96df0ea25 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/plugin-parent/pom.xml b/plugin-parent/pom.xml
index 4518b65984..a1950c3913 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/pom.xml b/pom.xml
index a57da4c67c..6a8f4c96c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.gentics.mesh</groupId>
 	<artifactId>mesh</artifactId>
-	<version>1.6.36-SNAPSHOT</version>
+	<version>1.6.36</version>
 
 	<packaging>pom</packaging>
 	<name>Gentics Mesh</name>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index 7439d29933..033a3950a6 100644
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/rest-model/pom.xml b/rest-model/pom.xml
index 6ad6612d19..f992311412 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/server/pom.xml b/server/pom.xml
index 349e40a1d1..22d2533353 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/services/aws-s3-storage/pom.xml b/services/aws-s3-storage/pom.xml
index 69d1def29a..bbd89048c8 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/services/image-imgscalr/pom.xml b/services/image-imgscalr/pom.xml
index 94e2023815..d750b90996 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/services/jwt-auth/pom.xml b/services/jwt-auth/pom.xml
index 6c20d20508..6b5ff374dd 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/services/local-storage/pom.xml b/services/local-storage/pom.xml
index fea6bad30a..c7abed3cab 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/services/metrics-prometheus/pom.xml b/services/metrics-prometheus/pom.xml
index 2fbb924bf6..d006934e2d 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/services/pom.xml b/services/pom.xml
index 5452dcb7b4..bffac4b95e 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/test-common/pom.xml b/test-common/pom.xml
index 3a1eff4d8f..59b3492a1b 100644
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/verticles/admin-gui/pom.xml b/verticles/admin-gui/pom.xml
index bb509a1e0f..4d9becd6be 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/verticles/graphql/pom.xml b/verticles/graphql/pom.xml
index 3b76a0b839..915124c6ed 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.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>
diff --git a/verticles/pom.xml b/verticles/pom.xml
index 077c33f06c..490f767dc5 100644
--- a/verticles/pom.xml
+++ b/verticles/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.gentics.mesh</groupId>
 		<artifactId>mesh</artifactId>
-		<version>1.6.36-SNAPSHOT</version>
+		<version>1.6.36</version>
 	</parent>
 
 	<properties>