diff --git a/CHANGELOG.md b/CHANGELOG.md
index 934bfc7..cfab38f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
 - [Change Log](#change-log)
-  - [Unreleased](#unreleased)
+  - [v0.0.6 (2019-12-20)](#v006-2019-12-20)
   - [v0.0.5 (2019-12-11)](#v005-2019-12-11)
   - [v0.0.4 (2019-12-11)](#v004-2019-12-11)
   - [v0.0.3 (2019-11-18)](#v003-2019-11-18)
@@ -17,14 +17,19 @@
 
 # Change Log
 
-## [Unreleased](https://github.com/ory/oathkeeper-maester/tree/HEAD)
-
-[Full Changelog](https://github.com/ory/oathkeeper-maester/compare/v0.0.5...HEAD)
+## [v0.0.6](https://github.com/ory/oathkeeper-maester/tree/v0.0.6) (2019-12-20)
+[Full Changelog](https://github.com/ory/oathkeeper-maester/compare/v0.0.5...v0.0.6)
 
 **Closed issues:**
 
+- Broken handling of rules across namespaces [\#36](https://github.com/ory/oathkeeper-maester/issues/36)
+- Add leader election flag to the controller [\#35](https://github.com/ory/oathkeeper-maester/issues/35)
 - High memory consumption in clusters with many ConfigMaps [\#32](https://github.com/ory/oathkeeper-maester/issues/32)
 
+**Merged pull requests:**
+
+- Filter only if CM field is set [\#37](https://github.com/ory/oathkeeper-maester/pull/37) ([Demonsthere](https://github.com/Demonsthere))
+
 ## [v0.0.5](https://github.com/ory/oathkeeper-maester/tree/v0.0.5) (2019-12-11)
 [Full Changelog](https://github.com/ory/oathkeeper-maester/compare/v0.0.4...v0.0.5)
 
@@ -48,6 +53,7 @@
 
 **Merged pull requests:**
 
+- Feature: configurable configmap [\#30](https://github.com/ory/oathkeeper-maester/pull/30) ([paulbdavis](https://github.com/paulbdavis))
 - Update CI config [\#29](https://github.com/ory/oathkeeper-maester/pull/29) ([piotrmsc](https://github.com/piotrmsc))
 
 ## [v0.0.2-beta-2](https://github.com/ory/oathkeeper-maester/tree/v0.0.2-beta-2) (2019-11-12)
@@ -99,7 +105,6 @@
 ## [v0.0.1-beta.1](https://github.com/ory/oathkeeper-maester/tree/v0.0.1-beta.1) (2019-07-29)
 **Merged pull requests:**
 
-- Feature: configurable configmap [\#30](https://github.com/ory/oathkeeper-maester/pull/30) ([paulbdavis](https://github.com/paulbdavis))
 - Move dataKey to cmd parameters [\#12](https://github.com/ory/oathkeeper-maester/pull/12) ([Demonsthere](https://github.com/Demonsthere))
 - Release step in the CI [\#11](https://github.com/ory/oathkeeper-maester/pull/11) ([piotrmsc](https://github.com/piotrmsc))
 - Rule controller tests [\#8](https://github.com/ory/oathkeeper-maester/pull/8) ([Tomasz-Smelcerz-SAP](https://github.com/Tomasz-Smelcerz-SAP))