diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
index d1e1ac21f835..da2f9b5fcde4 100644
--- a/CHANGELOG.mdx
+++ b/CHANGELOG.mdx
@@ -16,6 +16,23 @@ https://github.com/RasaHQ/rasa/tree/master/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [2.2.1] - 2020-12-17
+                       
+
+### Bugfixes
+- [#7557](https://github.com/rasahq/rasa/issues/7557): Fixed a problem where a [form](forms.mdx) wouldn't reject when the 
+  `FormValidationAction` re-implemented `required_slots`.
+- [#7585](https://github.com/rasahq/rasa/issues/7585): Fixed an error when using the [SQLTrackerStore](tracker-stores.mdx#sqltrackerstore)
+  with a Postgres database and the parameter `login_db` specified.
+
+  The error was:
+
+  ```bash
+  psycopg2.errors.SyntaxError: syntax error at end of input
+  rasa-production_1  | LINE 1: SELECT 1 FROM pg_catalog.pg_database WHERE datname = ?
+  ```
+
+
 ## [2.2.0] - 2020-12-16
                        
 
diff --git a/changelog/7557.bugfix.md b/changelog/7557.bugfix.md
deleted file mode 100644
index 10b4256e0e98..000000000000
--- a/changelog/7557.bugfix.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a problem where a [form](forms.mdx) wouldn't reject when the 
-`FormValidationAction` re-implemented `required_slots`.
diff --git a/changelog/7585.bugfix.md b/changelog/7585.bugfix.md
deleted file mode 100644
index afba247b7807..000000000000
--- a/changelog/7585.bugfix.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Fixed an error when using the [SQLTrackerStore](tracker-stores.mdx#sqltrackerstore)
-with a Postgres database and the parameter `login_db` specified.
-
-The error was:
-
-```bash
-psycopg2.errors.SyntaxError: syntax error at end of input
-rasa-production_1  | LINE 1: SELECT 1 FROM pg_catalog.pg_database WHERE datname = ?
-```
diff --git a/pyproject.toml b/pyproject.toml
index e93ff8505132..1e9917a8fa23 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .pytest_cache | build | dist))"
 
 [tool.poetry]
 name = "rasa"
-version = "2.2.0"
+version = "2.2.1"
 description = "Open source machine learning framework to automate text- and voice-based conversations: NLU, dialogue management, connect to Slack, Facebook, and more - Create chatbots and voice assistants"
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
diff --git a/rasa/version.py b/rasa/version.py
index dffc96899128..f50a13fb3df6 100644
--- a/rasa/version.py
+++ b/rasa/version.py
@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "2.2.0"
+__version__ = "2.2.1"