diff --git a/CITATION.cff b/CITATION.cff
index 71fc1a111..5cc2ca609 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -24,8 +24,8 @@ preferred-citation:
   doi: 10.3233/SHTI210060
   type: proceedings
 title: "HiGHmed Data Sharing Framework (HiGHmed DSF)"
-version: 0.6.0
-date-released: 2021-09-20
+version: 0.5.3
+date-released: 2021-10-19
 url: https://github.com/highmed/highmed-dsf/wiki
 repository-code: https://github.com/highmed/highmed-dsf
 repository-artifact: https://github.com/highmed/highmed-dsf/releases
diff --git a/dsf-bpe/dsf-bpe-process-base/pom.xml b/dsf-bpe/dsf-bpe-process-base/pom.xml
index 05c6b2ca7..be715aa43 100755
--- a/dsf-bpe/dsf-bpe-process-base/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<dependencies>
diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml
index d640e1e4f..f7f465ecc 100755
--- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml
+++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<dependencies>
diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml
index 275dc1154..311878d62 100755
--- a/dsf-bpe/dsf-bpe-server/pom.xml
+++ b/dsf-bpe/dsf-bpe-server/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<dependencies>
diff --git a/dsf-bpe/dsf-bpe-webservice-client/pom.xml b/dsf-bpe/dsf-bpe-webservice-client/pom.xml
index 9d9fcd549..bf282e239 100755
--- a/dsf-bpe/dsf-bpe-webservice-client/pom.xml
+++ b/dsf-bpe/dsf-bpe-webservice-client/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<dependencies>
diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml
index a726eece2..b6dd55d37 100755
--- a/dsf-bpe/pom.xml
+++ b/dsf-bpe/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<modules>
diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml
index a0469f464..eaa51612e 100644
--- a/dsf-fhir/dsf-fhir-auth/pom.xml
+++ b/dsf-fhir/dsf-fhir-auth/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml
index 677756aa5..a0c5de3ae 100755
--- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml
+++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml
index da53b98ed..eee40c3ab 100755
--- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml
+++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml
index 628ed1375..a7c81f5b7 100755
--- a/dsf-fhir/dsf-fhir-server/pom.xml
+++ b/dsf-fhir/dsf-fhir-server/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<properties>
diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml
index 412a03fdd..33c4eb08f 100644
--- a/dsf-fhir/dsf-fhir-validation/pom.xml
+++ b/dsf-fhir/dsf-fhir-validation/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
@@ -93,7 +93,7 @@
 				</configuration>
 				<!-- Workaround for exec maven plugin issue -->
 				<!-- https://github.com/mojohaus/exec-maven-plugin/issues/76 -->
-				<!-- <dependencies> <dependency> <groupId>org.highmed.dsf</groupId> <artifactId>dsf-tools-bundle-generator</artifactId> <version>0.5.3-SNAPSHOT</version> </dependency> 
+				<!-- <dependencies> <dependency> <groupId>org.highmed.dsf</groupId> <artifactId>dsf-tools-bundle-generator</artifactId> <version>0.5.3</version> </dependency> 
 					</dependencies> -->
 			</plugin>
 		</plugins>
diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml
index 63c5199a7..f7122c65a 100755
--- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml
+++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml
index 347c47810..35da5b257 100755
--- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml
+++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml
index eb8e8fa73..c1c3d8fad 100755
--- a/dsf-fhir/pom.xml
+++ b/dsf-fhir/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<modules>
diff --git a/dsf-mpi/dsf-mpi-client-pdq/pom.xml b/dsf-mpi/dsf-mpi-client-pdq/pom.xml
index 14d90c58a..d62cc5284 100644
--- a/dsf-mpi/dsf-mpi-client-pdq/pom.xml
+++ b/dsf-mpi/dsf-mpi-client-pdq/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<artifactId>dsf-mpi-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-mpi/dsf-mpi-client-stub/pom.xml b/dsf-mpi/dsf-mpi-client-stub/pom.xml
index ef7fd2b63..521c19e01 100644
--- a/dsf-mpi/dsf-mpi-client-stub/pom.xml
+++ b/dsf-mpi/dsf-mpi-client-stub/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<artifactId>dsf-mpi-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-mpi/dsf-mpi-client/pom.xml b/dsf-mpi/dsf-mpi-client/pom.xml
index 4b3983962..91cf338e5 100644
--- a/dsf-mpi/dsf-mpi-client/pom.xml
+++ b/dsf-mpi/dsf-mpi-client/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<artifactId>dsf-mpi-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-mpi/pom.xml b/dsf-mpi/pom.xml
index 653e50207..1fce2f900 100644
--- a/dsf-mpi/pom.xml
+++ b/dsf-mpi/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<artifactId>dsf-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<modules>
diff --git a/dsf-openehr/dsf-openehr-client-impl/pom.xml b/dsf-openehr/dsf-openehr-client-impl/pom.xml
index 1bacc9706..2892c9729 100644
--- a/dsf-openehr/dsf-openehr-client-impl/pom.xml
+++ b/dsf-openehr/dsf-openehr-client-impl/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<artifactId>dsf-openehr-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-openehr/dsf-openehr-client-stub/pom.xml b/dsf-openehr/dsf-openehr-client-stub/pom.xml
index 7f77779c0..e9f9e7cc5 100644
--- a/dsf-openehr/dsf-openehr-client-stub/pom.xml
+++ b/dsf-openehr/dsf-openehr-client-stub/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>dsf-openehr-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-openehr/dsf-openehr-client/pom.xml b/dsf-openehr/dsf-openehr-client/pom.xml
index bb2a0393f..3eab89cd2 100644
--- a/dsf-openehr/dsf-openehr-client/pom.xml
+++ b/dsf-openehr/dsf-openehr-client/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>dsf-openehr-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-openehr/dsf-openehr-model/pom.xml b/dsf-openehr/dsf-openehr-model/pom.xml
index 44d5ac22c..21161a9a3 100644
--- a/dsf-openehr/dsf-openehr-model/pom.xml
+++ b/dsf-openehr/dsf-openehr-model/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>dsf-openehr-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-openehr/pom.xml b/dsf-openehr/pom.xml
index 342114129..8f35bf9a8 100755
--- a/dsf-openehr/pom.xml
+++ b/dsf-openehr/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<artifactId>dsf-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<modules>
diff --git a/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml
index 649f69e46..7822e8b1d 100644
--- a/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml
+++ b/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-pseudonymization-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml
index a5c5aaa98..eb2d0f9ec 100644
--- a/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml
+++ b/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-pseudonymization-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml
index 9054d76f0..f486d7025 100644
--- a/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml
+++ b/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-pseudonymization-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-pseudonymization/pom.xml b/dsf-pseudonymization/pom.xml
index e9d4580ae..3b508efc4 100644
--- a/dsf-pseudonymization/pom.xml
+++ b/dsf-pseudonymization/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<modules>
diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml
index b6de89060..32d024d70 100644
--- a/dsf-tools/dsf-tools-build-info-reader/pom.xml
+++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-tools-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml
index 854f59e1c..11f891fc6 100755
--- a/dsf-tools/dsf-tools-bundle-generator/pom.xml
+++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-tools-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml
index 21d017893..155358d65 100755
--- a/dsf-tools/dsf-tools-db-migration/pom.xml
+++ b/dsf-tools/dsf-tools-db-migration/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-tools-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml
index 070440f42..24d2b42c9 100644
--- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml
+++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-tools-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml
index 90f7c226b..a3ae86492 100755
--- a/dsf-tools/dsf-tools-proxy-test/pom.xml
+++ b/dsf-tools/dsf-tools-proxy-test/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-tools-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml
index 5653fd619..b075fd06d 100755
--- a/dsf-tools/dsf-tools-test-data-generator/pom.xml
+++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-tools-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 	
 	<properties>
diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml
index c46aa7c49..ca7d7d7cf 100755
--- a/dsf-tools/pom.xml
+++ b/dsf-tools/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-pom</artifactId>
-		<version>0.5.3-SNAPSHOT</version>
+		<version>0.5.3</version>
 	</parent>
 
 	<modules>
diff --git a/pom.xml b/pom.xml
index ed051296b..e445600a6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.highmed.dsf</groupId>
 	<artifactId>dsf-pom</artifactId>
-	<version>0.5.3-SNAPSHOT</version>
+	<version>0.5.3</version>
 	<packaging>pom</packaging>
 
 	<modules>