diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea846bd..bd9bef5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,13 @@
 <a name="unreleased"></a>
 ## [Unreleased]
 
-### Routine
 
-- Remove jenkins admin-console perf operator logic ([#10](https://github.com/epam/edp-gerrit-operator/issues/10))
-- Upgrade Go to 1.20 ([#8](https://github.com/epam/edp-gerrit-operator/issues/8))
-- Update current development version ([#7](https://github.com/epam/edp-gerrit-operator/issues/7))
+<a name="v2.18.0"></a>
+## v2.18.0 - 2023-11-01
+### Features
 
+- Add label to the secret gerrit-ciuser-sshkey ([#14](https://github.com/epam/edp-gerrit-operator/issues/14))
 
-<a name="v2.17.1"></a>
-## [v2.17.1] - 2023-09-25
-### Routine
-
-- Upgrade Go to 1.20 ([#8](https://github.com/epam/edp-gerrit-operator/issues/8))
-- Update CHANGELOG.md ([#85](https://github.com/epam/edp-gerrit-operator/issues/85))
-
-
-<a name="v2.17.0"></a>
-## [v2.17.0] - 2023-09-20
 ### Bug Fixes
 
 - Use crypto rand to generate secure ED25519 private key check fields ([#5](https://github.com/epam/edp-gerrit-operator/issues/5))
@@ -28,13 +18,17 @@
 
 ### Routine
 
+- Fix branch for GH Actions ([#8](https://github.com/epam/edp-gerrit-operator/issues/8))
+- Bump golang.org/x/net from 0.8.0 to 0.17.0 ([#13](https://github.com/epam/edp-gerrit-operator/issues/13))
+- Update changelog ([#11](https://github.com/epam/edp-gerrit-operator/issues/11))
+- Remove jenkins admin-console perf operator logic ([#10](https://github.com/epam/edp-gerrit-operator/issues/10))
+- Upgrade Go to 1.20 ([#8](https://github.com/epam/edp-gerrit-operator/issues/8))
+- Update current development version ([#7](https://github.com/epam/edp-gerrit-operator/issues/7))
 - Update current development version ([#4](https://github.com/epam/edp-gerrit-operator/issues/4))
 
+### Documentation
+
+- Fix bage path for the build GH Action ([#8](https://github.com/epam/edp-gerrit-operator/issues/8))
 
-<a name="v2.16.0"></a>
-## [v2.16.0] - 2023-08-17
 
-[Unreleased]: https://github.com/epam/edp-gerrit-operator/compare/v2.17.1...HEAD
-[v2.17.1]: https://github.com/epam/edp-gerrit-operator/compare/v2.17.0...v2.17.1
-[v2.17.0]: https://github.com/epam/edp-gerrit-operator/compare/v2.16.0...v2.17.0
-[v2.16.0]: https://github.com/epam/edp-gerrit-operator/compare/v2.15.0...v2.16.0
+[Unreleased]: https://github.com/epam/edp-gerrit-operator/compare/v2.18.0...HEAD
diff --git a/deploy-templates/Chart.yaml b/deploy-templates/Chart.yaml
index 7aa07bb..1c55e3a 100644
--- a/deploy-templates/Chart.yaml
+++ b/deploy-templates/Chart.yaml
@@ -3,8 +3,8 @@ description: A Helm chart for EDP Gerrit Operator
 home: https://epam.github.io/edp-install/
 name: gerrit-operator
 type: application
-version: 2.18.0-SNAPSHOT
-appVersion: 2.18.0-SNAPSHOT
+version: 2.18.0
+appVersion: 2.18.0
 icon: https://epam.github.io/edp-install/assets/logo.png
 keywords:
   - edp
diff --git a/deploy-templates/README.md b/deploy-templates/README.md
index 45e7ff0..ab472b7 100644
--- a/deploy-templates/README.md
+++ b/deploy-templates/README.md
@@ -1,6 +1,6 @@
 # gerrit-operator
 
-![Version: 2.18.0-SNAPSHOT](https://img.shields.io/badge/Version-2.18.0--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.18.0-SNAPSHOT](https://img.shields.io/badge/AppVersion-2.18.0--SNAPSHOT-informational?style=flat-square)
+![Version: 2.18.0](https://img.shields.io/badge/Version-2.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.18.0](https://img.shields.io/badge/AppVersion-2.18.0-informational?style=flat-square)
 
 A Helm chart for EDP Gerrit Operator