diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5a6f312..e77a5195 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog][keep-a-changelog].
 
 # [Unreleased]
 
-[Unreleased]: https://github.com/shipperstack/shipper/compare/2.36.5...HEAD
+[Unreleased]: https://github.com/shipperstack/shipper/compare/2.36.6...HEAD
+
+# [2.36.6] - 2024-05-02
+
+## Changed
+
+- Fixed mirror server URLs not prepending the device codename as the base upload path
+
+[2.36.6]: https://github.com/shipperstack/shipper/compare/2.36.5...2.36.6
 
 # [2.36.5] - 2024-05-02
 
diff --git a/server/version.txt b/server/version.txt
index 52d1fdbc..b9d0ef57 100644
--- a/server/version.txt
+++ b/server/version.txt
@@ -1 +1 @@
-2.36.5
\ No newline at end of file
+2.36.6
\ No newline at end of file
diff --git a/shippy/shippy/version.py b/shippy/shippy/version.py
index 3f132a76..febff670 100644
--- a/shippy/shippy/version.py
+++ b/shippy/shippy/version.py
@@ -1 +1 @@
-__version__ = "2.36.5"
\ No newline at end of file
+__version__ = "2.36.6"
\ No newline at end of file
diff --git a/version.txt b/version.txt
index 52d1fdbc..b9d0ef57 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.36.5
\ No newline at end of file
+2.36.6
\ No newline at end of file