diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb
similarity index 92%
rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.1.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb
index 98c8edda..cfbfe42b 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.1.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb
@@ -9,8 +9,8 @@ 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.1
-SRCREV = "8cf9edba5cc3ec11ed5463f206aa5819f7fdbade"
+# Use fiptool from TF-A v2.12.3
+SRCREV = "799fa03173b6c5ab85f70e583dd7d12719592436"
 SRCBRANCH = "lts-v2.12"
 
 DEPENDS += "openssl-native"
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb
similarity index 93%
rename from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb
index 31b0964b..adf94c42 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb
@@ -8,10 +8,9 @@ inherit deploy
 COMPATIBLE_MACHINE ?= "invalid"
 
 SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https"
-SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \
-          "
-SRCBRANCH = "master"
-SRCREV = "6a113621a9efdc143e9270b1789046cd7d9cdfb1"
+SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}"
+SRCBRANCH = "lts-v2.12"
+SRCREV = "3650d9cdfaa8eda20eba4b0c366c7c213a356557"
 
 EXTRA_OEMAKE += "USE_NVM=0"
 EXTRA_OEMAKE += "SHELL_COLOR=1"
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.3.bb
similarity index 81%
rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.1.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.3.bb
index 47ac8722..d7f83fe7 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.1.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.3.bb
@@ -1,16 +1,16 @@
 require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
 
-# TF-A v2.12.1
-SRCREV_tfa = "8cf9edba5cc3ec11ed5463f206aa5819f7fdbade"
+# TF-A v2.12.3
+SRCREV_tfa = "799fa03173b6c5ab85f70e583dd7d12719592436"
 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.2
+# mbedtls-3.6.3
 SRCBRANCH_MBEDTLS = "mbedtls-3.6"
 SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=${SRCBRANCH_MBEDTLS}"
-SRCREV_mbedtls = "107ea89daaefb9867ea9121002fbbdf926780e98"
+SRCREV_mbedtls = "22098d41c6620ce07cf8a0134d37302355e1e5ef"
 
 LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"