diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69098fb41..6c1617ca0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## v0.13.3
+
+### Bugfixes
+
+* Fix Failing Metrics Endpoint ([#547](https://github.com/samply/blaze/pull/547))
+
+### Security
+
+* Fix CVE-2021-37137 in Package io.netty:netty-codec ([#548](https://github.com/samply/blaze/pull/548))
+
+The full changelog can be found [here](https://github.com/samply/blaze/milestone/18?closed=1).
+
 ## v0.13.2
 
 ### Security
diff --git a/docs/deployment/docker-deployment.md b/docs/deployment/docker-deployment.md
index a2412de0a..c191a965c 100644
--- a/docs/deployment/docker-deployment.md
+++ b/docs/deployment/docker-deployment.md
@@ -27,7 +27,7 @@ Blaze should log something like this:
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB
 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8
-2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.13.2 in 8.2 seconds
+2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.13.3 in 8.2 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -47,7 +47,7 @@ that should return:
 ```json
 {
   "name": "Blaze",
-  "version": "0.13.2"
+  "version": "0.13.3"
 }
 ```
 
diff --git a/docs/deployment/manual-deployment.md b/docs/deployment/manual-deployment.md
index 9456e10bf..d85c4f659 100644
--- a/docs/deployment/manual-deployment.md
+++ b/docs/deployment/manual-deployment.md
@@ -2,12 +2,12 @@
 
 The installation works under Windows, Linux and macOS. The only dependency is an installed OpenJDK 11. Blaze is tested with [AdoptOpenJDK][1].
 
-Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.13.1). Look for `blaze-0.13.2-standalone.jar`.
+Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.13.1). Look for `blaze-0.13.3-standalone.jar`.
 
 After the download, you can start blaze with the following command (Linux, macOS):
 
 ```sh
-java -jar blaze-0.13.2-standalone.jar -m blaze.core
+java -jar blaze-0.13.3-standalone.jar -m blaze.core
 ```
 
 Blaze will run with an in-memory, volatile database for testing and demo purposes.
@@ -17,14 +17,14 @@ Blaze can be run with durable storage by setting the environment variables `STOR
 Under Linux/macOS:
 
 ```sh
-STORAGE=standalone java -jar blaze-0.13.2-standalone.jar -m blaze.core
+STORAGE=standalone java -jar blaze-0.13.3-standalone.jar -m blaze.core
 ```
 
 Under Windows, you need to set the Environment variables in the PowerShell before starting Blaze:
 
 ```powershell
 $Env:STORAGE="standalone"
-java -jar blaze-0.13.2-standalone.jar -m blaze.core
+java -jar blaze-0.13.3-standalone.jar -m blaze.core
 ```
 
 This will create three directories called `index`, `transaction` and `resource` inside the current working directory, one for each database part used.
@@ -42,7 +42,7 @@ The output should look like this:
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB
 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8
-2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.13.2 in 8.2 seconds
+2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.13.3 in 8.2 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -62,7 +62,7 @@ that should return:
 ```json
 {
   "name": "Blaze",
-  "version": "0.13.2"
+  "version": "0.13.3"
 }
 ```
 
diff --git a/modules/rest-api/src/blaze/rest_api/capabilities.clj b/modules/rest-api/src/blaze/rest_api/capabilities.clj
index 96743d14a..bc8e55ee7 100644
--- a/modules/rest-api/src/blaze/rest_api/capabilities.clj
+++ b/modules/rest-api/src/blaze/rest_api/capabilities.clj
@@ -108,7 +108,7 @@
          :copyright
          #fhir/markdown"Copyright 2019 - 2021 The Samply Community\n\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License."
          :kind #fhir/code"instance"
-         :date #fhir/dateTime"2021-11-22"
+         :date #fhir/dateTime"2021-11-26"
          :software
          {:name "Blaze"
           :version version}
diff --git a/perf-test/gatling/pom.xml b/perf-test/gatling/pom.xml
index 5e2f4c259..b29d7a627 100644
--- a/perf-test/gatling/pom.xml
+++ b/perf-test/gatling/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>samply.blaze</groupId>
   <artifactId>gatling</artifactId>
-  <version>0.13.2</version>
+  <version>0.13.3</version>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/pom.xml b/pom.xml
index 9168fa9f6..cfd753f8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>samply</groupId>
     <artifactId>blaze</artifactId>
-    <version>0.13.2</version>
+    <version>0.13.3</version>
     <name>blaze</name>
 
     <description>A FHIR Store with internal, fast CQL Evaluation Engine</description>
diff --git a/src/blaze/system.clj b/src/blaze/system.clj
index d4517ba44..53a2724ce 100644
--- a/src/blaze/system.clj
+++ b/src/blaze/system.clj
@@ -87,7 +87,7 @@
 
 
 (def ^:private root-config
-  {:blaze/version "0.13.2"
+  {:blaze/version "0.13.3"
 
    :blaze/clock {}