diff --git a/CHANGELOG.md b/CHANGELOG.md
index e77a5195..a5f30add 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,16 @@ The format is based on [Keep a Changelog][keep-a-changelog].
 
 # [Unreleased]
 
-[Unreleased]: https://github.com/shipperstack/shipper/compare/2.36.6...HEAD
+[Unreleased]: https://github.com/shipperstack/shipper/compare/2.36.7...HEAD
+
+
+# [2.36.7] - 2024-05-06
+
+## Changed
+- Fixed shippy blocking login with the console status indicator
+- Fixed shippy recommending upgrade commands without considering installation method
+
+[2.36.7]: https://github.com/shipperstack/shipper/compare/2.36.6...2.36.7
 
 # [2.36.6] - 2024-05-02
 
diff --git a/server/version.txt b/server/version.txt
index b9d0ef57..b1367c7d 100644
--- a/server/version.txt
+++ b/server/version.txt
@@ -1 +1 @@
-2.36.6
\ No newline at end of file
+2.36.7
\ No newline at end of file
diff --git a/shippy/shippy/version.py b/shippy/shippy/version.py
index febff670..1599d3cd 100644
--- a/shippy/shippy/version.py
+++ b/shippy/shippy/version.py
@@ -1 +1 @@
-__version__ = "2.36.6"
\ No newline at end of file
+__version__ = "2.36.7"
\ No newline at end of file
diff --git a/version.txt b/version.txt
index b9d0ef57..b1367c7d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.36.6
\ No newline at end of file
+2.36.7
\ No newline at end of file