diff --git a/CHANGELOG.md b/CHANGELOG.md
index 546b2c12ea..14f0bc469f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,221 @@
# Changelog
+## [3.18.5](https://github.com/ynput/OpenPype/tree/3.18.5)
+
+
+[Full Changelog](https://github.com/ynput/OpenPype/compare/3.18.4...3.18.5)
+
+### **🚀 Enhancements**
+
+
+
+Chore: Add addons dir only if exists #6140
+
+Do not add addons directory path for addons discovery if does not exists.
+
+
+___
+
+
+
+
+
+Hiero: Effect Categories - OP-7397 #6143
+
+This PR introduces `Effect Categories` for the Hiero settings. This allows studios to split effect stacks into meaningful subsets.
+
+
+___
+
+
+
+
+
+Nuke: Render Workfile Attributes #6146
+
+`Workfile Dependency` default value can now be controlled from project settings.`Use Published Workfile` makes using published workfiles for rendering optional.
+
+
+___
+
+
+
+### **🐛 Bug fixes**
+
+
+
+Maya: Attributes are locked after publishing if they are locked in Camera Family #6073
+
+This PR is to make sure unlock attributes only during the bake context, make sure attributes are relocked after to preserve the lock state of the original node being baked.
+
+
+___
+
+
+
+
+
+Missing nuke family Windows arguments #6131
+
+Default Windows arguments for launching the Nuke family was missing.
+
+
+___
+
+
+
+
+
+AYON: Fix the bug on the limit group not being set correctly in Maya Deadline Setting #6139
+
+This PR is to bug-fix the limit groups from maya deadline settings errored out when the user tries to edit the setting.
+
+
+___
+
+
+
+
+
+Chore: Transcoding extensions add missing '.tif' extension #6142
+
+Image extensions in transcoding helper was missing `.tif` extension and had `.tiff` twice.
+
+
+___
+
+
+
+
+
+Blender: Use the new API for override context #6145
+
+Blender 4.0 disabled the old API to override context. This API updates the code to use the new API.
+
+
+___
+
+
+
+
+
+BugFix: Include Model in FBX Loader in Houdini #6150
+
+A quick bugfig where we can't load fbx exported from blender. The bug was reported here.
+
+
+___
+
+
+
+
+
+Blender: Restore actions to objects after update #6153
+
+Restore the actions assigned to objects after updating assets from blend files.
+
+
+___
+
+
+
+
+
+Chore: Collect template data with hierarchy context #6154
+
+Fixed queue loop where is used wrong variable to pop items from queue.
+
+
+___
+
+
+
+
+
+OP-6382 - Thumbnail Integration Problem #6156
+
+This ticket alerted to 3 different cases of integration issues;
+- [x] Using the Tray Publisher with the same image format (extension) for representation and review representation.
+- [x] Clash on publish file path from output definitions in `ExtractOIIOTranscode`.
+- [x] Clash on publish file from thumbnail in `ExtractThumbnail`There might be an issue with this fix, if a studio does not use the `{output}` token in their `render` anatomy template. But thinking if they have customized it, they will be responsible to maintain these edge cases.
+
+
+___
+
+
+
+
+
+Max: Bugfix saving camera scene errored out when creating render instance with multi-camera option turned off #6163
+
+This PR is to make sure the integrator of saving camera scene turned off and the render submitted successfully when multi-camera options being turned off in 3dsmax
+
+
+___
+
+
+
+
+
+Chore: Fix duplicated project name on create project structure #6166
+
+Small fix in project folders. It is not used same variable name to change values which breaks values on any next loop.
+
+
+___
+
+
+
+### **Merged pull requests**
+
+
+
+Maya: Remove duplicate plugin #6157
+
+The two plugins below are doing the same work, so we can remove the one focused solely on lookdev.https://github.com/ynput/OpenPype/blob/develop/openpype/hosts/maya/plugins/publish/validate_look_members_unique.pyhttps://github.com/ynput/OpenPype/blob/develop/openpype/hosts/maya/plugins/publish/validate_node_ids_unique.py
+
+
+___
+
+
+
+
+
+Publish report viewer: Report items sorting #6092
+
+Proposal of items sorting in Publish report viewer tool. Items are sorted by report creation time. Creation time is also added to publish report data when saved from publisher tool.
+
+
+___
+
+
+
+
+
+Maya: Extended error message #6161
+
+Added more details to message
+
+
+___
+
+
+
+
+
+Fusion: Added settings for Fusion creators to legacy OP #6162
+
+Added missing OP variant of setting for new Fusion creator.
+
+
+___
+
+
+
+
+
+
## [3.18.4](https://github.com/ynput/OpenPype/tree/3.18.4)
diff --git a/openpype/version.py b/openpype/version.py
index 674ea2cb8a..ddfb3ebeeb 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
"""Package declaring Pype version."""
-__version__ = "3.18.5-nightly.3"
+__version__ = "3.18.5"
diff --git a/pyproject.toml b/pyproject.toml
index f9d5381a15..24172aa77f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "OpenPype"
-version = "3.18.4" # OpenPype
+version = "3.18.5" # OpenPype
description = "Open VFX and Animation pipeline with support."
authors = ["OpenPype Team "]
license = "MIT License"