diff --git a/group/tf-l2-coverity-misra-nominated/corstone700-default:coverity-tf-misra.diff b/group/tf-l2-coverity-misra-nominated/corstone700-fpga-default:coverity-tf-misra.diff
similarity index 100%
copy from group/tf-l2-coverity-misra-nominated/corstone700-default:coverity-tf-misra.diff
copy to group/tf-l2-coverity-misra-nominated/corstone700-fpga-default:coverity-tf-misra.diff
diff --git a/group/tf-l2-coverity-misra-nominated/corstone700-default:coverity-tf-misra.diff b/group/tf-l2-coverity-misra-nominated/corstone700-fvp-default:coverity-tf-misra.diff
similarity index 100%
rename from group/tf-l2-coverity-misra-nominated/corstone700-default:coverity-tf-misra.diff
rename to group/tf-l2-coverity-misra-nominated/corstone700-fvp-default:coverity-tf-misra.diff
diff --git a/group/tf-l2-error-deprecated/corstone700-error-deprecated:nil b/group/tf-l2-error-deprecated/corstone700-error-deprecated:nil
deleted file mode 100644
index d52947d..0000000
--- a/group/tf-l2-error-deprecated/corstone700-error-deprecated:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/tf_config/corstone700-error-deprecated b/tf_config/corstone700-error-deprecated
deleted file mode 100644
index 5830dc9..0000000
--- a/tf_config/corstone700-error-deprecated
+++ /dev/null
@@ -1,9 +0,0 @@
-AARCH32_SP=sp_min
-ARCH=aarch32
-ARM_LINUX_KERNEL_AS_BL33=1
-ARM_PRELOADED_DTB_BASE=0x02800000
-CROSS_COMPILE=arm-none-eabi-
-ERROR_DEPRECATED=1
-PLAT=corstone700
-PRELOADED_BL33_BASE=0x08500000
-RESET_TO_SP_MIN=1