diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst
index a18f9dd9e9cf2..6322f230da584 100644
--- a/doc/releases/release-notes-4.0.rst
+++ b/doc/releases/release-notes-4.0.rst
@@ -553,8 +553,11 @@ MCUboot
 OSDP
 ****
 
-Trusted Firmware-M
-******************
+Trusted Firmware-M (TF-M)
+*************************
+
+* TF-M was updated to version 2.1.1 (from 2.1.0).
+  The release notes can be found at: https://trustedfirmware-m.readthedocs.io/en/tf-mv2.1.1/releases/2.1.1.html
 
 LVGL
 ****
diff --git a/submanifests/optional.yaml b/submanifests/optional.yaml
index c0c0d45e4ca2d..59e837c877fb8 100644
--- a/submanifests/optional.yaml
+++ b/submanifests/optional.yaml
@@ -46,7 +46,7 @@ manifest:
       groups:
         - optional
     - name: tf-m-tests
-      revision: d552e4f18b92032bd335d5e3aa312f6acd82a83b
+      revision: 502ea90105ee18f20c78f710e2ba2ded0fc0756e
       path: modules/tee/tf-m/tf-m-tests
       remote: upstream
       groups:
diff --git a/west.yml b/west.yml
index f5a8923c458eb..6ed6de42c1748 100644
--- a/west.yml
+++ b/west.yml
@@ -327,7 +327,7 @@ manifest:
       groups:
         - crypto
     - name: trusted-firmware-m
-      revision: a11cd27905aecc4416cfc85552bfc3b997375056
+      revision: 8134106ef9cb3df60e8bd22b172532558e936bd2
       path: modules/tee/tf-m/trusted-firmware-m
       groups:
         - tee