diff --git a/group/measured-boot-ftpm/fvp-mb-256:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0 b/group/measured-boot-ftpm/fvp-mb-256-optee:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0
similarity index 100%
rename from group/measured-boot-ftpm/fvp-mb-256:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0
rename to group/measured-boot-ftpm/fvp-mb-256-optee:fvp-optee.mb-linux.rootfs+ftpm-fip.ftpm-foundationv8.8_0
diff --git a/tf_config/fvp-mb-256 b/tf_config/fvp-mb-256
index 615d411..ad1a754 100644
--- a/tf_config/fvp-mb-256
+++ b/tf_config/fvp-mb-256
@@ -1,11 +1,8 @@
 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=sha256
 TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/fvp-mb-256-optee b/tf_config/fvp-mb-256-optee
new file mode 100644
index 0000000..615d411
--- /dev/null
+++ b/tf_config/fvp-mb-256-optee
@@ -0,0 +1,11 @@
+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=sha256
+TRUSTED_BOARD_BOOT=1