diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
index c606863c3248..4ac74ce48a53 100644
--- a/CHANGELOG.mdx
+++ b/CHANGELOG.mdx
@@ -16,6 +16,14 @@ https://github.com/RasaHQ/rasa/tree/master/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [2.0.4] - 2020-11-08
+                       
+
+### Bugfixes
+- [#7140](https://github.com/rasahq/rasa/issues/7140): Fixed error when starting Rasa X locally without a proper git setup.
+- [#7186](https://github.com/rasahq/rasa/issues/7186): Properly validate incoming webhook requests for the Slack connector to be authentic.
+
+
 ## [2.0.3] - 2020-10-29
                        
 
diff --git a/changelog/7140.bugfix.md b/changelog/7140.bugfix.md
deleted file mode 100644
index 1531ac146b6e..000000000000
--- a/changelog/7140.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Fixed error when starting Rasa X locally without a proper git setup.
diff --git a/changelog/7186.bugfix.md b/changelog/7186.bugfix.md
deleted file mode 100644
index 587e4f8aa950..000000000000
--- a/changelog/7186.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Properly validate incoming webhook requests for the Slack connector to be authentic.
diff --git a/pyproject.toml b/pyproject.toml
index 0418e771ee32..5dcc7bf1571d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .pytype | .pytest_cache | build | dist))"
 
 [tool.poetry]
 name = "rasa"
-version = "2.0.3"
+version = "2.0.4"
 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 60eccf632a5a..eaa9d963da11 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.0.3"
+__version__ = "2.0.4"