diff --git a/Makefile b/Makefile
index 353513e..8fc8557 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
 #
 VERSION_MAJOR			:= 2
 VERSION_MINOR			:= 8
-VERSION_PATCH			:= 16
+VERSION_PATCH			:= 17
 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 136ab75..36b35bb 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -3,6 +3,54 @@
 This document contains a summary of the new features, changes, fixes and known
 issues in each release of Trusted Firmware-A.
 
+## [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
+
+- **Services**
+
+  - **ERRATA ABI**
+
+    - optimize errata ABI using errata framework ([5c41582](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/5c41582ce9bda0857602af7da4be9bcfcc95ac94))
+    - workaround platforms non-arm interconnect ([992bc50](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/992bc50a1d037679c333ab3286be6a0a15a08bbd))
+
+### Miscellaneous
+
+- add dependency files generated by tools to .gitignore ([49fdb33](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/49fdb333b06f6152ea3f3568ec341f5eec0b59d5))
+- rearrange the fvp_cpu_errata.mk file ([5bd17d8](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/5bd17d849da4a07a72778956dab21c55ffe23cbe))
+- rename Poseidon to Neoverse V3 ([a1bd6dc](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/a1bd6dc766ab433a79f84fd6cb38bcc24be460d3))
+
+### Resolved Issues
+
+- **Libraries**
+
+  - **CPU Support**
+
+    - add erratum 2701951 to Cortex-X3's list ([538c637](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/538c637ed2ea9438f7d6afd93c1df3ebb0c0204f))
+    - fix a defect in Cortex-A715 erratum 2561034 ([f14464e](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/f14464ed5728e8d3fd9fc9687508745e30a089b6))
+    - workaround for Cortex-A715 erratum 2331818 ([877e934](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/877e9341c662aaa4f2f76f7b8495e9210b36b09e))
+    - workaround for Cortex-A715 erratum 2344187 ([bd32e62](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/bd32e62e8a2944f8739fc862b0be3adcb8ef23f2))
+    - workaround for Cortex-A715 erratum 2413290 ([39e3e65](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/39e3e65ff9f2ca2a616c960d7ea8b3b6c5c20d41))
+    - workaround for Cortex-A715 erratum 2413290 ([81270d9](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/81270d9ac7db339fca74ad36e389e82bacbd6891))
+    - workaround for Cortex-A715 erratum 2420947 ([84e8de6](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/84e8de60cc7f53ec86fb42ccbc424de0046772c9))
+    - workaround for Cortex-A715 erratum 2429384 ([6a8a867](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/6a8a8671c692bf603550dcd98ce24f1e47885252))
+    - workaround for Cortex-A720 erratum 2926083 ([205980a](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/205980a83a4b8388e7e1ca384ab6b71008103148))
+    - workaround for Cortex-A720 erratum 2940794 ([4696806](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/469680668282cf4c24adb90a4ddca5815fe533dc))
+    - workaround for Cortex-X3 erratum 2372204 ([f3557c4](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/f3557c49e34a11444b3a9760f4da9a0c91da82ee))
+    - workaround for Cortex-X4 erratum 2701112 ([656c431](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/656c431e0cf036cdac8bf0cc3f512496fe975906))
+
+- **Drivers**
+
+  - **Arm**
+
+    - **GIC**
+
+      - **GICv3**
+
+        - **GIC-600**
+
+          - workaround for Part 1 of GIC600 erratum 2384374 ([abf8a21](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/abf8a21b546a8dd7d101809a833887c1fa75fcbb))
+
 ## [lts-2.8.16](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.8.15..refs/tags/lts-v2.8.16) (2024-02-08)
 
 ### Resolved Issues
diff --git a/docs/conf.py b/docs/conf.py
index 6a89e22..228644c 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.16"
-release = "2.8.16"
+version = "2.8.17"
+release = "2.8.17"
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/package-lock.json b/package-lock.json
index 4203e07..28b10f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.8.16",
+  "version": "2.8.17",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "trusted-firmware-a",
-      "version": "2.8.16",
+      "version": "2.8.17",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
       "devDependencies": {
diff --git a/package.json b/package.json
index 2a99e7d..ce8458e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.8.16",
+  "version": "2.8.17",
   "license": "BSD-3-Clause",
   "private": true,
   "scripts": {
diff --git a/pyproject.toml b/pyproject.toml
index f5a8ec2..9e68b01 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trusted-firmware-a"
-version = "2.8.16"
+version = "2.8.17"
 description = "Trusted Firmware-A (TF-A) Python dependencies."
 authors = ["Arm Ltd."]
 license = "BSD-3-Clause"
diff --git a/readme.rst b/readme.rst
index 148d477..c68ccc7 100644
--- a/readme.rst
+++ b/readme.rst
@@ -49,3 +49,4 @@
 .. _view the full documentation: https://www.trustedfirmware.org/docs/tf-a
 .. _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 d1793f7..e206c92 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.16",
+  "version": "2.8.17",
   "license": "BSD-3-Clause",
   "private": true,
   "main": "index.js",