diff --git a/Makefile b/Makefile
index ed35de1..61d8540 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 VERSION_MAJOR			:= 2
 VERSION_MINOR			:= 10
 # VERSION_PATCH is only used for LTS releases
-VERSION_PATCH			:= 17
+VERSION_PATCH			:= 18
 VERSION				:= ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
 
 # Default goal is build all images
diff --git a/docs/change-log.md b/docs/change-log.md
index 8592583..51433bb 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -3,6 +3,17 @@
 This document contains a summary of the new features, changes, fixes and known
 issues in each release of Trusted Firmware-A.
 
+## [lts-2.10.18](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.10.17..refs/tags/lts-v2.10.18) (2025-06-20)
+
+### New Features
+
+- **Libraries**
+
+  - **CPU Support**
+
+    - update cpu_check_csv2 check ([39e7f4a](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/39e7f4a7c7a8db777155c4775b8753432fd6ad22))
+    - implement workaround for DSU-120 erratum 2900952 ([7323c2d](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/7323c2d9ddb03fc9f0a62e61340d20743494918b))
+
 ## [lts-2.10.17](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.10.16..refs/tags/lts-v2.10.17) (2025-05-23)
 
 ### Build System
diff --git a/docs/conf.py b/docs/conf.py
index 3ddcc92..9bc4388 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,8 +14,8 @@
 
 project = "Trusted Firmware-A"
 author = "Trusted Firmware-A contributors"
-version = "2.10.17"
-release = "2.10.17"
+version = "2.10.18"
+release = "2.10.18"
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/package-lock.json b/package-lock.json
index 3c407bc..db8ad39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.10.17",
+  "version": "2.10.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "trusted-firmware-a",
-      "version": "2.10.17",
+      "version": "2.10.18",
       "license": "BSD-3-Clause",
       "devDependencies": {
         "@commitlint/cli": "^19.0.0",
diff --git a/package.json b/package.json
index 1d89d32..9f44577 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.10.17",
+  "version": "2.10.18",
   "license": "BSD-3-Clause",
   "type": "module",
   "private": true,
diff --git a/pyproject.toml b/pyproject.toml
index 469bcf9..23b7f58 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trusted-firmware-a"
-version = "2.10.17"
+version = "2.10.18"
 description = "Trusted Firmware-A (TF-A) Python dependencies."
 authors = ["Arm Ltd."]
 license = "BSD-3-Clause"
diff --git a/readme.rst b/readme.rst
index 0d71781..1380637 100644
--- a/readme.rst
+++ b/readme.rst
@@ -63,3 +63,4 @@
 
 
 
+
diff --git a/tools/conventional-changelog-tf-a/package.json b/tools/conventional-changelog-tf-a/package.json
index f66b2ae..810569e 100644
--- a/tools/conventional-changelog-tf-a/package.json
+++ b/tools/conventional-changelog-tf-a/package.json
@@ -1,6 +1,6 @@
 {
   "name": "conventional-changelog-tf-a",
-  "version": "2.10.17",
+  "version": "2.10.18",
   "license": "BSD-3-Clause",
   "private": true,
   "main": "index.js",