diff --git a/Makefile b/Makefile
index 8fc8557..ec3d69f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
 #
 VERSION_MAJOR			:= 2
 VERSION_MINOR			:= 8
-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 36b35bb..195942c 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -3,6 +3,18 @@
 This document contains a summary of the new features, changes, fixes and known
 issues in each release of Trusted Firmware-A.
 
+## [lts-2.8.18](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.8.17..refs/tags/lts-v2.8.18) (2024-04-26)
+
+### New Features
+
+- **Drivers**
+
+  - **Authentication**
+
+    - **mbedTLS**
+
+      - upgrade to version v2.28.8 ([a1cb5f6](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/a1cb5f656e5e19741e840e452aa51f71fe24efbb))
+
 ## [lts-2.8.17](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.8.16..refs/tags/lts-v2.8.17) (2024-04-12)
 
 ### Code Refactoring
diff --git a/docs/conf.py b/docs/conf.py
index 228644c..9ccea09 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,8 +14,8 @@
 
 project = "Trusted Firmware-A"
 author = "Trusted Firmware-A contributors"
-version = "2.8.17"
-release = "2.8.17"
+version = "2.8.18"
+release = "2.8.18"
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/package-lock.json b/package-lock.json
index 28b10f1..edd700f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.8.17",
+  "version": "2.8.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "trusted-firmware-a",
-      "version": "2.8.17",
+      "version": "2.8.18",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
       "devDependencies": {
diff --git a/package.json b/package.json
index ce8458e..ee75925 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.8.17",
+  "version": "2.8.18",
   "license": "BSD-3-Clause",
   "private": true,
   "scripts": {
diff --git a/pyproject.toml b/pyproject.toml
index 9e68b01..0cef587 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trusted-firmware-a"
-version = "2.8.17"
+version = "2.8.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 c68ccc7..c8cb86f 100644
--- a/readme.rst
+++ b/readme.rst
@@ -50,3 +50,4 @@
 .. _trustedfirmware.org: http://www.trustedfirmware.org
 
 
+
diff --git a/tools/conventional-changelog-tf-a/package.json b/tools/conventional-changelog-tf-a/package.json
index e206c92..a5ff8b0 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.8.17",
+  "version": "2.8.18",
   "license": "BSD-3-Clause",
   "private": true,
   "main": "index.js",