diff --git a/CHANGES.rst b/CHANGES.rst
index 81cd8a9..1287c04 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,6 +3,52 @@
 Release History
 ---------------
 
+v5.8.0 (2024-04-17)
++++++++++++++++++++
+
+Features
+^^^^^^^^
+
+* **redis:** added --db flag to pick redis DB to connect to
+* **router:** allow proper ports override to specify custom ports on router.
+* **dev-env:** fast start celery/ssh on dev env, but replace them with code-based instances if they are started
+* **dev-env:** optimized celery/ssh dev instances startup options
+* **dev-tools:** allow running celery/celeryd for dev in more flexible ways
+
+Fixes
+^^^^^
+
+* **celery:** use higher CLI value for max-tasks-per-child as a default for rcstack
+* **celery:** make sure celery workers get proper hostnames set for scaling
+* **cli-tools:** fixed issue with CLI tools selecting node for execution for older docker
+* **db:** fixed missing profiles for selecting different database type
+* **dev-tools:** fix SSH port bind on dev version of sshd server
+* **dev-tools:** make celeryd start with dev-env
+* **docs:** fixed error in docs syntax
+* **docs:** fixed ordering
+* **docs:** added info about SVN re-config when moving to Docker
+* **docs:** remove skip to content which is redundant
+* **getting-started:** added more explicit info how to start all using single command
+* **svn:** fixed default apache config
+
+Chore
+^^^^^
+
+* **docker compose:** remove file version strings as they are deprecated since new compose version
+* **deps:** use python 3.11.8 from now on
+* **docs:** added few extra inline comments on port changes on traefik
+* **version:** bumped to 5.8.0
+
+Docs
+^^^^
+
+* updated docs with custom SSL ports and other fixes
+* fixed missing migration step that would make sure proper permissions are set on filesystem
+* **dev:** updated dev docs
+* **install:** updated docs for installation topics
+* **migration:** added intersphinx compat link to migration
+* **scaling:** updates scaling section to instruct how to scale ssh and celery
+
 v5.7.0 (2024-01-31)
 +++++++++++++++++++