diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..4e92cec
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,49 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+
+- [Change Log](#change-log)
+  - [v0.0.2-test2 (2019-08-30)](#v002-test2-2019-08-30)
+  - [v0.0.2-test1 (2019-08-30)](#v002-test1-2019-08-30)
+  - [v0.0.2 (2019-08-30)](#v002-2019-08-30)
+  - [v0.0.1 (2019-08-29)](#v001-2019-08-29)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+# Change Log
+
+## [v0.0.2-test2](https://github.com/ory/hydra-maester/tree/v0.0.2-test2) (2019-08-30)
+[Full Changelog](https://github.com/ory/hydra-maester/compare/v0.0.2-test1...v0.0.2-test2)
+
+**Merged pull requests:**
+
+- Update release-changelog pipeline [\#16](https://github.com/ory/hydra-maester/pull/16) ([Demonsthere](https://github.com/Demonsthere))
+
+## [v0.0.2-test1](https://github.com/ory/hydra-maester/tree/v0.0.2-test1) (2019-08-30)
+[Full Changelog](https://github.com/ory/hydra-maester/compare/v0.0.2...v0.0.2-test1)
+
+**Merged pull requests:**
+
+- Update Dockerfile [\#14](https://github.com/ory/hydra-maester/pull/14) ([Demonsthere](https://github.com/Demonsthere))
+
+## [v0.0.2](https://github.com/ory/hydra-maester/tree/v0.0.2) (2019-08-30)
+[Full Changelog](https://github.com/ory/hydra-maester/compare/v0.0.1...v0.0.2)
+
+**Merged pull requests:**
+
+- Add valid sample [\#13](https://github.com/ory/hydra-maester/pull/13) ([jakkab](https://github.com/jakkab))
+
+## [v0.0.1](https://github.com/ory/hydra-maester/tree/v0.0.1) (2019-08-29)
+**Merged pull requests:**
+
+- Scaffold controller [\#12](https://github.com/ory/hydra-maester/pull/12) ([jakkab](https://github.com/jakkab))
+- Add goreleaser file [\#11](https://github.com/ory/hydra-maester/pull/11) ([piotrmsc](https://github.com/piotrmsc))
+- Small info [\#10](https://github.com/ory/hydra-maester/pull/10) ([piotrmsc](https://github.com/piotrmsc))
+- Design documents [\#9](https://github.com/ory/hydra-maester/pull/9) ([piotrmsc](https://github.com/piotrmsc))
+- Fix circleci config [\#8](https://github.com/ory/hydra-maester/pull/8) ([piotrmsc](https://github.com/piotrmsc))
+- Initial ci/cd + release config [\#7](https://github.com/ory/hydra-maester/pull/7) ([piotrmsc](https://github.com/piotrmsc))
+- Initial readme [\#1](https://github.com/ory/hydra-maester/pull/1) ([piotrmsc](https://github.com/piotrmsc))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
diff --git a/README.md b/README.md
index e8becf7..135dd25 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,14 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+
+- [Hydra-maester](#hydra-maester)
+  - [Prerequisites](#prerequisites)
+  - [Design](#design)
+  - [How to use it](#how-to-use-it)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
 # Hydra-maester