diff --git a/group/tf-l1-build-fvp/fvp-tbb-mbedtls-cca-cot-in-dtb-ecdsa:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-cca-cot-in-dtb-ecdsa:nil
new file mode 100644
index 0000000..b5a3cc6
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-cca-cot-in-dtb-ecdsa:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-ecdsa-p384,fvp-rme:fvp-trp.tftf-tftf.rme b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-ecdsa-p384,fvp-rme:fvp-trp.tftf-tftf.rme
new file mode 100644
index 0000000..b5a3cc6
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-ecdsa-p384,fvp-rme:fvp-trp.tftf-tftf.rme
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/tf_config/fvp-tbb-mbedtls-cca-cot-in-dtb-ecdsa b/tf_config/fvp-tbb-mbedtls-cca-cot-in-dtb-ecdsa
new file mode 100644
index 0000000..1d360c7
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-cca-cot-in-dtb-ecdsa
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+COT=cca
+COT_DESC_IN_DTB=1
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-rme-ecdsa-p384 b/tf_config/fvp-tbb-mbedtls-rme-ecdsa-p384
new file mode 100644
index 0000000..b40996c
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-rme-ecdsa-p384
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_RME=1
+FVP_HW_CONFIG_DTS=fdts/fvp-base-gicv3-psci-1t.dts
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+KEY_ALG=ecdsa
+KEY_SIZE=384
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa_secp384r1.pem
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-rsa-3k-cert b/tf_config/fvp-tbb-mbedtls-rsa-3k-cert
index 9feae13..d0657a8 100644
--- a/tf_config/fvp-tbb-mbedtls-rsa-3k-cert
+++ b/tf_config/fvp-tbb-mbedtls-rsa-3k-cert
@@ -6,5 +6,5 @@
 KEY_SIZE=3072
 LOG_LEVEL=20
 PLAT=fvp
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa_3k.pem
 TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-rsa-3k-cert-cc b/tf_config/fvp-tbb-mbedtls-rsa-3k-cert-cc
index 05614f8..1dfc1c2 100644
--- a/tf_config/fvp-tbb-mbedtls-rsa-3k-cert-cc
+++ b/tf_config/fvp-tbb-mbedtls-rsa-3k-cert-cc
@@ -6,6 +6,6 @@
 KEY_SIZE=3072
 LOG_LEVEL=20
 PLAT=fvp
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa_3k.pem
 TRUSTED_BOARD_BOOT=1
 ENABLE_ASSERTIONS=0
diff --git a/tf_config/fvp-tbb-mbedtls-rsa-4k-cert b/tf_config/fvp-tbb-mbedtls-rsa-4k-cert
index 06f7971..159d301 100644
--- a/tf_config/fvp-tbb-mbedtls-rsa-4k-cert
+++ b/tf_config/fvp-tbb-mbedtls-rsa-4k-cert
@@ -6,5 +6,5 @@
 KEY_SIZE=4096
 LOG_LEVEL=20
 PLAT=fvp
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa_4k.pem
 TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-rsa-4k-cert-cc b/tf_config/fvp-tbb-mbedtls-rsa-4k-cert-cc
index deb0183..4ff603e 100644
--- a/tf_config/fvp-tbb-mbedtls-rsa-4k-cert-cc
+++ b/tf_config/fvp-tbb-mbedtls-rsa-4k-cert-cc
@@ -6,6 +6,6 @@
 KEY_SIZE=4096
 LOG_LEVEL=20
 PLAT=fvp
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa_4k.pem
 TRUSTED_BOARD_BOOT=1
 ENABLE_ASSERTIONS=0