diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
index 8efe6d303a21..a0d7ebd27de6 100644
--- a/CHANGELOG.mdx
+++ b/CHANGELOG.mdx
@@ -16,6 +16,13 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [3.6.18] - 2024-02-23
+                        
+Rasa 3.6.18 (2024-02-23)                         
+### Bugfixes
+- [#13017](https://github.com/rasahq/rasa/issues/13017): Flush messages when Kafka producer is closed. This is to ensure that all messages in the producer's internal queue are sent to the broker.
+
+
 ## [3.6.17] - 2024-02-13
                         
 Rasa 3.6.17 (2024-02-13)                         
diff --git a/changelog/13017.bugfix.md b/changelog/13017.bugfix.md
deleted file mode 100644
index 654e62aafa2c..000000000000
--- a/changelog/13017.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Flush messages when Kafka producer is closed. This is to ensure that all messages in the producer's internal queue are sent to the broker.
diff --git a/pyproject.toml b/pyproject.toml
index 913610027cf5..f52ef4094521 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .pytest_cache | build | dist))"
 
 [tool.poetry]
 name = "rasa"
-version = "3.6.17"
+version = "3.6.18"
 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 6a7745b5540c..bbd3bcf024cb 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__ = "3.6.17"
+__version__ = "3.6.18"