diff --git a/group/tf-l1-boot-tests-misc/fvp-mb-256-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a b/group/tf-l1-boot-tests-misc/fvp-mb_hash256-tbb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-mb-256-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a
rename to group/tf-l1-boot-tests-misc/fvp-mb_hash256-tbb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a
diff --git a/group/tf-l1-boot-tests-misc/fvp-mb-384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm_384-romlib-fip.ftpm-aemv8a b/group/tf-l1-boot-tests-misc/fvp-mb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm_384-romlib-fip.ftpm-aemv8a
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-mb-384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm_384-romlib-fip.ftpm-aemv8a
rename to group/tf-l1-boot-tests-misc/fvp-mb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm_384-romlib-fip.ftpm-aemv8a
diff --git a/group/tf-l2-coverity-misra/fvp-mb-256:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/fvp-mb_hash256-tbb_hash256:coverity-tf-misra.diff
similarity index 100%
rename from group/tf-l2-coverity-misra/fvp-mb-256:coverity-tf-misra.diff
rename to group/tf-l2-coverity-misra/fvp-mb_hash256-tbb_hash256:coverity-tf-misra.diff
diff --git a/group/tf-l3-code-coverage/fvp-mb-256,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/tf-l3-code-coverage/fvp-mb_hash256-tbb_hash256,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
similarity index 100%
rename from group/tf-l3-code-coverage/fvp-mb-256,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
rename to group/tf-l3-code-coverage/fvp-mb_hash256-tbb_hash256,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
diff --git a/group/tftf-l2-fvp/fvp-mb-256,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp/fvp-mb_hash256-tbb_hash256,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
similarity index 100%
rename from group/tftf-l2-fvp/fvp-mb-256,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
rename to group/tftf-l2-fvp/fvp-mb_hash256-tbb_hash256,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
diff --git a/script/build_package.sh b/script/build_package.sh
index 8cb6047..5974447 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -488,7 +488,8 @@
 	source "$config_file"
 
 	# If it is a TBBR build, extract the MBED TLS library from archive
-	if [ "$(get_tf_opt TRUSTED_BOARD_BOOT)" = 1 ]; then
+	if [ "$(get_tf_opt TRUSTED_BOARD_BOOT)" = 1 ] ||
+	   [ "$(get_tf_opt MEASURED_BOOT)" = 1 ]; then
 		mbedtls_dir="$workspace/mbedtls"
 		if [ ! -d "$mbedtls_dir" ]; then
 			mbedtls_ar="$workspace/mbedtls.tar.gz"
diff --git a/tf_config/fvp-mb-384-optee-romlib b/tf_config/fvp-mb-384-optee-romlib
deleted file mode 100644
index e19e7bf..0000000
--- a/tf_config/fvp-mb-384-optee-romlib
+++ /dev/null
@@ -1,12 +0,0 @@
-ARM_ROTPK_LOCATION=devel_rsa
-ARM_TSP_RAM_LOCATION=tdram
-CROSS_COMPILE=aarch64-none-elf-
-EVENT_LOG_LEVEL=20
-GENERATE_COT=1
-MEASURED_BOOT=1
-PLAT=fvp
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SPD=opteed
-TPM_HASH_ALG=sha384
-TRUSTED_BOARD_BOOT=1
-USE_ROMLIB=1
diff --git a/tf_config/fvp-mb-256 b/tf_config/fvp-mb_hash256-tbb_hash256
similarity index 100%
rename from tf_config/fvp-mb-256
rename to tf_config/fvp-mb_hash256-tbb_hash256
diff --git a/tf_config/fvp-mb-256-optee-romlib b/tf_config/fvp-mb_hash256-tbb_hash384-optee-romlib
similarity index 100%
rename from tf_config/fvp-mb-256-optee-romlib
rename to tf_config/fvp-mb_hash256-tbb_hash384-optee-romlib
diff --git a/tf_config/fvp-mb_hash384-optee-romlib b/tf_config/fvp-mb_hash384-optee-romlib
new file mode 100644
index 0000000..b2cedc5
--- /dev/null
+++ b/tf_config/fvp-mb_hash384-optee-romlib
@@ -0,0 +1,8 @@
+ARM_TSP_RAM_LOCATION=tdram
+CROSS_COMPILE=aarch64-none-elf-
+EVENT_LOG_LEVEL=20
+MEASURED_BOOT=1
+PLAT=fvp
+SPD=opteed
+TPM_HASH_ALG=sha384
+USE_ROMLIB=1