diff --git a/Makefile b/Makefile
index aa446c1..037330f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 VERSION_MAJOR			:= 2
 VERSION_MINOR			:= 12
 # VERSION_PATCH is only used for LTS releases
-VERSION_PATCH			:= 3
+VERSION_PATCH			:= 4
 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 05326f5..bb27b06 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -3,6 +3,25 @@
 This document contains a summary of the new features, changes, fixes and known
 issues in each release of Trusted Firmware-A.
 
+## [lts-2.12.4](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.12.3..refs/tags/lts-v2.12.4) (2025-06-20)
+
+### Resolved Issues
+
+- **Libraries**
+
+  - **CPU Support**
+
+    - remove accidental alto cpu addition ([648b4f3](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/648b4f34f9c74b7bb23f10ee15cb59322f7f5354))
+
+### New Features
+
+- **Libraries**
+
+  - **CPU Support**
+
+    - update cpu_check_csv2 check ([6845376](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/68453765e7ed0369b425fdda49d78fbfc61571cd))
+    - implement workaround for DSU-120 erratum 2900952 ([e21418b](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/e21418b78e45d4ace6938ffd5f37ce68dba6f986))
+
 ## [lts-2.12.3](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.12.2..refs/tags/lts-v2.12.3) (2025-05-23)
 
 ### Code Refactoring
diff --git a/docs/conf.py b/docs/conf.py
index 1453202..753e988 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,8 +14,8 @@
 
 project = "Trusted Firmware-A"
 author = "Trusted Firmware-A contributors"
-version = "2.12.3"
-release = "2.12.3"
+version = "2.12.4"
+release = "2.12.4"
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/package-lock.json b/package-lock.json
index 48f7b29..622c3ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.12.3",
+  "version": "2.12.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "trusted-firmware-a",
-      "version": "2.12.3",
+      "version": "2.12.4",
       "license": "BSD-3-Clause",
       "devDependencies": {
         "@commitlint/cli": "^19.0.0",
diff --git a/package.json b/package.json
index d9364e2..c61f4a4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.12.3",
+  "version": "2.12.4",
   "license": "BSD-3-Clause",
   "type": "module",
   "private": true,
diff --git a/pyproject.toml b/pyproject.toml
index 8038c40..b359954 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trusted-firmware-a"
-version = "2.12.3"
+version = "2.12.4"
 description = "Trusted Firmware-A (TF-A) Python dependencies."
 authors = ["Arm Ltd."]
 license = "BSD-3-Clause"
diff --git a/readme.rst b/readme.rst
index 206c9c7..37bf498 100644
--- a/readme.rst
+++ b/readme.rst
@@ -52,3 +52,4 @@
 
 
 
+
diff --git a/tools/conventional-changelog-tf-a/package.json b/tools/conventional-changelog-tf-a/package.json
index f9fa5ce..badc3ba 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.12.3",
+  "version": "2.12.4",
   "license": "BSD-3-Clause",
   "private": true,
   "main": "index.js",