diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0eac8d160da..a9c99bbbe0a4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,6 +2,7 @@ version: 2.1
 
 orbs:
   sdk: ory/sdk@0.1.13
+  changelog: ory/changelog@0.0.5
 
 jobs:
   lint:
@@ -92,8 +93,7 @@ jobs:
         run: test -z "$CIRCLE_PR_NUMBER" && goveralls -service=circle-ci -coverprofile=coverage.txt -repotoken=$COVERALLS_REPO_TOKEN || echo "forks are not allowed to push to coveralls"
 
 workflows:
-  version: 2
-  "test":
+  tbr:
     jobs:
       -
         lint:
@@ -124,4 +124,13 @@ workflows:
             tags:
               only: /.*/
             branches:
-              ignore: /.*/
\ No newline at end of file
+              ignore: /.*/
+      - changelog/generate:
+          requires:
+            - test
+            - lint
+          filters:
+            tags:
+              only: /.*/
+            branches:
+              only: master
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000000..e69de29bb2d1