diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-drtm_hash256-romlib:nil b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-drtm_hash256-romlib:nil
new file mode 100644
index 0000000..8e0db6b
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-drtm_hash256-romlib:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-mb-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-mb-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme
new file mode 100644
index 0000000..7c2a69d
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-mb-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme
new file mode 100644
index 0000000..7c2a69d
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-rme-romlib,fvp-rme:fvp-trp.tftf-tftf.rme
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..8e0db6b
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb:nil b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb:nil
new file mode 100644
index 0000000..8e0db6b
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-fwu,fvp-default:fvp-tftf.fwu_metadata_backup_gpt-aemv8a.gpt-debug b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-fwu,fvp-default:fvp-tftf.fwu_metadata_backup_gpt-aemv8a.gpt-debug
new file mode 100644
index 0000000..8e0db6b
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-fwu,fvp-default:fvp-tftf.fwu_metadata_backup_gpt-aemv8a.gpt-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-fwu,fvp-default:fvp-tftf.gpt-aemv8a.gpt-debug b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-fwu,fvp-default:fvp-tftf.gpt-aemv8a.gpt-debug
new file mode 100644
index 0000000..8e0db6b
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-fwu,fvp-default:fvp-tftf.gpt-aemv8a.gpt-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-fwu:nil b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-fwu:nil
new file mode 100644
index 0000000..8e0db6b
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-fwu:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-sdei:nil b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-sdei:nil
new file mode 100644
index 0000000..126a88c
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib-sdei:nil
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..7c2a69d
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib:fvp-linux-dtb.1t-romlib-fip.uboot-aemv8a-debug b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib:fvp-linux-dtb.1t-romlib-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..7c2a69d
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tbb-psa-mbedtls-romlib:fvp-linux-dtb.1t-romlib-fip.uboot-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-romlib/fvp-tspd-tbb-psa-mbedtls-pauth,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5+bti b/group/psa-mbedtls-romlib/fvp-tspd-tbb-psa-mbedtls-pauth,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5+bti
new file mode 100644
index 0000000..7c2a69d
--- /dev/null
+++ b/group/psa-mbedtls-romlib/fvp-tspd-tbb-psa-mbedtls-pauth,fvp-fwu-pauth-standard:fvp-tftf.fwu-aemv8a.8_5+bti
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-psa-mbedtls-romlib,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-psa-mbedtls-romlib,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..8e0db6b
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-psa-mbedtls-romlib,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/tf_config/fvp-tbb-psa-mbedtls-drtm_hash256-romlib b/tf_config/fvp-tbb-psa-mbedtls-drtm_hash256-romlib
new file mode 100644
index 0000000..e72f283
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-drtm_hash256-romlib
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+DRTM_SUPPORT=1
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+PSA_CRYPTO=1
+TPM_HASH_ALG=sha256
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-mb-rme-romlib b/tf_config/fvp-tbb-psa-mbedtls-mb-rme-romlib
new file mode 100644
index 0000000..1e3d829
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-mb-rme-romlib
@@ -0,0 +1,12 @@
+ARM_ROTPK_LOCATION=devel_rsa
+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
+MEASURED_BOOT=1
+PLAT=fvp
+PSA_CRYPTO=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-rme-romlib b/tf_config/fvp-tbb-psa-mbedtls-rme-romlib
new file mode 100644
index 0000000..531fda5
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-rme-romlib
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+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
+PLAT=fvp
+PSA_CRYPTO=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-romlib b/tf_config/fvp-tbb-psa-mbedtls-romlib
new file mode 100644
index 0000000..efc31f4
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-romlib
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+FVP_TRUSTED_SRAM_SIZE=384
+PLAT=fvp
+PSA_CRYPTO=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb b/tf_config/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb
new file mode 100644
index 0000000..abe007c
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT_DESC_IN_DTB=1
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+PSA_CRYPTO=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb-cc b/tf_config/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb-cc
new file mode 100644
index 0000000..9278f2b
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-romlib-cot-in-dtb-cc
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT_DESC_IN_DTB=1
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+PSA_CRYPTO=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-romlib-fwu b/tf_config/fvp-tbb-psa-mbedtls-romlib-fwu
new file mode 100644
index 0000000..ff4af9f
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-romlib-fwu
@@ -0,0 +1,11 @@
+ARM_GPT_SUPPORT=1
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+PSA_CRYPTO=1
+PSA_FWU_SUPPORT=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-romlib-sdei b/tf_config/fvp-tbb-psa-mbedtls-romlib-sdei
new file mode 100644
index 0000000..6537fa4
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-romlib-sdei
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+EL3_EXCEPTION_HANDLING=1
+FVP_TRUSTED_SRAM_SIZE=384
+PLAT=fvp
+PSA_CRYPTO=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SDEI_SUPPORT=1
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-pauth b/tf_config/fvp-tspd-tbb-psa-mbedtls-pauth
new file mode 100644
index 0000000..97befbf
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-pauth
@@ -0,0 +1,13 @@
+ARM_ARCH_MINOR=5
+ARM_ROTPK_LOCATION=devel_rsa
+BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_PAUTH_REGS=1
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+PSA_CRYPTO=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-pauth-cc b/tf_config/fvp-tspd-tbb-psa-mbedtls-pauth-cc
new file mode 100644
index 0000000..beb6960
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-pauth-cc
@@ -0,0 +1,14 @@
+ARM_ARCH_MINOR=5
+ARM_ROTPK_LOCATION=devel_rsa
+BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_PAUTH_REGS=1
+ENABLE_ASSERTIONS=0
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+PSA_CRYPTO=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1