diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.1.bb
similarity index 90%
rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.1.bb
index e7fbb8b4..98c8edda 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.1.bb
@@ -9,9 +9,9 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmwa
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}"
 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
 
-# Use fiptool from TF-A v2.12.0
-SRCREV = "4ec2948fe3f65dba2f19e691e702f7de2949179c"
-SRCBRANCH = "master"
+# Use fiptool from TF-A v2.12.1
+SRCREV = "8cf9edba5cc3ec11ed5463f206aa5819f7fdbade"
+SRCBRANCH = "lts-v2.12"
 
 DEPENDS += "openssl-native"
 
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.1.bb
similarity index 77%
rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.1.bb
index ceaac263..57c30b58 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.1.bb
@@ -1,15 +1,15 @@
 require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
 
-# TF-A v2.12.0
-SRCREV_tfa = "4ec2948fe3f65dba2f19e691e702f7de2949179c"
-SRCBRANCH = "master"
+# TF-A v2.12.1
+SRCREV_tfa = "8cf9edba5cc3ec11ed5463f206aa5819f7fdbade"
+SRCBRANCH = "lts-v2.12"
 
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
 
 # in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls
-# mbedtls-3.6.1
+# mbedtls-3.6.2
 SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-3.6"
-SRCREV_mbedtls = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3"
+SRCREV_mbedtls = "107ea89daaefb9867ea9121002fbbdf926780e98"
 
 LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"